aboutsummaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2022-04-03 19:36:04 +0200
committerKhem Raj <raj.khem@gmail.com>2022-04-06 20:25:33 -0400
commit9b7cce8860872ef23bcd2dea9afe6c84a125a74e (patch)
tree6f84d81686ada9537e5086aa7ff0113a3ae806f9 /meta-gnome
parentc495d52501ec765e059ece5e69fd116e1ec1d071 (diff)
downloadmeta-openembedded-contrib-9b7cce8860872ef23bcd2dea9afe6c84a125a74e.tar.gz
gnome-desktop: upgrade 41.2 -> 42.0
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 <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch10
-rw-r--r--meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb (renamed from meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb)13
2 files changed, 16 insertions, 7 deletions
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 <schnitzeltony@gmail.com>
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_42.0.bb
index 6bf2ab3986..aae927a70b 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb
@@ -16,13 +16,22 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
GIR_MESON_OPTION = ""
-SRC_URI[archive.sha256sum] = "34329eefdacad2332a6adbae538c8da6e52235c7775a908b7c32040a0753ec6a"
+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 startup-notification xkeyboard-config iso-codes udev"
+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"