From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 16/27] gnome-desktop3: Update to 3.26.2
Date: Tue, 14 Nov 2017 16:57:43 +0200 [thread overview]
Message-ID: <20171114145754.9643-16-alexander.kanavin@linux.intel.com> (raw)
In-Reply-To: <20171114145754.9643-1-alexander.kanavin@linux.intel.com>
Add a patch to disable libseccomp (not currently used in Yocto).
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
...ble-libseccomp-sycall-filtering-mechanism.patch | 38 ++++++++++++++++++++++
...op-thumbnail-don-t-convert-time_t-to-long.patch | 31 +++++++++---------
...desktop3_3.24.2.bb => gnome-desktop3_3.26.2.bb} | 14 ++++----
3 files changed, 62 insertions(+), 21 deletions(-)
create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
rename meta/recipes-gnome/gnome-desktop/{gnome-desktop3_3.24.2.bb => gnome-desktop3_3.26.2.bb} (66%)
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 00000000000..10b07435c42
--- /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 <alex.kanavin@gmail.com>
+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 <alex.kanavin@gmail.com>
+---
+ 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 18a069fadc7..c1a7d4f40f5 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 <chris_larson@mentor.com>
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 <chris_larson@mentor.com>
+
---
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 <config.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -1483,6 +1485,7 @@ save_thumbnail (GdkPixbuf *pixbuf,
+
+ #include <glib.h>
+@@ -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.26.2.bb
similarity index 66%
rename from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
rename to meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
index 5c1c213002d..cd6c194c1b7 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
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 \
-"
+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"
--
2.15.0
next prev parent reply other threads:[~2017-11-14 14:58 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-14 14:57 [PATCH 01/27] distrodata.bbclass: make upstream version check more useful for git upstreams Alexander Kanavin
2017-11-14 14:57 ` [PATCH 02/27] oe-core: take UPSTREAM_CHECK_COMMITS into use where possible Alexander Kanavin
2017-11-14 14:57 ` [PATCH 03/27] python-scons: fix upstream version check Alexander Kanavin
2017-11-14 14:57 ` [PATCH 04/27] i2c-tools: " Alexander Kanavin
2017-11-14 14:57 ` [PATCH 05/27] python3-pycairo: " Alexander Kanavin
2017-11-14 14:57 ` [PATCH 06/27] libcheck: " Alexander Kanavin
2017-11-14 14:57 ` [PATCH 07/27] rpm: upstream version is now known Alexander Kanavin
2017-11-14 14:57 ` [PATCH 08/27] glib-2.0: update to 2.54.2 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 09/27] glib-networking: update to 2.54.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 10/27] dtc: update to 1.4.5 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 11/27] libdnf: update to 0.11.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 12/27] librepo: update to 1.8.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 13/27] dnf: update to 2.7.5 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 14/27] gobject-introspection: update to 1.54.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 15/27] gstreamer1.0-plugins: disable introspection on mips64 Alexander Kanavin
2017-11-14 14:57 ` Alexander Kanavin [this message]
2017-11-14 14:57 ` [PATCH 17/27] webkitgtk: update to 2.18.3 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 18/27] psmisc: update to 23.0 Alexander Kanavin
2017-11-17 0:25 ` Burton, Ross
2017-11-17 0:35 ` Burton, Ross
2017-11-17 7:10 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 19/27] btrfs-tools: update to 4.13.3 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 20/27] expect: update to 5.45.3 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 21/27] libpciaccess: update to 0.14 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 22/27] icu: update to 60.1 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 23/27] harfbuzz: update to 1.7.0 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 24/27] lighttpd: update to 1.4.48 Alexander Kanavin
2017-11-14 18:29 ` Leonardo Sandoval
2017-11-15 10:12 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 25/27] libxslt: update to 1.1.32 Alexander Kanavin
2017-11-14 14:57 ` [PATCH 26/27] ffmpeg: update to 3.4 Alexander Kanavin
2017-11-14 19:41 ` Khem Raj
2017-11-14 20:31 ` Leonardo Sandoval
2017-11-15 10:14 ` Alexander Kanavin
2017-11-14 14:57 ` [PATCH 27/27] openssl: update to 1.0.2m, 1.1.0g Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171114145754.9643-16-alexander.kanavin@linux.intel.com \
--to=alexander.kanavin@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox