diff options
Diffstat (limited to 'poky/meta/recipes-gnome')
19 files changed, 26 insertions, 62 deletions
diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_41.3.bb b/poky/meta/recipes-gnome/epiphany/epiphany_41.3.bb index befd817165..6dca6a7305 100644 --- a/poky/meta/recipes-gnome/epiphany/epiphany_41.3.bb +++ b/poky/meta/recipes-gnome/epiphany/epiphany_41.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Epiphany is an open source web browser for the Linux desktop envi It provides a simple and easy-to-use internet browsing experience." HOMEPAGE = "https://wiki.gnome.org/Apps/Web" BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ diff --git a/poky/meta/recipes-gnome/gcr/gcr_3.40.0.bb b/poky/meta/recipes-gnome/gcr/gcr_3.40.0.bb index d617454058..717c31c325 100644 --- a/poky/meta/recipes-gnome/gcr/gcr_3.40.0.bb +++ b/poky/meta/recipes-gnome/gcr/gcr_3.40.0.bb @@ -5,7 +5,7 @@ GNOME desktop." HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr" BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \ diff --git a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb index 21816ab06c..55c16e4d66 100644 --- a/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb +++ b/poky/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb @@ -5,7 +5,7 @@ loading (ie. animated GIFs)" HOMEPAGE = "https://wiki.gnome.org/Projects/GdkPixbuf" BUGTRACKER = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://gdk-pixbuf/gdk-pixbuf.h;endline=26;md5=72b39da7cbdde2e665329fef618e1d6b \ " diff --git a/poky/meta/recipes-gnome/gi-docgen/gi-docgen_git.bb b/poky/meta/recipes-gnome/gi-docgen/gi-docgen_git.bb index bacf983810..67617fca39 100644 --- a/poky/meta/recipes-gnome/gi-docgen/gi-docgen_git.bb +++ b/poky/meta/recipes-gnome/gi-docgen/gi-docgen_git.bb @@ -5,17 +5,18 @@ introspection data generated by GObject-based libraries to generate the API \ reference of these libraries, as well as other ancillary documentation." HOMEPAGE = "https://gnome.pages.gitlab.gnome.org/gi-docgen/" -LICENSE = "GPLv3+ & Apache-2.0" +LICENSE = "GPL-3.0-or-later & Apache-2.0" LIC_FILES_CHKSUM = "file://gi-docgen.py;beginline=1;endline=5;md5=2dc0f1f01202478cfe813c0e7f80b326" SRC_URI = "git://gitlab.gnome.org/GNOME/gi-docgen.git;protocol=https;branch=main" -PV = "2021.8" -SRCREV = "a284455af9b3cad179900f6e1f12b59a3d40c06b" +PV = "2022.1" +SRCREV = "37b04455ff58cb2ec3f58917d0737c435344f2fb" S = "${WORKDIR}/git" inherit setuptools3 +PIP_INSTALL_PACKAGE = "gi_docgen" RDEPENDS:${PN} += "python3-asyncio python3-core python3-jinja2 python3-json python3-markdown python3-markupsafe python3-pygments python3-toml python3-typogrify python3-xml" diff --git a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb index 2b21e1bb2d..46f9f4772c 100644 --- a/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb +++ b/poky/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme" BUGTRACKER = "https://gitlab.gnome.org/GNOME/adwaita-icon-theme/issues" SECTION = "x11/gnome" -LICENSE = "LGPL-3.0 | CC-BY-SA-3.0" +LICENSE = "LGPL-3.0-only | CC-BY-SA-3.0" LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" diff --git a/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb index dd760b9c63..776f6091aa 100644 --- a/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb +++ b/poky/meta/recipes-gnome/gnome/gconf_3.2.6.bb @@ -4,7 +4,7 @@ It is intended for user preferences; not configuration of something like \ Apache, or arbitrary data storage." SECTION = "x11/gnome" HOMEPAGE = "https://gitlab.gnome.org/Archive/gconf" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native" diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch deleted file mode 100644 index b484b5e9e6..0000000000 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 5 Sep 2018 16:46:52 +0200 -Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper - -prelink-rtld, which we use instead of ldd returns 127 when it can't find a library. -It is not an error per se, but it breaks subprocess.check_output(). - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - giscanner/shlibs.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index d67df95..80352a6 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries): - args.extend(['otool', '-L', binary.args[0]]) - else: - args.extend(['ldd', binary.args[0]]) -- output = subprocess.check_output(args) -+ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout - if isinstance(output, bytes): - output = output.decode("utf-8", "replace") - diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb index d4ee03d33c..fcda10bd33 100644 --- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb +++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.70.0.bb @@ -6,7 +6,7 @@ generation for bindings, API verification and documentation generation." HOMEPAGE = "https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" BUGTRACKER = "https://gitlab.gnome.org/GNOME/gobject-introspection/issues" SECTION = "libs" -LICENSE = "LGPLv2+ & GPLv2+ & MIT" +LICENSE = "LGPL-2.0-or-later & GPL-2.0-or-later & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ file://tools/compiler.c;endline=20;md5=fc5007fc20022720e6c0b0cdde41fabd \ file://giscanner/sourcescanner.c;endline=22;md5=194d6e0c1d00662f32d030ce44de8d39 \ @@ -14,7 +14,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ " SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ - file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ file://0001-build-Avoid-the-doctemplates-hack.patch \ " @@ -33,9 +32,7 @@ DEPENDS += " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-arch # target build needs qemu to run temporary introspection binaries created # on the fly by g-ir-scanner and a native version of itself to run # native versions of its own tools during build. -# Also prelink-rtld is used to find out library dependencies of introspection binaries -# (standard ldd doesn't work when cross-compiling). -DEPENDS:append:class-target = " gobject-introspection-native qemu-native prelink-native" +DEPENDS:append:class-target = " gobject-introspection-native qemu-native" # needed for writing out the qemu wrapper script export STAGING_DIR_HOST @@ -55,13 +52,6 @@ EXTRA_OEMESON:class-target = " \ ${@'-Dgir_dir_prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ " -# Need to ensure ld.so.conf exists so prelink-native works -# both before we build and if we install from sstate -do_configure[prefuncs] += "gobject_introspection_preconfigure" -python gobject_introspection_preconfigure () { - oe.utils.write_ld_so_conf(d) -} - do_configure:prepend:class-native() { # Tweak the native python scripts so that they don't refer to the # full path of native python binary (the solution is taken from glib-2.0 recipe) @@ -113,7 +103,7 @@ EOF # for a different architecture cat > ${B}/g-ir-scanner-lddwrapper << EOF #!/bin/sh -prelink-rtld --root=$STAGING_DIR_HOST "\$@" +$OBJDUMP -p "\$@" EOF chmod +x ${B}/g-ir-scanner-lddwrapper diff --git a/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_41.0.bb b/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_41.0.bb index 693ccd0148..280e3c8b50 100644 --- a/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_41.0.bb +++ b/poky/meta/recipes-gnome/gsettings-desktop-schemas/gsettings-desktop-schemas_41.0.bb @@ -4,7 +4,7 @@ GSettings schemas for settings shared by various components of a desktop." HOMEPAGE = "https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" BUGTRACKER = "https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/issues" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "glib-2.0" diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3.inc b/poky/meta/recipes-gnome/gtk+/gtk+3.inc index 4de4dcf532..60620eef93 100644 --- a/poky/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/poky/meta/recipes-gnome/gtk+/gtk+3.inc @@ -9,7 +9,7 @@ SECTION = "libs" DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ gdk-pixbuf-native" -LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" +LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later" inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings features_check gobject-introspection diff --git a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb index 1c9d517525..150d2c0b23 100644 --- a/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb +++ b/poky/meta/recipes-gnome/gtk-doc/gtk-doc_1.33.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Documentation generator for glib-based software" DESCRIPTION = "Gtk-doc is a set of scripts that extract specially formatted comments \ from glib-based software and produce a set of html documentation files from them" HOMEPAGE = "https://www.gtk.org/docs/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit gnomebase diff --git a/poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb b/poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb index 5a9f675b7f..bb6cb000ab 100644 --- a/poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb +++ b/poky/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.17.bb @@ -4,7 +4,7 @@ theme for implementations of the icon theme specification." HOMEPAGE = "https://www.freedesktop.org/wiki/Software/icon-theme" BUGTRACKER = "https://bugs.freedesktop.org/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426" SRC_URI = "https://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.xz" diff --git a/poky/meta/recipes-gnome/json-glib/json-glib_1.6.6.bb b/poky/meta/recipes-gnome/json-glib/json-glib_1.6.6.bb index c3572a16f2..627f389536 100644 --- a/poky/meta/recipes-gnome/json-glib/json-glib_1.6.6.bb +++ b/poky/meta/recipes-gnome/json-glib/json-glib_1.6.6.bb @@ -6,7 +6,7 @@ instances to and from JSON data types." HOMEPAGE = "https://wiki.gnome.org/Projects/JsonGlib" BUGTRACKER = "https://gitlab.gnome.org/GNOME/json-glib/issues" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" DEPENDS = "glib-2.0" diff --git a/poky/meta/recipes-gnome/libdazzle/libdazzle_3.42.0.bb b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.42.0.bb index 1b6109d218..a10acc6ada 100644 --- a/poky/meta/recipes-gnome/libdazzle/libdazzle_3.42.0.bb +++ b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.42.0.bb @@ -2,7 +2,7 @@ SUMMARY = "The libdazzle library is a companion library to GObject and Gtk+." DESCRIPTION = "A wide range of components from utilities for GIO, widgets for \ GTK+, an animation framework, state machines, paneling and high-performance \ counters are included." -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" HOMEPAGE = "https://gitlab.gnome.org/GNOME/libdazzle" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libdazzle/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" diff --git a/poky/meta/recipes-gnome/libgudev/libgudev_237.bb b/poky/meta/recipes-gnome/libgudev/libgudev_237.bb index 57417f4e7c..9ce43ce34b 100644 --- a/poky/meta/recipes-gnome/libgudev/libgudev_237.bb +++ b/poky/meta/recipes-gnome/libgudev/libgudev_237.bb @@ -11,7 +11,7 @@ DEPENDS = "glib-2.0 udev" RCONFLICTS:${PN} = "systemd (<= 220)" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" GNOMEBASEBUILDCLASS = "meson" diff --git a/poky/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb b/poky/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb index 605ef2b5fa..722593dfb1 100644 --- a/poky/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb +++ b/poky/meta/recipes-gnome/libhandy/libhandy_1.5.0.bb @@ -6,7 +6,7 @@ to extend Gtk by providing mobile-friendly widgets and make the creation of \ responsive apps easier." HOMEPAGE = "https://gitlab.gnome.org/GNOME/libhandy" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=master \ @@ -15,6 +15,7 @@ SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=maste SRCREV = "8fa8306a79215fc6ebf2483145da98bf9b2495ab" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+))" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' GTKDOC_MESON_OPTION = 'gtk_doc' diff --git a/poky/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb b/poky/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb index dd081f9f44..fa3253b616 100644 --- a/poky/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb +++ b/poky/meta/recipes-gnome/libnotify/libnotify_0.7.9.bb @@ -6,7 +6,7 @@ in the user's way." HOMEPAGE = "https://gitlab.gnome.org/GNOME/libnotify" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libnotify/issues" SECTION = "libs" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" DEPENDS = "dbus glib-2.0 gdk-pixbuf" @@ -35,4 +35,4 @@ RCONFLICTS:${PN} += "libnotify3" RREPLACES:${PN} += "libnotify3" # -7381 is specific to the NodeJS bindings -CVE_CHECK_WHITELIST += "CVE-2013-7381" +CVE_CHECK_IGNORE += "CVE-2013-7381" diff --git a/poky/meta/recipes-gnome/librsvg/librsvg_2.52.5.bb b/poky/meta/recipes-gnome/librsvg/librsvg_2.52.5.bb index 5a764d86ed..1279c663f7 100644 --- a/poky/meta/recipes-gnome/librsvg/librsvg_2.52.5.bb +++ b/poky/meta/recipes-gnome/librsvg/librsvg_2.52.5.bb @@ -6,7 +6,7 @@ the screen or to generate output for printing." HOMEPAGE = "https://gitlab.gnome.org/GNOME/librsvg" BUGTRACKER = "https://gitlab.gnome.org/GNOME/librsvg/issues" -LICENSE = "LGPLv2.1+" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " @@ -51,7 +51,7 @@ do_compile:prepend() { } # Issue only on windows -CVE_CHECK_WHITELIST += "CVE-2018-1000041" +CVE_CHECK_IGNORE += "CVE-2018-1000041" CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" diff --git a/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb b/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb index 9c1f97b8f8..39ecdd770a 100644 --- a/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb +++ b/poky/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb @@ -3,7 +3,7 @@ DESCRIPTION = "A GObject-based library for accessing the Secret Service API of \ the freedesktop.org project, a cross-desktop effort to access passwords, \ tokens and other types of secrets. libsecret provides a convenient wrapper \ for these methods so consumers do not have to call the low-level DBus methods." -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" HOMEPAGE = "https://github.com/GNOME/libsecret" BUGTRACKER = "https://gitlab.gnome.org/GNOME/libsecret/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=23c2a5e0106b99d75238986559bb5fc6" |