From 62eb07bcdc2e84cae2304e0cdd8bbc34259c1f37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 1 Nov 2021 12:49:23 +0100 Subject: [PATCH] gnome-desktop: upgrade 3.38.8 -> 41.0 and give up '3' receipe name suffix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...ild-Disable-libseccomp-for-all-archs.patch | 8 +++--- ...sktop3_3.38.8.bb => gnome-desktop_41.0.bb} | 28 +++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) rename meta-gnome/recipes-gnome/gnome-desktop/{gnome-desktop3_3.38.8.bb => gnome-desktop_41.0.bb} (57%) diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch index 4b3894f055..99cf45830e 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch @@ -18,14 +18,14 @@ Signed-off-by: Andreas Müller 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meson.build b/meson.build -index 2e7160d..f83677d 100644 +index cceefe0..df3fdd9 100644 --- a/meson.build +++ b/meson.build -@@ -58,12 +58,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) +@@ -59,12 +59,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) host_os = host_machine.system() host_cpu = host_machine.cpu() supported_os = ['linux'] --unsupported_cpus = ['alpha', 'ia64', 'm68k', 'riscv64', 'sh4', 'sparc', 'sparc64'] +-unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64'] -if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) - seccomp_dep = dependency('libseccomp') -else @@ -36,5 +36,5 @@ index 2e7160d..f83677d 100644 xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base') -- -2.20.1 +2.31.1 diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.38.8.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.0.bb similarity index 57% rename from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.38.8.bb rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.0.bb index 61de652f8d..71ea79f99a 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.38.8.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.0.bb @@ -6,18 +6,16 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ " -BPN = "gnome-desktop" - GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check +inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check gtk-doc +REQUIRED_DISTRO_FEATURES = "x11" # gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST:append = " introspection" -SRC_URI[archive.sha256sum] = "04dc3b37c2b7d98df972670ac2a5a33ec7dc278e6814c3d23d099ae6789dcae8" - +SRC_URI[archive.sha256sum] = "69cb1d3d9a10700eb66348ef1c0e66a855fc5a97ae62902df97a499da11562d2" SRC_URI += " \ file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ @@ -25,13 +23,19 @@ SRC_URI += " \ DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" -inherit features_check gtk-doc -REQUIRED_DISTRO_FEATURES += "x11" - GTKDOC_MESON_OPTION = "gtk_doc" EXTRA_OEMESON = "-Ddesktop_docs=false" -PACKAGES =+ "libgnome-desktop3" -FILES:libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" +PACKAGES =+ "libgnome-desktop" +RDEPENDS:${PN} += "libgnome-desktop" +FILES:libgnome-desktop = " \ + ${libdir}/lib*${SOLIBS} \ + ${datadir}/libgnome-desktop*/pnp.ids \ + ${datadir}/gnome/*xml \ +" -RRECOMMENDS:libgnome-desktop3 += "gsettings-desktop-schemas" +RRECOMMENDS:libgnome-desktop += "gsettings-desktop-schemas" + +PROVIDES += "gnome-desktop3" +RPROVIDES:${PN} += "gnome-desktop3" +RPROVIDES:libgnome-desktop += "gnome-desktop3"