From 39c78dbc67acd3e5cc6a38d11a5a26e0a0c72d61 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 4 Apr 2018 14:13:10 +0300 Subject: gnome-desktop3: update to 3.28.0 Rebase 0001-Disable-libseccomp-sycall-filtering-mechanism.patch Remove 0001-configure.ac-Remove-gnome-common-macro-calls.patch as the lines it removes are no longer in upstream code. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...ble-libseccomp-sycall-filtering-mechanism.patch | 31 ++++++++++++-------- ...figure.ac-Remove-gnome-common-macro-calls.patch | 33 ---------------------- .../gnome-desktop/gnome-desktop3_3.26.2.bb | 29 ------------------- .../gnome-desktop/gnome-desktop3_3.28.0.bb | 28 ++++++++++++++++++ 4 files changed, 47 insertions(+), 74 deletions(-) delete mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch delete mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch index 10b07435c4..aa11e8a62e 100644 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch @@ -1,4 +1,4 @@ -From 9dfada06f8d2e02d7a04f793ba6e1d4a2aa5ffb7 Mon Sep 17 00:00:00 2001 +From 96753d85d8b53dd8f87b8f444892efffdbfab388 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 5 Oct 2017 14:54:17 +0300 Subject: [PATCH] Disable libseccomp (sycall filtering mechanism) @@ -7,32 +7,39 @@ Upstream forgot to make it optional, and it is not currently used in Yocto Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin + --- - configure.ac | 11 ----------- - 1 file changed, 11 deletions(-) + configure.ac | 20 -------------------- + 1 file changed, 20 deletions(-) diff --git a/configure.ac b/configure.ac -index 86bcf1f..8911f19 100644 +index 118d04f..47c8894 100644 --- a/configure.ac +++ b/configure.ac -@@ -157,17 +157,6 @@ else - fi +@@ -151,26 +151,6 @@ fi SECCOMP_PKG="" + enable_seccomp="no" -dnl Check for bubblewrap compatible platform -case $host_os in - linux*) -- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) -- SECCOMP_PKG="libseccomp" +- case $host_cpu in +- alpha|ia64|m68k|sh4|sparc64) +- enable_seccomp="no (not available on this architecture)" +- AC_MSG_WARN("seccomp not available on this architecture") +- ;; +- *) +- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) +- SECCOMP_PKG="libseccomp" +- AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp]) +- enable_seccomp="yes" +- ;; +- esac - AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions]) - AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available]) -- AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp]) - AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix]) - ;; -esac dnl pkg-config dependency checks --- -2.14.1 - diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch deleted file mode 100644 index e95393c6b5..0000000000 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Thu, 6 Jul 2017 13:13:45 +0300 -Subject: [PATCH] configure.ac: Remove gnome-common macro calls - -gnome-common is deprecated and these aren't doing much for us. - -Upstreamable fix would probably involve using autoconf-archive: -Trying to avoid that dependency for now. - -Upstream-Status: Inappropriate -Signed-off-by: Jussi Kukkonen ---- - configure.ac | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7adcf0e..bb7659d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE) - AC_SUBST(GNOME_DATE_COMMENT_START) - AC_SUBST(GNOME_DATE_COMMENT_END) - --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -- - AC_ARG_ENABLE(deprecation_flags, - [AC_HELP_STRING([--enable-deprecation-flags], - [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],, --- -2.1.4 - diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb deleted file mode 100644 index 879dc9a2f6..0000000000 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -BPN = "gnome-desktop" - -inherit gnome pkgconfig upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "6cee2ecd677d87eaa0eb5ebfa7b45fb3" -SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a" - -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ - file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \ - file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \ - " - -DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev" - -inherit distro_features_check gtk-doc -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF = "--disable-desktop-docs" - -PACKAGES =+ "libgnome-desktop3" -FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" - -RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb new file mode 100644 index 0000000000..e23c030577 --- /dev/null +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "GNOME library for reading .desktop files" +SECTION = "x11/gnome" +LICENSE = "GPLv2 & LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +BPN = "gnome-desktop" + +inherit gnome pkgconfig upstream-version-is-even gobject-introspection +SRC_URI[archive.md5sum] = "3e7b67578307220a21688f28307b6789" +SRC_URI[archive.sha256sum] = "f1df71c39e32147f6d58f53a9c05b964b00b7c98fbca090419355437c72fd59d" + +SRC_URI += " \ + file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ + file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \ + " + +DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev" + +inherit distro_features_check gtk-doc +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF = "--disable-desktop-docs" + +PACKAGES =+ "libgnome-desktop3" +FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml" + +RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas" -- cgit 1.2.3-korg