From 9b7cce8860872ef23bcd2dea9afe6c84a125a74e Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sun, 3 Apr 2022 19:36:04 +0200 Subject: gnome-desktop: upgrade 41.2 -> 42.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Build both gtk3 and gtk4 variants for now ============= Version 42.rc ============= - Translation updates =============== Version 42.beta =============== - Add async methods for thumbnail creation - thumbnail: Resolve symlinks before exporting them with Flatpak - Make table:cangjie5 the default input method for zh_HK - Translation updates ============ Version 42.alpha.1 ============ - build: fix soversion in libgnome-desktop-4 Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...on.build-Disable-libseccomp-for-all-archs.patch | 10 ++--- .../gnome-desktop/gnome-desktop_41.2.bb | 38 ----------------- .../gnome-desktop/gnome-desktop_42.0.bb | 47 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 43 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb create mode 100644 meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb (limited to 'meta-gnome') 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 99cf45830e..8ae1d82b6a 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,10 +18,10 @@ Signed-off-by: Andreas Müller 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meson.build b/meson.build -index cceefe0..df3fdd9 100644 +index 1dc8a73..87d72fe 100644 --- a/meson.build +++ b/meson.build -@@ -59,12 +59,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) +@@ -65,12 +65,7 @@ udev_dep = dependency('libudev', required: get_option('udev')) host_os = host_machine.system() host_cpu = host_machine.cpu() supported_os = ['linux'] @@ -32,9 +32,9 @@ index cceefe0..df3fdd9 100644 - seccomp_dep = dependency('', required: false) -endif +seccomp_dep = dependency('', required: false) - fontconfig_cache_path = fontconfig_dep.get_pkgconfig_variable('cachedir') - xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base') + fontconfig_cache_path = fontconfig_dep.get_variable(pkgconfig: 'cachedir') + xkb_base = xkb_config_dep.get_variable(pkgconfig: 'xkb_base') -- -2.31.1 +2.34.1 diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb deleted file mode 100644 index 6bf2ab3986..0000000000 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPL-2.0-only & LGPL-2.0-only" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ -" - -GNOMEBASEBUILDCLASS = "meson" - -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" - -GIR_MESON_OPTION = "" - -SRC_URI[archive.sha256sum] = "34329eefdacad2332a6adbae538c8da6e52235c7775a908b7c32040a0753ec6a" -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ -" - -DEPENDS += "gsettings-desktop-schemas virtual/libx11 gtk+3 startup-notification xkeyboard-config iso-codes udev" - -GTKDOC_MESON_OPTION = "gtk_doc" -EXTRA_OEMESON = "-Ddesktop_docs=false" - -PACKAGES =+ "libgnome-desktop" -RDEPENDS:${PN} += "libgnome-desktop" -FILES:libgnome-desktop = " \ - ${libdir}/lib*${SOLIBS} \ - ${datadir}/libgnome-desktop*/pnp.ids \ - ${datadir}/gnome/*xml \ -" - -RRECOMMENDS:libgnome-desktop += "gsettings-desktop-schemas" diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb new file mode 100644 index 0000000000..aae927a70b --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb @@ -0,0 +1,47 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ +" + +GNOMEBASEBUILDCLASS = "meson" + +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" + +GIR_MESON_OPTION = "" + +SRC_URI[archive.sha256sum] = "f3caa293a5e86f6ccad18f817273db1c67061e680d79d839aa8a7528e5bb26d6" +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-meson.build-Disable-libseccomp-for-all-archs.patch \ +" + +DEPENDS += " \ + gsettings-desktop-schemas \ + virtual/libx11 \ + gtk+3 \ + gtk4 \ + startup-notification \ + xkeyboard-config \ + iso-codes \ + udev \ +" + +GTKDOC_MESON_OPTION = "gtk_doc" +EXTRA_OEMESON = "-Ddesktop_docs=false" + +PACKAGES =+ "libgnome-desktop" +RDEPENDS:${PN} += "libgnome-desktop" +FILES:libgnome-desktop = " \ + ${libdir}/lib*${SOLIBS} \ + ${datadir}/libgnome-desktop*/pnp.ids \ + ${datadir}/gnome/*xml \ +" + +RRECOMMENDS:libgnome-desktop += "gsettings-desktop-schemas" -- cgit 1.2.3-korg