diff options
Diffstat (limited to 'meta-openembedded/meta-gnome')
41 files changed, 368 insertions, 717 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb index fff7d25d8d..75c704bc27 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.36.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb @@ -10,7 +10,7 @@ inherit gnomebase gobject-introspection gtk-doc gettext vala features_check REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a" +SRC_URI[archive.sha256sum] = "5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4" PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch deleted file mode 100644 index 4a5cd5b81b..0000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-meson.build-address-meson-0.61-failures.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ab27e6e6c839e1c65e4059a06982453a7aa1b6b3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Fri, 21 Jan 2022 22:34:09 +0100 -Subject: [PATCH] meson.build: address meson 0.61 failures - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 7ab613c8..688a7311 100644 ---- a/meson.build -+++ b/meson.build -@@ -253,7 +253,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false) - - foreach desktop: desktop_files - i18n.merge_file( -- desktop + '-desktop', - input: desktop + '.desktop.in', - output: desktop + '.desktop', - install: true, -@@ -274,7 +273,6 @@ endforeach - appdata = 'nm-connection-editor.appdata.xml' - - i18n.merge_file( -- 'desktop', - input: appdata + '.in', - output: appdata, - install: true, diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb index c0667b5bb1..8046b139c0 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.24.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb @@ -9,8 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " file://0001-meson.build-address-meson-0.61-failures.patch" -SRC_URI[archive.sha256sum] = "b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58" +SRC_URI[archive.sha256sum] = "69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd" # We don't not have ubuntu's appindicator (yet?) EXTRA_OEMESON = "-Dappindicator=no" diff --git a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb index 6f774904b7..dde5a02abb 100644 --- a/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb +++ b/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_1.4.0.bb @@ -3,8 +3,9 @@ HOMEPAGE = "http://gparted.org/index.php" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -inherit autotools pkgconfig python3native gnome-help gtk-icon-cache +inherit autotools pkgconfig python3native gnome-help gtk-icon-cache features_check +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch new file mode 100644 index 0000000000..bb129a4178 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl/0001-meson-Do-not-run-git-rev-parse-during-configure.patch @@ -0,0 +1,35 @@ +From 0e41b11b23c91293d1b39a8ec4cb80c68fb26ad7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 28 Apr 2022 07:35:31 -0700 +Subject: [PATCH] meson: Do not run git rev-parse during configure + +This option will try to deduce if babl is being built from git tree or +release tarball, there should be a better way like checking for .git +directory etc. instead of doing git operations needing network + +see +https://gitlab.gnome.org/GNOME/babl/-/commit/2dc7fc403fe427a889913ef0cfb71de85b4326ec#note_1439732 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 7e7a935..649b456 100644 +--- a/meson.build ++++ b/meson.build +@@ -451,7 +451,7 @@ if git_bin.found() and run_command( + git_bin, + 'rev-parse', + '--is-inside-work-tree', +- check: true, ++ check: false, + ).returncode() == 0 + git_version_h = vcs_tag( + input : 'git-version.h.in', +-- +2.36.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl/0001-meson-fix-misspelled-kwarg-name.patch b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl/0001-meson-fix-misspelled-kwarg-name.patch new file mode 100644 index 0000000000..111dac6484 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl/0001-meson-fix-misspelled-kwarg-name.patch @@ -0,0 +1,36 @@ +From ebcf4795f1132c5124d73a5ae2ca5c01319e584d Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz@archlinux.org> +Date: Sun, 13 Mar 2022 20:26:05 -0400 +Subject: [PATCH 1/2] meson: fix misspelled kwarg name + +set10 doesn't have a `Description` kwarg, it does have a `description` +kwarg though. + +This caused the conf variable to not have a description when it should +have one, and newer versions of Meson with better argument validation +error out with: + +meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description" + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/babl/-/commit/b05b2826365a7dbc6ca1bf0977b848055cd0cbb6] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 487e470..2623e93 100644 +--- a/meson.build ++++ b/meson.build +@@ -55,7 +55,7 @@ lib_name = meson.project_name() + '-' + api_version + stability_version_number = (major_version != 0 ? minor_version : micro_version) + stable = (stability_version_number % 2 == 0) + +-conf.set10('BABL_UNSTABLE', not stable, Description: ++conf.set10('BABL_UNSTABLE', not stable, description: + 'Define to 1 if this is an unstable version of BABL.') + + conf.set ('BABL_MAJOR_VERSION', '@0@'.format(major_version)) +-- +2.36.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl/0002-meson-Various-fixes.patch b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl/0002-meson-Various-fixes.patch new file mode 100644 index 0000000000..919653bf22 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl/0002-meson-Various-fixes.patch @@ -0,0 +1,132 @@ +From 06e16da32dfaad02434fd9937d298ea1ece256ce Mon Sep 17 00:00:00 2001 +From: Xavier Claessens <xavier.claessens@collabora.com> +Date: Sat, 23 Apr 2022 10:33:17 -0400 +Subject: [PATCH 2/2] meson: Various fixes + +- Add missing lcms dependencies. That's needed when lcms is a subproject + otherwise those targets does not find its headers. +- Add lcms2 wrap so meson can build it as subproject in case the + dependency is not found on system. +- Fix couple meson warnings +- Use meson.override_dependency() so babl can be used as subproject + without hardcoding "babl_dep" variable name in main project. + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/babl/-/commit/2dc7fc403fe427a889913ef0cfb71de85b4326ec] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + babl/meson.build | 4 +++- + extensions/meson.build | 1 + + meson.build | 4 +++- + subprojects/lcms2.wrap | 12 ++++++++++++ + tests/meson.build | 2 +- + tools/meson.build | 2 +- + 6 files changed, 21 insertions(+), 4 deletions(-) + create mode 100644 subprojects/lcms2.wrap + +diff --git a/babl/meson.build b/babl/meson.build +index d432dca..70fb131 100644 +--- a/babl/meson.build ++++ b/babl/meson.build +@@ -138,7 +138,7 @@ babl = library( + link_args: babl_link_args, + link_with: simd_extra, + dependencies: babl_deps, +- link_depends: version_script, ++ link_depends: version_script[0], + version: so_version, + install: true, + ) +@@ -165,4 +165,6 @@ if build_gir + install: true, + ) + endif ++else ++ babl_gir = [] + endif +diff --git a/extensions/meson.build b/extensions/meson.build +index 23672bb..9935f29 100644 +--- a/extensions/meson.build ++++ b/extensions/meson.build +@@ -6,6 +6,7 @@ no_cflags = [] + babl_ext_dep = [ + math, + thread, ++ lcms, + ] + + # Include directories +diff --git a/meson.build b/meson.build +index 2623e93..7e7a935 100644 +--- a/meson.build ++++ b/meson.build +@@ -451,6 +451,7 @@ if git_bin.found() and run_command( + git_bin, + 'rev-parse', + '--is-inside-work-tree', ++ check: true, + ).returncode() == 0 + git_version_h = vcs_tag( + input : 'git-version.h.in', +@@ -531,13 +532,14 @@ babl_dep = declare_dependency( + link_with : babl, + sources: [ + babl_version_h, +- is_variable('babl_gir') ? babl_gir : [] ++ build_gir ? babl_gir : [] + ], + variables: { + 'babl_path' : babl_extensions_build_dir, + 'babl_libdir' : babl_library_build_dir, + }, + ) ++meson.override_dependency('babl', babl_dep) + + ################################################################################ + # Build summary +diff --git a/subprojects/lcms2.wrap b/subprojects/lcms2.wrap +new file mode 100644 +index 0000000..2cc69df +--- /dev/null ++++ b/subprojects/lcms2.wrap +@@ -0,0 +1,12 @@ ++[wrap-file] ++directory = Little-CMS-2.12 ++source_url = https://github.com/mm2/Little-CMS/archive/refs/tags/2.12.tar.gz ++source_filename = lcms2-2.12.tar.gz ++source_hash = e501f1482fc424550ef3abbf86bf1c66090e1661249e89552d39ed5bf935df66 ++patch_filename = lcms2_2.12-2_patch.zip ++patch_url = https://wrapdb.mesonbuild.com/v2/lcms2_2.12-2/get_patch ++patch_hash = 3ac6944ac4b8d8507b85961d98cb287532945183d0e8f094c77810e793b6bebe ++ ++[provide] ++lcms2 = liblcms2_dep ++ +diff --git a/tests/meson.build b/tests/meson.build +index eee8895..7c67e70 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -42,7 +42,7 @@ foreach test_name : test_names + test_name + '.c', + include_directories: [rootInclude, bablInclude], + link_with: babl, +- dependencies: thread, ++ dependencies: [thread, lcms], + export_dynamic: true, + install: false, + ) +diff --git a/tools/meson.build b/tools/meson.build +index 2719335..89ccf40 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -18,7 +18,7 @@ foreach tool_name : tool_names + tool_name + '.c', + include_directories: [rootInclude, bablInclude], + link_with: babl, +- dependencies: [math, thread], ++ dependencies: [math, thread, lcms], + install: false, + ) + +-- +2.36.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.92.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.92.bb index 156c91bcbd..f2e11c1117 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.92.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.92.bb @@ -14,7 +14,11 @@ DEPENDS += "lcms" CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore " CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore " -SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" +SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz \ + file://0001-meson-fix-misspelled-kwarg-name.patch \ + file://0002-meson-Various-fixes.patch \ + file://0001-meson-Do-not-run-git-rev-parse-during-configure.patch \ +" SRC_URI[sha256sum] = "f667735028944b6375ad18f160a64ceb93f5c7dccaa9d8751de359777488a2c1" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb index 1155e0eec3..a73de1e3ff 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.30.bb @@ -51,11 +51,7 @@ EXTRA_OECONF = "--disable-python \ --disable-check-update \ --without-wmf" -EXTRA_OECONF:append:toolchain-clang:arm = " --disable-vector-icons" -EXTRA_OECONF:append:toolchain-clang:riscv32 = " --disable-vector-icons" -EXTRA_OECONF:append:toolchain-clang:mips = " --disable-vector-icons" -EXTRA_OECONF:append:toolchain-clang:x86 = " --disable-vector-icons" -EXTRA_OECONF:append:powerpc = " --disable-vector-icons" +EXTRA_OECONF += "${@oe.utils.conditional('SITEINFO_BITS', '32', ' --disable-vector-icons', '', d)}" do_configure:append() { find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.2.bb index 2e22f2e703..af6d74c1a0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_42.2.bb @@ -24,7 +24,7 @@ inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection g def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "b24767bb3d5103b4e35b0e15cf033dbe2488f88700cdd882d22a43adeec2e80a" +SRC_URI[archive.sha256sum] = "ff7f81f308cf8d4956ed97fb724a7e49448c214beeab998812ef9efbb38df8ae" GTKDOC_MESON_OPTION = "gtk_doc" 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 81b02914d2..8f5f6defe0 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 @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.sha256sum] = "0d8881b5c51e1b91761b1945db264a46aabf54a73eea1ca8f448b207815d582e" -PV = "3.44.0" +SRC_URI[archive.sha256sum] = "6e05a90204a276f99d932097f1032cc17dd1d8e265c7c56727c63240fd4c0ccf" +PV = "3.44.1" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb index 9e6fc45db3..95e4bd5cc6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gjs/gjs_1.72.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" GNOMEBASEBUILDCLASS = "meson" -DEPENDS = "mozjs-91" +DEPENDS = "mozjs-91 cairo" inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb deleted file mode 100644 index 289cc9ed5e..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_41.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "GNOME wallpapers" -LICENSE = "GPL-2.0-only & CC-BY-2.0 & CC-BY-SA-2.0 & CC-BY-SA-3.0" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=75859989545e37968a99b631ef42722e \ - file://COPYING_CCBY2;md5=effd72660912b727dfa9722cb295d7be \ - file://COPYING_CCBYSA2;md5=4737b7833b3212fdf30257f056ef3e64 \ - file://COPYING_CCBYSA3;md5=b52fb0a6df395efb7047cb6fc56bfd7e \ -" - -SECTION = "x11/gnome" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gettext allarch - -SRC_URI[archive.sha256sum] = "1da1ac0d261bedf0fcd2c85b480bc65505e23cf51f1143126c0d37717e693145" - -FILES:${PN} += " \ - ${datadir}/backgrounds \ - ${datadir}/gnome-background-properties \ -" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_42.0.bb new file mode 100644 index 0000000000..d700c1bcb0 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_42.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "GNOME wallpapers" +LICENSE = "CC-BY-SA-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=b52fb0a6df395efb7047cb6fc56bfd7e" + +SECTION = "x11/gnome" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gettext allarch + +SRC_URI[archive.sha256sum] = "4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d" + +FILES:${PN} += " \ + ${datadir}/backgrounds \ + ${datadir}/gnome-background-properties \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch index 16c87b6a63..16c87b6a63 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch 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-bluetooth3_3.34.5.bb index 57fe74495d..e2a885b1fb 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-bluetooth3_3.34.5.bb @@ -8,6 +8,9 @@ SECTION = "x11/gnome" DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" +GNOMEBN = "gnome-bluetooth" +S = "${WORKDIR}/${GNOMEBN}-${PV}" + GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" @@ -22,4 +25,16 @@ SRC_URI += " file://0001-build-Fix-build-for-newer-versions-of-meson.patch" SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9" +# avoid clashes with gnome-bluetooth +do_install:append() { + # just bluetooth-sendto / bluetooth-sendto.desktop only + rm -rf ${D}${bindir} + rm -rf ${D}${datadir}/applications +} + +FILES:${PN} += "${datadir}/gnome-bluetooth" + +# offer alternate bluetooth-sendto +RRECOMMENS:${PN} += "gnome-bluetooth" + RDEPENDS:${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb index 3fe2c35ef4..36fe9cf215 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb @@ -18,9 +18,6 @@ DEPENDS = " \ libadwaita \ " -GNOMEBN = "gnome-bluetooth" -S = "${WORKDIR}/${GNOMEBN}-${PV}" - GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" GTKIC_VERSION = "4" @@ -31,6 +28,17 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170" -RDEPENDS:${PN} += "bluez5" +BT_PULSE_PACKS = " \ + pulseaudio-lib-bluez5-util \ + pulseaudio-module-bluetooth-discover \ + pulseaudio-module-bluetooth-policy \ + pulseaudio-module-bluez5-device \ + pulseaudio-module-bluez5-discover \ +" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" +PACKAGECONFIG[pulseaudio] = ",,,${BT_PULSE_PACKS}" FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" + +RDEPENDS:${PN} += "bluez5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 8170f514ed..768ba54390 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -19,19 +19,19 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index a347168..2cd8121 100644 +index dbca723..af0f871 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') - option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') option('documentation', type: 'boolean', value: false, description: 'build documentation') option('ibus', type: 'boolean', value: true, description: 'build with IBus support') + option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') diff --git a/panels/background/meson.build b/panels/background/meson.build -index bb34b69..f22722e 100644 +index 3634c47..459ccfe 100644 --- a/panels/background/meson.build +++ b/panels/background/meson.build -@@ -36,7 +36,7 @@ common_sources = [] +@@ -25,7 +25,7 @@ common_sources = [] enums = 'gdesktop-enums-types' enums_header = files( @@ -41,5 +41,5 @@ index bb34b69..f22722e 100644 ) -- -2.20.1 +2.34.1 diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch deleted file mode 100644 index 7a1180e682..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-meson-drop-unused-argument-for-i18n.merge_file.patch +++ /dev/null @@ -1,504 +0,0 @@ -From 90715329c277f21537eb5af86d8f222c4a2abd24 Mon Sep 17 00:00:00 2001 -From: Jan Beich <jbeich@FreeBSD.org> -Date: Fri, 7 Jan 2022 01:53:52 +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. - -panels/applications/meson.build:10:5: ERROR: Function does not take positional arguments. -panels/background/meson.build:10:5: ERROR: Function does not take positional arguments. -panels/camera/meson.build:10:5: ERROR: Function does not take positional arguments. -[...] - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - panels/applications/meson.build | 1 - - panels/background/meson.build | 1 - - panels/bluetooth/meson.build | 1 - - panels/camera/meson.build | 1 - - panels/color/meson.build | 1 - - panels/datetime/meson.build | 2 -- - panels/default-apps/meson.build | 1 - - panels/diagnostics/meson.build | 1 - - panels/display/meson.build | 1 - - panels/info-overview/meson.build | 1 - - panels/keyboard/meson.build | 2 -- - panels/location/meson.build | 1 - - panels/lock/meson.build | 1 - - panels/microphone/meson.build | 1 - - panels/mouse/meson.build | 1 - - panels/multitasking/meson.build | 1 - - panels/network/meson.build | 1 - - panels/notifications/meson.build | 1 - - panels/online-accounts/meson.build | 1 - - panels/power/meson.build | 1 - - panels/printers/meson.build | 1 - - panels/region/meson.build | 1 - - panels/removable-media/meson.build | 1 - - panels/search/meson.build | 1 - - panels/sharing/meson.build | 2 -- - panels/sound/meson.build | 1 - - panels/thunderbolt/meson.build | 1 - - panels/universal-access/meson.build | 1 - - panels/usage/meson.build | 1 - - panels/user-accounts/meson.build | 2 -- - panels/wacom/meson.build | 1 - - panels/wwan/meson.build | 1 - - shell/appdata/meson.build | 1 - - shell/meson.build | 1 - - tests/interactive-panels/applications/meson.build | 1 - - 35 files changed, 39 deletions(-) - -diff --git a/panels/applications/meson.build b/panels/applications/meson.build -index d511bf6..bd4fd64 100644 ---- a/panels/applications/meson.build -+++ b/panels/applications/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type : 'desktop', - input : desktop_in, - output : desktop, -diff --git a/panels/background/meson.build b/panels/background/meson.build -index 730cf54..1f231b9 100644 ---- a/panels/background/meson.build -+++ b/panels/background/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/bluetooth/meson.build b/panels/bluetooth/meson.build -index c3fce74..4bed812 100644 ---- a/panels/bluetooth/meson.build -+++ b/panels/bluetooth/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/camera/meson.build b/panels/camera/meson.build -index 4f26118..bf2e727 100644 ---- a/panels/camera/meson.build -+++ b/panels/camera/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/color/meson.build b/panels/color/meson.build -index 742caf6..bb038cd 100644 ---- a/panels/color/meson.build -+++ b/panels/color/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build -index 6568394..9bbdc7c 100644 ---- a/panels/datetime/meson.build -+++ b/panels/datetime/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -@@ -20,7 +19,6 @@ i18n.merge_file( - polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname) - - i18n.merge_file( -- polkit, - input: polkit + '.in', - output: polkit, - po_dir: po_dir, -diff --git a/panels/default-apps/meson.build b/panels/default-apps/meson.build -index 6855006..2a24321 100644 ---- a/panels/default-apps/meson.build -+++ b/panels/default-apps/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/diagnostics/meson.build b/panels/diagnostics/meson.build -index fac9b4c..2f25c21 100644 ---- a/panels/diagnostics/meson.build -+++ b/panels/diagnostics/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/display/meson.build b/panels/display/meson.build -index 12f35cc..57bdfcf 100644 ---- a/panels/display/meson.build -+++ b/panels/display/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build -index 2fe10b3..aa81c48 100644 ---- a/panels/info-overview/meson.build -+++ b/panels/info-overview/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/keyboard/meson.build b/panels/keyboard/meson.build -index a2ae026..ae71c94 100644 ---- a/panels/keyboard/meson.build -+++ b/panels/keyboard/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -@@ -45,7 +44,6 @@ xml_files = [ - - foreach file: xml_files - i18n.merge_file( -- file, - input: file + '.in', - output: file, - po_dir: po_dir, -diff --git a/panels/location/meson.build b/panels/location/meson.build -index bfc6e82..f4c835d 100644 ---- a/panels/location/meson.build -+++ b/panels/location/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/lock/meson.build b/panels/lock/meson.build -index 0661af4..18dbfb2 100644 ---- a/panels/lock/meson.build -+++ b/panels/lock/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/microphone/meson.build b/panels/microphone/meson.build -index e0847a4..bc7f73a 100644 ---- a/panels/microphone/meson.build -+++ b/panels/microphone/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/mouse/meson.build b/panels/mouse/meson.build -index 357aaae..7b46097 100644 ---- a/panels/mouse/meson.build -+++ b/panels/mouse/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/multitasking/meson.build b/panels/multitasking/meson.build -index 772b638..53fd0d8 100644 ---- a/panels/multitasking/meson.build -+++ b/panels/multitasking/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/network/meson.build b/panels/network/meson.build -index d7cd6e4..43a5690 100644 ---- a/panels/network/meson.build -+++ b/panels/network/meson.build -@@ -25,7 +25,6 @@ foreach name: panel_names - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/notifications/meson.build b/panels/notifications/meson.build -index df70261..1b04b24 100644 ---- a/panels/notifications/meson.build -+++ b/panels/notifications/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/online-accounts/meson.build b/panels/online-accounts/meson.build -index 82f1d56..6870977 100644 ---- a/panels/online-accounts/meson.build -+++ b/panels/online-accounts/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/power/meson.build b/panels/power/meson.build -index 0e3ea1d..1cafe2a 100644 ---- a/panels/power/meson.build -+++ b/panels/power/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/printers/meson.build b/panels/printers/meson.build -index ccce64c..042c67a 100644 ---- a/panels/printers/meson.build -+++ b/panels/printers/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/region/meson.build b/panels/region/meson.build -index 68b7f00..27bc5ff 100644 ---- a/panels/region/meson.build -+++ b/panels/region/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/removable-media/meson.build b/panels/removable-media/meson.build -index b51799a..fc07c48 100644 ---- a/panels/removable-media/meson.build -+++ b/panels/removable-media/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/search/meson.build b/panels/search/meson.build -index 39b076b..a4dd79d 100644 ---- a/panels/search/meson.build -+++ b/panels/search/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/sharing/meson.build b/panels/sharing/meson.build -index b3803bc..49dbb06 100644 ---- a/panels/sharing/meson.build -+++ b/panels/sharing/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -@@ -29,7 +28,6 @@ polkit_in = configure_file( - ) - - i18n.merge_file( -- polkit, - input: polkit_in, - output: polkit, - po_dir: po_dir, -diff --git a/panels/sound/meson.build b/panels/sound/meson.build -index fa0f128..18f75dd 100644 ---- a/panels/sound/meson.build -+++ b/panels/sound/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/thunderbolt/meson.build b/panels/thunderbolt/meson.build -index 53aa9b4..38ef294 100644 ---- a/panels/thunderbolt/meson.build -+++ b/panels/thunderbolt/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/universal-access/meson.build b/panels/universal-access/meson.build -index 5e225fe..d845e70 100644 ---- a/panels/universal-access/meson.build -+++ b/panels/universal-access/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/usage/meson.build b/panels/usage/meson.build -index 74f720e..6047ce0 100644 ---- a/panels/usage/meson.build -+++ b/panels/usage/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build -index b8ee9d9..fa56aae 100644 ---- a/panels/user-accounts/meson.build -+++ b/panels/user-accounts/meson.build -@@ -8,7 +8,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, -@@ -85,7 +84,6 @@ meson.add_install_script('sh', '-c', - polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname) - - i18n.merge_file( -- polkit, - input: polkit + '.in', - output: polkit, - po_dir: po_dir, -diff --git a/panels/wacom/meson.build b/panels/wacom/meson.build -index 5f62220..88a9137 100644 ---- a/panels/wacom/meson.build -+++ b/panels/wacom/meson.build -@@ -30,7 +30,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type : 'desktop', - input : desktop_in, - output : desktop, -diff --git a/panels/wwan/meson.build b/panels/wwan/meson.build -index 8c1b02f..2ab238a 100644 ---- a/panels/wwan/meson.build -+++ b/panels/wwan/meson.build -@@ -11,7 +11,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type : 'desktop', - input : desktop_in, - output : desktop, -diff --git a/shell/appdata/meson.build b/shell/appdata/meson.build -index 3b36171..fdb8279 100644 ---- a/shell/appdata/meson.build -+++ b/shell/appdata/meson.build -@@ -1,7 +1,6 @@ - appdata = 'gnome-control-center.appdata.xml' - - i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: po_dir, -diff --git a/shell/meson.build b/shell/meson.build -index 89b9659..4667804 100644 ---- a/shell/meson.build -+++ b/shell/meson.build -@@ -23,7 +23,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file( -- desktop, - type : 'desktop', - input : desktop_in, - output : desktop, -diff --git a/tests/interactive-panels/applications/meson.build b/tests/interactive-panels/applications/meson.build -index 2657f95..82eed4d 100644 ---- a/tests/interactive-panels/applications/meson.build -+++ b/tests/interactive-panels/applications/meson.build -@@ -12,7 +12,6 @@ desktop_files = [ - - foreach desktop_file : desktop_files - i18n.merge_file( -- desktop, - type : 'desktop', - input : 'gtp-@0@.desktop.in'.format(desktop_file), - output : 'gnome-@0@-panel.desktop'.format(desktop_file), 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_42.0.bb index 1cdc96ba0b..6fe999a191 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_42.0.bb @@ -26,23 +26,20 @@ DEPENDS = " \ libgtop \ gsound \ libpwquality \ - libhandy \ + libadwaita \ " REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" -SRC_URI[archive.sha256sum] = "8271fc6b33ec2418a578304dd3e57d665f0d7cc706a99a97be419848618fe248" +SRC_URI[archive.sha256sum] = "0732efa7c4171ce0a0ed4106580b4ce35a57b10152c0ea36d239134913777eda" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" -SRC_URI += " file://0001-meson-drop-unused-argument-for-i18n.merge_file.patch" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" PACKAGECONFIG[ibus] = "-Dibus=true, -Dibus=false, ibus" PACKAGECONFIG[wayland] = "-Dwayland=true, -Dwayland=false, wayland" -# Once we have (lib)cheese we can make cheese a PACKAGECONFIG EXTRA_OEMESON = " \ -Doe_sysroot=${STAGING_DIR_HOST} \ - -Dcheese=false \ " do_install:append() { 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.44.0.bb index 13a68e3c80..1e357af875 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.44.0.bb @@ -14,11 +14,11 @@ DEPENDS += " \ metacity \ gdm \ gnome-desktop \ - gnome-bluetooth \ + gnome-bluetooth3 \ gnome-panel \ " -SRC_URI[archive.sha256sum] = "c8029220acf268c520dbb0750834b2ef4df868324d0e0fb6a80354c80ba8844e" +SRC_URI[archive.sha256sum] = "1df0838127c6246eecd89d1c50ff88fc82abf6de3b3068e52dde495a42bd550a" do_install:append() { # no oe-layer has compiz -> remove dead session @@ -27,6 +27,7 @@ do_install:append() { FILES:${PN} += " \ ${datadir}/desktop-directories \ + ${datadir}/gnome-control-center \ ${datadir}/gnome-panel \ ${datadir}/gnome-session \ ${datadir}/xsessions \ 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.44.0.bb index 2bcf145471..67bdf58f81 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.44.0.bb @@ -11,13 +11,13 @@ DEPENDS += " \ libwnck3 \ polkit \ dconf \ - libgweather \ + libgweather4 \ gnome-menus \ gnome-desktop \ gdm \ " -SRC_URI[archive.sha256sum] = "aea8c0efc2edba20e97ad4695179cd0a2538e64c2904702cc8c594e8e0898703" +SRC_URI[archive.sha256sum] = "99655f75d031876c130ed23c4da22c099e7bcc4048b0255a3c3a3bbc787b31aa" PACKAGECONFIG[eds] = "--enable-eds,--disable-eds,evolution-data-server" 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_42.0.bb index 07f3634294..9407c25a55 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_42.0.bb @@ -22,7 +22,7 @@ inherit gnomebase gettext gsettings upstream-version-is-even features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.sha256sum] = "ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39" +SRC_URI[archive.sha256sum] = "3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit',d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch deleted file mode 100644 index cb758c7c8d..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon/0001-build-remove-positional-i18n.merge_file-arguments.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 56535d2f1ec64e847e5fbd0613e78bd0dc046519 Mon Sep 17 00:00:00 2001 -From: Michal Vasilek <michal@vasilek.cz> -Date: Fri, 14 Jan 2022 23:55:06 +0100 -Subject: [PATCH] build: remove positional i18n.merge_file arguments - -otherwise building with meson 0.61+ fails: - - ERROR: Function does not take positional arguments. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - plugins/power/meson.build | 1 - - plugins/wacom/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/plugins/power/meson.build b/plugins/power/meson.build -index 69e619f..014bb6d 100644 ---- a/plugins/power/meson.build -+++ b/plugins/power/meson.build -@@ -76,7 +76,6 @@ if host_is_linux - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, -diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build -index d8dd0ec..c00323d 100644 ---- a/plugins/wacom/meson.build -+++ b/plugins/wacom/meson.build -@@ -7,7 +7,6 @@ policy_in = configure_file( - ) - - i18n.merge_file( -- policy, - input: policy_in, - output: policy, - po_dir: po_dir, 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_42.1.bb index cbc4c460c1..3d5913ac06 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_42.1.bb @@ -11,7 +11,7 @@ DEPENDS = " \ geocode-glib \ gcr \ gnome-desktop \ - libgweather \ + libgweather4 \ lcms \ libcanberra \ geoclue \ @@ -25,8 +25,7 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" GIR_MESON_OPTION = "" -SRC_URI += " file://0001-build-remove-positional-i18n.merge_file-arguments.patch" -SRC_URI[archive.sha256sum] = "e6ca6361fbd1deab2de1a1e390d4f14167cf47b1c547dbb8b65a5d89e9663884" +SRC_URI[archive.sha256sum] = "ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb" PACKAGECONFIG ??= " \ cups nm \ @@ -43,5 +42,5 @@ PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland" FILES:${PN} += " \ ${systemd_user_unitdir} \ - ${libdir}/gnome-settings-daemon-41/libgsd.so \ + ${libdir}/gnome-settings-daemon-42/libgsd.so \ " 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 deleted file mode 100644 index df8fe0e6e6..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions/0001-meson-Drop-unused-argument-for-i18n.merge_file.patch +++ /dev/null @@ -1,30 +0,0 @@ -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_42.0.bb index f51ca9f918..e8c95d6fb2 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_42.0.bb @@ -8,8 +8,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" +SRC_URI[archive.sha256sum] = "3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f" DEPENDS += " \ sassc-native \ @@ -20,12 +19,6 @@ EXTRA_OEMESON += " \ -Dclassic_mode=true \ " -do_install:append() { - # enable gnome-classic session for wayland - install -d ${D}${datadir}/wayland-sessions - install -m644 ${D}${datadir}/xsessions/gnome-classic.desktop ${D}${datadir}/wayland-sessions/ -} - RDEPENDS:${PN} += "gnome-shell" FILES:${PN} += " \ 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.10.0.bb index 15f1cadbab..fe1b3ea67c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.9.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gspell/gspell_1.10.0.bb @@ -7,4 +7,4 @@ DEPENDS = "gtk+3 iso-codes enchant2" inherit gnomebase gettext gobject-introspection vala -SRC_URI[archive.sha256sum] = "dcbb769dfdde8e3c0a8ed3102ce7e661abbf7ddf85df08b29915e92cd723abdd" +SRC_URI[archive.sha256sum] = "803bb884c0215d3fd22a85d7f30423aff88d9792f05a5199d8a489a2ffaae1da" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch b/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch deleted file mode 100644 index b50b175e70..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb/0001-LINGUAS-removed-duplicated-entry.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f3d399892e59a2e850be1d0de30c429417c78360 Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega <paobac@src.gnome.org> -Date: Tue, 11 Jan 2022 12:30:44 +0100 -Subject: [PATCH] LINGUAS: removed duplicated entry - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - help/LINGUAS | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/help/LINGUAS b/help/LINGUAS -index 0e8a52d..fa1fc3e 100644 ---- a/help/LINGUAS -+++ b/help/LINGUAS -@@ -8,7 +8,6 @@ eu - fr - hu - id --id - nl - oc - sl 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.2.bb index 1459e0b434..0c5b71f5b6 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.2.bb @@ -26,7 +26,6 @@ DEPENDS = " \ inherit features_check gnomebase gnome-help gsettings itstool mime-xdg -SRC_URI += " file://0001-LINGUAS-removed-duplicated-entry.patch" -SRC_URI[archive.sha256sum] = "3deffc030384e64b57361c437c79b481ae1489ef44c87ae856e81bb10d8e383f" +SRC_URI[archive.sha256sum] = "97f8afe522535216541ebbf1e3b546d12a6beb38a8f0eb85f26e676934aad425" FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.1.bb index 51ff4c898a..f667238e65 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.1.bb @@ -22,10 +22,10 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase lib_package gettext features_check gtk-doc gtk-icon-cache gobject-introspection vala -REQUIRED_DISTRO_FEATURES = "x11" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.4/${PNAME}-${PV}.tar.xz" -SRC_URI[sha256sum] = "003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637" +SRC_URI[sha256sum] = "eb3584099cfa0adc9a0b1ede08def6320bd099e79e74a2d0aefb4057cd93d68e" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.1.bb index d4820d1244..8ca3be352e 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.1.1.bb @@ -11,7 +11,7 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gtk-doc vala features_check -SRC_URI[archive.sha256sum] = "aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e" +SRC_URI[archive.sha256sum] = "491169d4f6a11765328996bc088272d05c7235453bc0ee73c20dfd4bd67b401c" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch new file mode 100644 index 0000000000..6c6a643edf --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch @@ -0,0 +1,33 @@ +From 179102310e9a3729fb5b00f2a7bf24b12f4a7a83 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sat, 16 Apr 2022 20:04:14 +0200 +Subject: [PATCH] Allow building gir in cross environments +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For us this works perfectly fine + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + libgweather/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgweather/meson.build b/libgweather/meson.build +index 08311af..ef554f2 100644 +--- a/libgweather/meson.build ++++ b/libgweather/meson.build +@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4', + ) + + g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) +-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build() ++build_gir = get_option('introspection') and g_ir_scanner.found() + + enable_vala = get_option('enable_vala') + vapigen = find_program('vapigen', required: enable_vala == 'true') +-- +2.34.1 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb index acfb97655a..708d27a61f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb @@ -7,14 +7,11 @@ GNOMEBASEBUILDCLASS = "meson" GNOMEBN = "libgweather" S = "${WORKDIR}/${GNOMEBN}-${PV}" -inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even +inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala +SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch" SRC_URI[archive.sha256sum] = "440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c" -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -GIR_MESON_OPTION = "" - GTKDOC_MESON_OPTION = "gtk_doc" DEPENDS = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.6.bb index 6deac38fda..ec728d78b9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libportal/libportal_0.6.bb @@ -6,8 +6,8 @@ BUGTRACKER = "https://github.com/flatpak/libportal/issues" LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" -SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=master" -SRCREV = "467a397fd7996557f837cdc26ac07c01c62810e5" +SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main" +SRCREV = "13df0b887a7eb7b0f9b14069561a41f62e813155" S = "${WORKDIR}/git" inherit meson gtk-doc gobject-introspection diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.1.1.bb index 08277416f3..6d942204f6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_42.1.1.bb @@ -21,7 +21,7 @@ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check def gnome_verdir(v): return oe.utils.trim_version(v, 1) -SRC_URI[archive.sha256sum] = "3c904f33ba2d2a078892bee2af71484cd608923cd78ec7e8a1517bc2155113d5" +SRC_URI[archive.sha256sum] = "8519d4565e842aa3d31d0fe39b21d48ac54edc0f0658fe1d8ea2da4e704c1b66" REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch new file mode 100644 index 0000000000..dc702a0e37 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch @@ -0,0 +1,30 @@ +From 19188367bee87b0084ab34869455155da5cb1731 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Apr 2022 08:47:39 -0700 +Subject: [PATCH] meson: Check for libunwind instead of libunwind-generic + +This helps it to use llvm unwinder since libunwind-generic is specific +to nongnu libunwind. + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2835782..0fdb39a 100644 +--- a/meson.build ++++ b/meson.build +@@ -81,7 +81,7 @@ config_h.set10('HAVE_POLKIT_AGENT', polkit_agent_dep.found()) + config_h.set10('HAVE_POLKIT', polkit_dep.found()) + + if get_option('libunwind') +- libunwind_dep = dependency('libunwind-generic') ++ libunwind_dep = dependency('libunwind') + config_h.set('ENABLE_LIBUNWIND', libunwind_dep.found()) + config_h.set('HAVE_UNW_SET_CACHE_SIZE', libunwind_dep.found() and cc.has_header_symbol('libunwind.h', 'unw_set_cache_size', dependencies: [libunwind_dep])) + endif +-- +2.35.2 + 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.44.0.bb index 99b3c60fa5..c9d32c3946 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.42.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb @@ -15,14 +15,19 @@ DEPENDS += " \ json-glib \ " -SRC_URI[archive.sha256sum] = "1796b81404ee75fd1ebacf54464ad7affebf62f2851eef524d9f8eac0c4a2001" +SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch" +SRC_URI[archive.sha256sum] = "ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd libsysprof', '', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \ + libunwind" +# nongnu libunwind needs porting to RV32 +PACKAGECONFIG:remove:riscv32 = "libunwind" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'libsysprof', '', d)} \ - ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" +PACKAGECONFIG[libunwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" EXTRA_OEMESON += "-Dsystemdunitdir=${systemd_unitdir}/system" 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.3.0.bb index f81a84cd31..bb2396af7c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.2.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tracker/tracker_3.3.0.bb @@ -22,7 +22,7 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check python3native -SRC_URI[archive.sha256sum] = "1847e08b39e6e61d848735aa1f97f7d96c038201653fa0d7cb9e81b37eb9c03a" +SRC_URI[archive.sha256sum] = "0706f96fe7f95df42acec812c1de7b4593a0d648321ca83506a9d71e22417bda" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb index 2d733ce53e..be43d0d500 100644 --- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb @@ -15,8 +15,8 @@ EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" PACKAGECONFIG ??= " \ dconf vala \ - ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3 gtk4', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ " do_configure:prepend() { @@ -29,6 +29,8 @@ FILES:${PN} += " \ ${datadir}/GConf \ ${datadir}/glib-2.0 \ ${libdir}/gtk-3.0 \ + ${libdir}/gtk-4.0 \ + ${systemd_user_unitdir} \ " FILES:${PN}-dev += " \ diff --git a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc index 23f565f661..37a490abe0 100644 --- a/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala -PV = "1.5.23+git${SRCPV}" +PV = "1.5.26" DEPENDS = "unicode-ucd" @@ -13,13 +13,15 @@ SRC_URI = " \ git://github.com/ibus/ibus.git;branch=master;protocol=https \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ " -SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40" +SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3" S = "${WORKDIR}/git" PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[gtk4] = "--enable-gtk4,--disable-gtk4,gtk4" +PACKAGECONFIG[systemd] = "--enable-systemd-services,--disable-systemd-services,systemd" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" |