From fdbfab3bd75838513ccca0f2b4b65606a3147c4c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 14 Nov 2017 16:57:43 +0200 Subject: gnome-desktop3: Update to 3.26.2 Add a patch to disable libseccomp (not currently used in Yocto). Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- ...ble-libseccomp-sycall-filtering-mechanism.patch | 38 ++++++++++++++++++++++ ...op-thumbnail-don-t-convert-time_t-to-long.patch | 31 +++++++++--------- .../gnome-desktop/gnome-desktop3_3.24.2.bb | 27 --------------- .../gnome-desktop/gnome-desktop3_3.26.2.bb | 29 +++++++++++++++++ 4 files changed, 83 insertions(+), 42 deletions(-) create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch delete mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb 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 new file mode 100644 index 0000000000..10b07435c4 --- /dev/null +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch @@ -0,0 +1,38 @@ +From 9dfada06f8d2e02d7a04f793ba6e1d4a2aa5ffb7 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) + +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(-) + +diff --git a/configure.ac b/configure.ac +index 86bcf1f..8911f19 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -157,17 +157,6 @@ else + fi + + SECCOMP_PKG="" +-dnl Check for bubblewrap compatible platform +-case $host_os in +- linux*) +- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp]) +- SECCOMP_PKG="libseccomp" +- 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/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch index 18a069fadc..c1a7d4f40f 100644 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch @@ -1,31 +1,32 @@ -From adfa0c8f9fec1faac4bea6a94d947ea32e585923 Mon Sep 17 00:00:00 2001 +From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 13 Dec 2016 20:39:51 -0700 -Subject: [PATCH] gnome-desktop-thumbnail: don't convert time_t to long +Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long Explicitly use strftime+strptime rather than snprintf+atol. This fixes the build for X32, where long's size doesn't match that of time_t. Upstream-Status: Pending Signed-off-by: Christopher Larson + --- libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c -index 3946309..b756333 100644 +index e56c3d7..5d96bf3 100644 --- a/libgnome-desktop/gnome-desktop-thumbnail.c +++ b/libgnome-desktop/gnome-desktop-thumbnail.c -@@ -126,6 +126,8 @@ +@@ -120,6 +120,8 @@ * Since: 2.2 */ +#define _XOPEN_SOURCE + #include - #include - #include -@@ -1483,6 +1485,7 @@ save_thumbnail (GdkPixbuf *pixbuf, + + #include +@@ -1105,6 +1107,7 @@ save_thumbnail (GdkPixbuf *pixbuf, char *tmp_path = NULL; int tmp_fd; char mtime_str[21]; @@ -33,11 +34,11 @@ index 3946309..b756333 100644 gboolean ret = FALSE; GError *error = NULL; const char *width, *height; -@@ -1502,7 +1505,11 @@ save_thumbnail (GdkPixbuf *pixbuf, +@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf *pixbuf, goto out; close (tmp_fd); -- g_snprintf (mtime_str, 21, "%ld", mtime); +- g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime); + tmp_mtime = localtime (&mtime); + if (!tmp_mtime) + goto out; @@ -46,15 +47,15 @@ index 3946309..b756333 100644 width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width"); height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height"); -@@ -1695,6 +1702,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, +@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, { const char *thumb_uri, *thumb_mtime_str; time_t thumb_mtime; + struct tm tmp_mtime; - + thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI"); - if (!thumb_uri) -@@ -1705,7 +1713,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, + if (g_strcmp0 (uri, thumb_uri) != 0) +@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime"); if (!thumb_mtime_str) return FALSE; @@ -66,7 +67,7 @@ index 3946309..b756333 100644 + return FALSE; if (mtime != thumb_mtime) return FALSE; - + -- -2.8.0 +2.14.1 diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb deleted file mode 100644 index 5c1c213002..0000000000 --- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb +++ /dev/null @@ -1,27 +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] = "af7c6a243df7a335a010bdc05b34ca93" -SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e" - -SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \ - file://0001-configure.ac-Remove-gnome-common-macro-calls.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.26.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb new file mode 100644 index 0000000000..cd6c194c1b --- /dev/null +++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb @@ -0,0 +1,29 @@ +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-convert-time_t-to-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" -- cgit 1.2.3-korg