diff options
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-gnome')
78 files changed, 185 insertions, 235 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.3.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.3.1.bb index d4d91ed51a..f6d8739dae 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.3.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.3.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Actions, Menus and Toolbars Kit" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb index 55b29139bb..ef26caa144 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.38.3.bb @@ -1,5 +1,5 @@ SUMMARY = "Configuration editor for dconf" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb index 5613556aa7..6641be86ee 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb index 8e048170bc..01900cce39 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.44.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created" HOMEPAGE = "http://www.gusnan.se/devilspie2" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ file://GPL3.txt;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb index ec3dca209d..6b3479c264 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_41.4.bb @@ -1,5 +1,5 @@ SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" SECTION = "x11/office" DEPENDS = " \ @@ -25,7 +25,7 @@ def gnome_verdir(v): return oe.utils.trim_version(v, 1) SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "3346b01f9bdc8f2d5ffea92f110a090c64a3624942b5b543aad4592a9de33bb0" +SRC_URI[archive.sha256sum] = "ff245240f230922bec32a4d7b0a1d91b247a83d13484f99b74035d51eb232130" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb index 59856f3ab7..f6b719392d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb @@ -11,6 +11,7 @@ inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc g REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " \ + file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ file://0001-CMakeLists.txt-Remove-TRY_RUN-for-iconv.patch \ file://0002-CMakeLists.txt-remove-CHECK_C_SOURCE_RUNS-check.patch \ file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \ @@ -25,7 +26,7 @@ GI_DATA_ENABLED="False" EXTRA_OECMAKE = " \ -DSYSCONF_INSTALL_DIR=${sysconfdir} \ -DWITH_KRB5=OFF \ - -DENABLE_UOA=OFF \ + -DENABLE_GOA=OFF \ -DENABLE_GOOGLE_AUTH=OFF \ -DENABLE_WEATHER=OFF \ -DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 96367aa0c6..bcbe20d752 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -2,12 +2,12 @@ SUMMARY = "Evolution database backend server" HOMEPAGE = "http://www.gnome.org/projects/evolution/" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "LGPLv2 & LGPLv2+" +LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ file://src/camel/camel.h;endline=24;md5=342fc5e9357254bc30c24e43ae47d9a1 \ file://src/libedataserver/e-data-server-util.h;endline=20;md5=8f21a9c80ea82a4fb80b5f959f672543" inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "6f5847a1234799073e9585db861c21381a09ed550dc0a2125f00ba5f90bd361d" -PV = "3.42.3" +SRC_URI[archive.sha256sum] = "8c437af75edbef196034f7913f505c3f68acc18515a6eed20f3ef52452785898" +PV = "3.43.1" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch new file mode 100644 index 0000000000..8fd077cedc --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0001-cmake-Do-not-export-CC-into-gir-compiler.patch @@ -0,0 +1,13 @@ +--- a/cmake/modules/GObjectIntrospection.cmake 2022-03-06 18:10:47.724184883 +0100 ++++ b/cmake/modules/GObjectIntrospection.cmake 2022-03-06 18:10:12.560450948 +0100 +@@ -122,9 +122,7 @@ + file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}") + + add_custom_command( +- COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS= +- ${INTROSPECTION_SCANNER_ENV} +- ${G_IR_SCANNER} ++ COMMAND ${G_IR_SCANNER} + ${INTROSPECTION_SCANNER_ARGS} + --namespace=${_gir_namespace} + --nsversion=${_gir_version} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb index 55fdba5e38..5ed3375eb0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/faenza-icon-theme/faenza-icon-theme_1.3.bb @@ -1,6 +1,6 @@ DESCRIPTION = "An icon theme for Gnome" SECTION = "x11/wm" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" HOMEPAGE = "http://code.google.com/p/faenza-icon-theme/" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb index ccc82aec45..cce7f211f7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "An archive manager utility for the GNOME Environment" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb index e31ca13f0f..94ffdc28eb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Display Manager" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb index 8c11fb52e0..adba8ab2f9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME editor" SECTION = "x11/gnome" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" @@ -21,12 +21,11 @@ inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc val def gnome_verdir(v): return oe.utils.trim_version(v, 1) -REQUIRED_DISTRO_FEATURES = "x11" - SRC_URI[archive.sha256sum] = "7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5" # gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +# x11 is needed for tepl and gtksourceview4 +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" GIR_MESON_OPTION = "" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb index c0f3c27af4..df401f7291 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.2.bb @@ -1,6 +1,6 @@ SUMMARY = "A convenience library for the geocoding" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb index b2fd4b0316..afec302cb4 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb @@ -1,5 +1,5 @@ SUMMARY = "A GObject-based Exiv2 wrapper" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" DEPENDS = "exiv2 python3-pygobject-native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb index 23b3bf63a5..2b36003635 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb @@ -1,6 +1,6 @@ SUMMARY = "A GObject library for Facebook Graph API" SECTION = "x11/gnome" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a" DEPENDS = " \ @@ -10,7 +10,10 @@ DEPENDS = " \ gnome-online-accounts \ " -inherit gnomebase gtk-doc gobject-introspection pkgconfig +inherit gnomebase gtk-doc gobject-introspection pkgconfig features_check + +# for gnome-online-accounts +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" SRC_URI[archive.md5sum] = "c38af63e49f8fe8baad99537956b69ba" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb index 438f8113a6..08e50409eb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/ghex/ghex_3.18.4.bb @@ -1,5 +1,5 @@ SUMMARY = "GHex - a hex editor for GNOME" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch index 55af681af0..0c45e60957 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch @@ -1,4 +1,4 @@ -From 550e98013b0e003c1a6771d8e811375913adf16b Mon Sep 17 00:00:00 2001 +From fa47185d9c8150a0dcb0ea12b92fcf139edbef35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Wed, 27 Oct 2021 20:18:47 +0200 Subject: [PATCH] Support cross builds a bit better @@ -17,10 +17,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index dfcc2c3..192b1b5 100644 +index 136e812..f5b91e0 100644 --- a/meson.build +++ b/meson.build -@@ -234,6 +234,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with +@@ -252,6 +252,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with --disable-debug.''') endif @@ -28,15 +28,15 @@ index dfcc2c3..192b1b5 100644 # Check if a minimal SpiderMonkey program compiles, links, and runs. If not, # it's most likely the case that SpiderMonkey was configured incorrectly, for # example by building mozglue as a shared library. -@@ -254,6 +255,7 @@ could not be compiled, linked, or run. Most likely you should build it with a - different configuration. Check the recommended configuration: - https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr78/docs/Building%20SpiderMonkey.md''') +@@ -282,6 +283,7 @@ elif minimal_program.returncode() != 0 + failed to execute. Most likely you should build it with a different + configuration.''' + recommended_configuration) endif +endif # not meson.is_cross_build() have_printf_alternative_int = cc.compiles(''' #include <stdio.h> -@@ -662,7 +664,7 @@ endif +@@ -682,7 +684,7 @@ subdir('installed-tests') # Note: The test program in test/ needs to be ported # to Windows before we can build it on Windows. @@ -45,6 +45,3 @@ index dfcc2c3..192b1b5 100644 subdir('test') endif --- -2.31.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch index 8777d14f53..6e7b5504e8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch @@ -1,4 +1,4 @@ -From 6a29818204e647d5fad68ed7ca8cac53d301cae6 Mon Sep 17 00:00:00 2001 +From 2b8aa1ea4a4d1836164c934b1ab2556a32cb5af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Wed, 27 Oct 2021 20:04:02 +0200 Subject: [PATCH] meson.build: Do not add dir installed-tests when @@ -15,10 +15,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 6878e2e..edbbf79 100644 +index f5b91e0..3110530 100644 --- a/meson.build +++ b/meson.build -@@ -635,7 +635,9 @@ if not get_option('skip_gtk_tests') +@@ -680,7 +680,9 @@ if not get_option('skip_gtk_tests') have_gtk4 = dependency('gtk4', required: false).found() endif @@ -29,6 +29,3 @@ index 6878e2e..edbbf79 100644 # Note: The test program in test/ needs to be ported # to Windows before we can build it on Windows. --- -2.31.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb index 90ea140448..9e6fc45db3 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.70.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb @@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" GNOMEBASEBUILDCLASS = "meson" -DEPENDS = "mozjs-78 gtk4" +DEPENDS = "mozjs-91" inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig -SRC_URI[archive.sha256sum] = "bbdc0eec7cf25fbc534769f6a1fb2c7a18e17b871efdb0ca58e9abf08b28003f" +SRC_URI[archive.sha256sum] = "3ef0caf716e3920dd61f7748f6d56e476cc0fc18351ad0548e7df1a0ab9bdcad" SRC_URI += " \ file://0001-Support-cross-builds-a-bit-better.patch \ file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \ @@ -21,6 +21,7 @@ GIR_MESON_OPTION = "" EXTRA_OEMESON = " \ -Dinstalled_tests=false \ -Dskip_dbus_tests=true \ + -Dskip_gtk_tests=true \ " LDFLAGS:append:mipsarch = " -latomic" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb index 0015e9f05b..017d67b5a6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME archive library" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb index 8eed262998..57fe74495d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME bluetooth manager" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb index f4aba65953..607f52afeb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_41.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME calculator" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb index 4b62a0c07c..c97bf0bec8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_41.2.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME calendar" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb index f2b95edd06..1cdc96ba0b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_41.2.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME Settings" DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb index 3085d2767e..6bf2ab3986 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME library for reading .desktop files" SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch deleted file mode 100644 index 2758af5079..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 629ca0e61bb59303d43d7eac44a47ae866cc78f0 Mon Sep 17 00:00:00 2001 -From: rvalue <i@rvalue.moe> -Date: Fri, 17 Dec 2021 12:29:30 +0000 -Subject: [PATCH] build: fix arguments of i18n.merge_file - -`i18n.merge_file` has been ignoring positional arguments for a time -and explicitly rejects with error since meson 0.60.0 - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index e38a1d8..38fb520 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -11,7 +11,6 @@ desktops = [ - - foreach desktop: desktops - i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop + '.in', - output: desktop, -@@ -38,7 +37,6 @@ install_data( - info = 'org.gnome.DiskUtility.appdata.xml' - - i18n.merge_file( -- info, - input: info + '.in', - output: info, - po_dir: po_dir, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb index 7e254f52c7..e9724748ca 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME disk utility" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "x11/gnome" @@ -26,8 +26,9 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" # As soon as elogind is of interest this needs rework: meson option is combo PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" -SRC_URI += " file://0001-build-fix-arguments-of-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df" +SRC_URI[archive.sha256sum] = "1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b" + +EXTRA_OEMESON = "-Dman=false" FILES:${PN} += " \ ${datadir}/metainfo \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb index 3f47de6f29..13a68e3c80 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.42.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Flashback (GNOME 2) session" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" inherit gnomebase gsettings gtk-icon-cache gettext upstream-version-is-even features_check diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb index 9528b6641c..2e2927f1c7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME font viewer" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb index 5bc5f2e0fb..5aa52d1a50 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_40.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnome.org/" BUGTRACKER = "https://bugzilla.gnome.org/" SECTION = "x11/gnome" -LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = " \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb index c58229879c..dbc6e962eb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_3.36.0.bb @@ -1,6 +1,6 @@ SUMMARY = "GNOME menus" SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb index 3dca7e37a8..8dabb9e0c1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.43.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME" -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" GNOMEBASEBUILDCLASS = "autotools" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb index 9c9add4f48..2bcf145471 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.42.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME flashback panel" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit gnomebase gsettings itstool gnome-help gtk-icon-cache gtk-doc gettext upstream-version-is-even features_check diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch deleted file mode 100644 index 9fb7a5b9e5..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a112e8a089851035945b6848849149bb36787906 Mon Sep 17 00:00:00 2001 -From: rvalue <i@rvalue.moe> -Date: Fri, 21 Jan 2022 12:36:02 +0000 -Subject: [PATCH] meson: remove incorrect args for i18n.merge_file - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 6e7192e..94271de 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -3,7 +3,6 @@ subdir('icons') - appdata = photos_namespace + '.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, -@@ -23,7 +22,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb index ae8ab31f64..5af3088e3a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Access, organize and share your photos on GNOME" SECTION = "x11/gnome" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" DEPENDS = " \ @@ -30,8 +30,7 @@ def gnome_verdir(v): REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " file://0001-meson-remove-incorrect-args-for-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af" +SRC_URI[archive.sha256sum] = "25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551" do_install:append() { # make gnome-photos available on all desktops diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb index 18d73d872a..fa7e161e9e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb @@ -1,7 +1,7 @@ SUMMARY = "GNOME Screenshot" DESCRIPTION = "GNOME Screenshot is a small utility that takes a screenshot \ of the whole desktop, the currently focused window, or an area of the screen." -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "x11/gnome" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb index 010f815cdd..07f3634294 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_41.3.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME session" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb index 78d6811700..cbc4c460c1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch new file mode 100644 index 0000000000..df8fe0e6e6 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch @@ -0,0 +1,30 @@ +From cdaa837d48894737ca0b4e7d2dfb365119e53759 Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbeich@FreeBSD.org> +Date: Tue, 25 Jan 2022 11:49:54 +0000 +Subject: [PATCH] meson: Drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:23:0: ERROR: Function does not take positional arguments. + +Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/210> + +Upstream-Status: Backport[https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/commit/cdaa837d48894737ca0b4e7d2dfb365119e53759] +--- + data/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/meson.build b/data/meson.build +index 27f4287..a4bcd5e 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + session_desktop = 'gnome-classic.desktop' +-i18n.merge_file('', ++i18n.merge_file( + input: session_desktop + '.in', + output: session_desktop, + po_dir: '../po', +-- +2.34.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb index 16184f2c6c..f51ca9f918 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_41.1.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Shell Extensions" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4cb3a392cbf81a9e685ec13b88c4c101" GNOMEBASEBUILDCLASS = "meson" @@ -9,6 +9,7 @@ inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" SRC_URI[archive.sha256sum] = "d0e6f2273f08d52d925fc2bb66b47b28e5ef50d1b8a14020877c662423d507d3" +SRC_URI += "file://0001-meson-Drop-unused-argument-for-i18n.merge_file.patch" DEPENDS += " \ sassc-native \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb index d1b19895ae..8d0dba4840 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_41.2.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Shell is the graphical shell of the GNOME desktop environment" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb index 9b573d0ff0..219a069b6a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Gnome system monitor" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = " \ @@ -22,7 +22,7 @@ REQUIRED_DISTRO_FEATURES = "x11 polkit" def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "c7fc44c61949b794b0289968ebbbcc0c15f8cfc3d9e45bfaa81ed45c12139e5f" +SRC_URI[archive.sha256sum] = "13239d22032201a22bd29833c575b684816700d2de168a1530223577c5c075dc" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb index 2b3f3a6162..061da27f60 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME terminal" -LICENSE = "GPLv3 & GFDL-1.3" +LICENSE = "GPL-3.0-only & GFDL-1.3" LIC_FILES_CHKSUM = " \ file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch new file mode 100644 index 0000000000..dfa4615a3d --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks/0002-meson-fix-invalid-positional-argument.patch @@ -0,0 +1,33 @@ +From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001 +From: Mae Dartmann <hello@maedartmann.name> +Date: Wed, 16 Feb 2022 06:08:41 +0000 +Subject: [PATCH] meson: fix invalid positional argument + +Upstream-Status: Accepted[https://gitlab.gnome.org/GNOME/gnome-tweaks/-/commit/dc9701e18775c01d0b69fabaa350147f70096da8] +--- + data/meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index fd6d5da..74f7e82 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,5 +1,5 @@ + appdata_file = 'org.gnome.tweaks.appdata.xml' +-i18n.merge_file(appdata_file, ++i18n.merge_file( + input: appdata_file + '.in', + output: appdata_file, + po_dir: '../po', +@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file, + ) + + desktop_file = 'org.gnome.tweaks.desktop' +-i18n.merge_file(desktop_file, ++i18n.merge_file( + input: desktop_file + '.in', + output: desktop_file, + po_dir: '../po', +-- +GitLab + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb index 30275c97e3..ffdf2c9d38 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-tweaks/gnome-tweaks_40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME tweaks: Advanced options for GNOME 3 session" -LICENSE = "GPLv3 & CC0-1.0" +LICENSE = "GPL-3.0-only & CC0-1.0" LIC_FILES_CHKSUM = " \ file://LICENSES/CC0-1.0;md5=65d3616852dbf7b1a6d4b53b00626032 \ file://LICENSES/GPL-3.0;md5=9eef91148a9b14ec7f9df333daebc746 \ @@ -19,7 +19,10 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" GIR_MESON_OPTION = "" SRC_URI[archive.sha256sum] = "f95f3fe031b0b01c02f79a1659f889152d3772ae3e44df8403d1460ba5eec36a" -SRC_URI += "file://0001-Make-python-path-configurable.patch" +SRC_URI += " \ + file://0001-Make-python-path-configurable.patch \ + file://0002-meson-fix-invalid-positional-argument.patch \ +" EXTRA_OEMESON = "-Dpython_site_dir=${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.14.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.14.bb index 028e1d22b7..d00e737f4a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.14.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo-plugins_0.3.14.bb @@ -1,5 +1,5 @@ SUMMARY = "Grilo is a framework forsearching media content from various sources" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.14.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.14.bb index 53d80c5cbe..7ceb26d7a2 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.14.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.14.bb @@ -1,5 +1,5 @@ SUMMARY = "Grilo is a framework forsearching media content from various sources" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb index 7c7925420c..bdef603f0d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gsound/gsound_1.0.3.bb @@ -1,5 +1,5 @@ SUMMARY = "Small gobject library for playing system sounds" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=447b837ae57f08b7060593ac6256163f" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb index aba9be87aa..15f1cadbab 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb @@ -1,6 +1,6 @@ SUMMARY = "gspell adds spell-checking to a GTK+ applications" HOMEPAGE = "https://wiki.gnome.org/Projects/gspell" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8c2e1ec1540fb3e0beb68361344cba7e" DEPENDS = "gtk+3 iso-codes enchant2" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb index e9c52f3470..1459e0b434 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_3.12.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Image viewer and browser" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb index 64d5b868f7..4e1e434314 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview-classic-light_1.0.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Gtksourceview Classic-Light theme" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://classic-light.xml;beginline=6;endline=23;md5=2b4f75364fad00a4d752214dcbd7d7c3" inherit allarch diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb index 9f88513f7d..1e5652d3bd 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb @@ -1,7 +1,7 @@ SUMMARY = "Portable C library for multiline text editing" HOMEPAGE = "http://projects.gnome.org/gtksourceview/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb index 5b5ce5328a..db4d89de22 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.2.bb @@ -1,7 +1,7 @@ SUMMARY = "Portable C library for multiline text editing" HOMEPAGE = "http://projects.gnome.org/gtksourceview/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = "gtk+3 libxml2 intltool-native gnome-common-native glib-2.0-native" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.2.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.2.0.bb index c7c6e92037..00487743e8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.2.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.2.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Portable C library for multiline text editing" HOMEPAGE = "http://projects.gnome.org/gtksourceview/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch deleted file mode 100644 index a6e3523743..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs/Remove-incorrect-i18n.merge_file-argument.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Backport - -Fixes "../gvfs-1.49.1/daemon/meson.build:362:7: ERROR: Function does not take positional arguments. - -Signed-off-by: Markus Volk f_l_k@t-online.de - -From 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy <oholy@redhat.com> -Date: Fri, 21 Jan 2022 08:32:31 +0100 -Subject: [PATCH] build: Remove incorrect i18n.merge_file argument - -The positional argument was being silently ignored until meson 0.60.0 where -it fails with "ERROR: Function does not take positional arguments". - -Related: https://github.com/mesonbuild/meson/issues/9441 -Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 ---- - daemon/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/daemon/meson.build b/daemon/meson.build -index 5f9559aa..e20ada29 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -360,7 +360,6 @@ if enable_admin - policy = gvfs_namespace + '.file-operations.policy' - - i18n.merge_file( -- policy, - input: configure_file( - input: policy + '.in.in', - output: '@BASENAME@', --- - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb index c73716d749..93f7f57617 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.49.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.50.0.bb @@ -1,5 +1,5 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" GNOMEBASEBUILDCLASS = "meson" @@ -10,12 +10,9 @@ DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ RDEPENDS:${PN} += "gsettings-desktop-schemas" -SRC_URI = " \ - https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive \ - file://Remove-incorrect-i18n.merge_file-argument.patch \ -" +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.sha256sum] = "b0d1dda4e475066207305b0776b0daefeae790f6c0107ffd2687994c8e71915a" +SRC_URI[archive.sha256sum] = "cbc2f564d2e9f00c760673f42d6803bce3e081ab7ffb4456deffffba9339b4dd" # depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb index 51ca63e1fb..859eab9164 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libchamplain/libchamplain_0.12.20.bb @@ -1,5 +1,5 @@ SUMMARY = "libchamplain is a Gtk widget displaying zoomable and pannable maps" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "glib-2.0 gtk+3 gdk-pixbuf clutter-1.0 clutter-gtk-1.0 libsoup-2.4" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb index a1be2a2b64..921c3ee805 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb @@ -2,7 +2,7 @@ SUMMARY = "GLib-based library for accessing online service APIs using the GData HOMEPAGE = "http://live.gnome.org/libgdata" BUGTRACKER = "https://bugzilla.gnome.org/" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.48.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.49.bb index a3ff13f9ba..f663141bd5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.48.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.49.bb @@ -1,5 +1,5 @@ SUMMARY = "GNOME Structured File Library" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \ file://COPYING.LIB;md5=61464cfe342798eeced82efe9ae55f63" @@ -9,7 +9,7 @@ DEPENDS= "libxml2 bzip2 glib-2.0 zlib gnome-common-native" inherit gnomebase gobject-introspection gettext gtk-doc -SRC_URI[archive.sha256sum] = "ff86d7f1d46dd0ebefb7bd830a74a41db64362b987bf8853fff6ab4c1132b837" +SRC_URI[archive.sha256sum] = "e9ebe36688f010c9e6e40c8903f3732948deb8aca032578d07d0751bd82cf857" SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" PACKAGECONFIG ??= "" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb index 6d9398f4e4..3ee7746c10 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgtop/libgtop_2.40.0.bb @@ -1,5 +1,5 @@ SUMMARY = "A library for collecting system monitoring data" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" inherit gnomebase lib_package gtk-doc gobject-introspection gettext upstream-version-is-even diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb index 49493b17b2..771fc62e1e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_40.0.bb @@ -1,6 +1,6 @@ SUMMARY = "A library to access weather information from online services" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb index 67f63fea68..6deac38fda 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb @@ -3,7 +3,7 @@ DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals with a familiar GObject API along side the D-Bus API" HOMEPAGE = "https://github.com/flatpak/libportal" BUGTRACKER = "https://github.com/flatpak/libportal/issues" -LICENSE = "LGPLv3" +LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb b/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb index c74e1d4388..d633b0621d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Time zone map widget for Gtk+" HOMEPAGE = "https://launchpad.net/timezonemap" SECTION = "devel/lib" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/libt/${BPN}/${BPN}_${PV}.tar.gz" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb index 6c9e631e11..cb4e459b3d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_40.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" BPN = "libwnck" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index d1f36a94d2..3abba94990 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Window navigation construction toolkit" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" SECTION = "x11/libs" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb index e47d74b7b8..7955663f26 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.4.bb @@ -1,5 +1,5 @@ SUMMARY = "Helper lib for keyboard management" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb index 58479cf7b3..b6708552ac 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.42.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb @@ -1,6 +1,6 @@ SECTION = "x11/wm" SUMMARY = "Metacity is the boring window manager for the adult in you" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b4cce53560b8e619ffa7c830fb8761aa \ file://src/include/main.h;endline=24;md5=72148ede07a6dadd01de6a882d20a9ad" @@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "x11" inherit gnomebase gsettings gettext upstream-version-is-even features_check -SRC_URI[archive.sha256sum] = "d89d679dcfed9b5eef18f06e2dcb33a7ab543d53b358fa89ce65593c231eeebc" +SRC_URI[archive.sha256sum] = "19c3c5d79d2171f45baa0f632cc8995f8607bf1231a16014439bac9ba165a7c0" SRC_URI += "file://0001-drop-zenity-detection.patch" PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb index 19dad21380..08ac897a7f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_41.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Window and compositing manager based on Clutter" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch deleted file mode 100644 index 708595a7f1..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus/liportal-0.5-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix an issue building Nautilus with libportal-0.5+ -where expected header is moved to different directory -in staging sysroot - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- a/meson.build -+++ b/meson.build -@@ -123,7 +123,7 @@ gtk = dependency('gtk+-3.0', version: '> - libhandy = dependency('libhandy-1', version: '>= 1.1.90') - libportal = [] - if get_option('libportal') -- libportal = dependency('libportal', version: '>= 0.3') -+ libportal = dependency('libportal-gtk3', version: '>= 0.3') - endif - selinux = [] - if get_option('selinux') ---- a/src/nautilus-files-view.c -+++ b/src/nautilus-files-view.c -@@ -92,7 +92,7 @@ - - #ifdef HAVE_LIBPORTAL - #include <libportal/portal.h> --#include <libportal/portal-gtk3.h> -+#include <libportal-gtk3/portal-gtk3.h> - #endif - - /* Minimum starting update inverval */ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb index e9541a7150..2935cc2bfe 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb @@ -1,7 +1,7 @@ SUMMARY = "File manager for GNOME" SECTION = "x11/gnome" -LICENSE="GPLv3" +LICENSE="GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" GNOMEBASEBUILDCLASS = "meson" @@ -22,8 +22,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI += "file://liportal-0.5-fix.patch" -SRC_URI[archive.sha256sum] = "872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b" +SRC_URI[archive.sha256sum] = "3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5" REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb index 545224a99e..f1c9915c09 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb @@ -1,6 +1,6 @@ SUMMARY = "library to access web services that claim to be "RESTful"" HOMEPAGE = "https://wiki.gnome.org/Projects/Librest" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" GNOMEBASEBUILDCLASS = "autotools" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb index 3dd08a29cd..99b3c60fa5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb @@ -1,6 +1,6 @@ SUMMARY = "System-wide Performance Profiler for Linux" HOMEPAGE = "http://www.sysprof.com" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb index 0ac7e3693d..61e82e2856 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_6.00.0.bb @@ -15,10 +15,13 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gettext features_check +# for gtksourceview4 +REQUIRED_DISTRO_FEATURES += "x11" + SRC_URI[archive.sha256sum] = "a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63" # gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" GIR_MESON_OPTION = "" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb index 44b3671122..2847635b6d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Tracker miners and metadata extractors" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb index 1c18efbcef..f81a84cd31 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb @@ -1,5 +1,5 @@ SUMMARY = "Tracker is a file search engine" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=ee31012bf90e7b8c108c69f197f3e3a4 \ file://COPYING.LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb index ec8edb80d3..13dada4438 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-tools_41.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Collection of scripts and build utilities for documentation" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = " \ file://COPYING;md5=d67c6f9f1515506abfea4f0d920c0774 \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb index 3b23979780..50cc8fc3a7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_41.1.bb @@ -1,5 +1,5 @@ SUMMARY = "XSL stylesheets for the yelp help browser" -LICENSE = "LGPLv2.1 & GPLv2 & BSD-3-Clause" +LICENSE = "LGPL-2.1-only & GPL-2.0-only & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://COPYING;md5=8ca13a5a6972ac1620a1e42a3dacd774 \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb index 590ff2f548..01427b157d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_41.2.bb @@ -1,5 +1,5 @@ SUMMARY = "Help browser for the GNOME desktop" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = " \ file://COPYING;md5=6e1b9cb787e76d7e6946887a65caa754 \ " |