mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

gnome-desktop: upgrade 3.38.8 -> 41.0 and give up '3' receipe name suffix

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller
2021-11-01 12:49:23 +01:00
committed by Khem Raj
parent 1742edd2ff
commit 62eb07bcdc
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-meson.build-Disable-libseccomp-for-all-archs.patch
+4 -4
View File
@@ -18,14 +18,14 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
1 file changed, 1 insertion(+), 6 deletions(-) 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 2e7160d..f83677d 100644 index cceefe0..df3fdd9 100644
--- a/meson.build --- a/meson.build
+++ b/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_os = host_machine.system()
host_cpu = host_machine.cpu() host_cpu = host_machine.cpu()
supported_os = ['linux'] 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) -if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu)
- seccomp_dep = dependency('libseccomp') - seccomp_dep = dependency('libseccomp')
-else -else
@@ -36,5 +36,5 @@ index 2e7160d..f83677d 100644
xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base') xkb_base = xkb_config_dep.get_pkgconfig_variable('xkb_base')
-- --
2.20.1 2.31.1
meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.38.8.bb → meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_41.0.bb
+16 -12
View File
@@ -6,18 +6,16 @@ LIC_FILES_CHKSUM = " \
file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
" "
BPN = "gnome-desktop"
GNOMEBASEBUILDCLASS = "meson" 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 # 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" UNKNOWN_CONFIGURE_WHITELIST:append = " introspection"
SRC_URI[archive.sha256sum] = "04dc3b37c2b7d98df972670ac2a5a33ec7dc278e6814c3d23d099ae6789dcae8" SRC_URI[archive.sha256sum] = "69cb1d3d9a10700eb66348ef1c0e66a855fc5a97ae62902df97a499da11562d2"
SRC_URI += " \ SRC_URI += " \
file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
file://0001-meson.build-Disable-libseccomp-for-all-archs.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" 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" GTKDOC_MESON_OPTION = "gtk_doc"
EXTRA_OEMESON = "-Ddesktop_docs=false" EXTRA_OEMESON = "-Ddesktop_docs=false"
PACKAGES =+ "libgnome-desktop3" PACKAGES =+ "libgnome-desktop"
FILES:libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" 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"