summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-11-14 16:57:43 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-30 10:49:22 +0000
commitee7996a39d90120debed811f9f9672203b7d4f90 (patch)
treebebc85262fd50c8aedf02f92094affed2210c437 /meta
parent335501dd820e1d7b2078b9a76ba597b6c7cb327f (diff)
downloadpoky-ee7996a39d90120debed811f9f9672203b7d4f90.tar.gz
gnome-desktop3: Update to 3.26.2
Add a patch to disable libseccomp (not currently used in Yocto). (From OE-Core rev: fdbfab3bd75838513ccca0f2b4b65606a3147c4c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch38
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch31
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb (renamed from meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb)14
3 files changed, 62 insertions, 21 deletions
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 @@
1From 9dfada06f8d2e02d7a04f793ba6e1d4a2aa5ffb7 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 5 Oct 2017 14:54:17 +0300
4Subject: [PATCH] Disable libseccomp (sycall filtering mechanism)
5
6Upstream forgot to make it optional, and it is not currently used in Yocto
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 configure.ac | 11 -----------
12 1 file changed, 11 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 86bcf1f..8911f19 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -157,17 +157,6 @@ else
19 fi
20
21 SECCOMP_PKG=""
22-dnl Check for bubblewrap compatible platform
23-case $host_os in
24- linux*)
25- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp])
26- SECCOMP_PKG="libseccomp"
27- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions])
28- AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available])
29- AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp])
30- AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix])
31- ;;
32-esac
33
34 dnl pkg-config dependency checks
35
36--
372.14.1
38
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 @@
1From adfa0c8f9fec1faac4bea6a94d947ea32e585923 Mon Sep 17 00:00:00 2001 1From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com> 2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 20:39:51 -0700 3Date: Tue, 13 Dec 2016 20:39:51 -0700
4Subject: [PATCH] gnome-desktop-thumbnail: don't convert time_t to long 4Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long
5 5
6Explicitly use strftime+strptime rather than snprintf+atol. This fixes the 6Explicitly use strftime+strptime rather than snprintf+atol. This fixes the
7build for X32, where long's size doesn't match that of time_t. 7build for X32, where long's size doesn't match that of time_t.
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10Signed-off-by: Christopher Larson <chris_larson@mentor.com> 10Signed-off-by: Christopher Larson <chris_larson@mentor.com>
11
11--- 12---
12 libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++-- 13 libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++--
13 1 file changed, 14 insertions(+), 2 deletions(-) 14 1 file changed, 14 insertions(+), 2 deletions(-)
14 15
15diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c 16diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
16index 3946309..b756333 100644 17index e56c3d7..5d96bf3 100644
17--- a/libgnome-desktop/gnome-desktop-thumbnail.c 18--- a/libgnome-desktop/gnome-desktop-thumbnail.c
18+++ b/libgnome-desktop/gnome-desktop-thumbnail.c 19+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
19@@ -126,6 +126,8 @@ 20@@ -120,6 +120,8 @@
20 * Since: 2.2 21 * Since: 2.2
21 */ 22 */
22 23
23+#define _XOPEN_SOURCE 24+#define _XOPEN_SOURCE
24+ 25+
25 #include <config.h> 26 #include <config.h>
26 #include <sys/types.h> 27
27 #include <sys/stat.h> 28 #include <glib.h>
28@@ -1483,6 +1485,7 @@ save_thumbnail (GdkPixbuf *pixbuf, 29@@ -1105,6 +1107,7 @@ save_thumbnail (GdkPixbuf *pixbuf,
29 char *tmp_path = NULL; 30 char *tmp_path = NULL;
30 int tmp_fd; 31 int tmp_fd;
31 char mtime_str[21]; 32 char mtime_str[21];
@@ -33,11 +34,11 @@ index 3946309..b756333 100644
33 gboolean ret = FALSE; 34 gboolean ret = FALSE;
34 GError *error = NULL; 35 GError *error = NULL;
35 const char *width, *height; 36 const char *width, *height;
36@@ -1502,7 +1505,11 @@ save_thumbnail (GdkPixbuf *pixbuf, 37@@ -1124,7 +1127,11 @@ save_thumbnail (GdkPixbuf *pixbuf,
37 goto out; 38 goto out;
38 close (tmp_fd); 39 close (tmp_fd);
39 40
40- g_snprintf (mtime_str, 21, "%ld", mtime); 41- g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime);
41+ tmp_mtime = localtime (&mtime); 42+ tmp_mtime = localtime (&mtime);
42+ if (!tmp_mtime) 43+ if (!tmp_mtime)
43+ goto out; 44+ goto out;
@@ -46,15 +47,15 @@ index 3946309..b756333 100644
46 width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width"); 47 width = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Width");
47 height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height"); 48 height = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::Image::Height");
48 49
49@@ -1695,6 +1702,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, 50@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
50 { 51 {
51 const char *thumb_uri, *thumb_mtime_str; 52 const char *thumb_uri, *thumb_mtime_str;
52 time_t thumb_mtime; 53 time_t thumb_mtime;
53+ struct tm tmp_mtime; 54+ struct tm tmp_mtime;
54 55
55 thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI"); 56 thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI");
56 if (!thumb_uri) 57 if (g_strcmp0 (uri, thumb_uri) != 0)
57@@ -1705,7 +1713,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf, 58@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
58 thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime"); 59 thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
59 if (!thumb_mtime_str) 60 if (!thumb_mtime_str)
60 return FALSE; 61 return FALSE;
@@ -66,7 +67,7 @@ index 3946309..b756333 100644
66+ return FALSE; 67+ return FALSE;
67 if (mtime != thumb_mtime) 68 if (mtime != thumb_mtime)
68 return FALSE; 69 return FALSE;
69 70
70-- 71--
712.8.0 722.14.1
72 73
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
index 5c1c213002..cd6c194c1b 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 \
7BPN = "gnome-desktop" 7BPN = "gnome-desktop"
8 8
9inherit gnome pkgconfig upstream-version-is-even gobject-introspection 9inherit gnome pkgconfig upstream-version-is-even gobject-introspection
10SRC_URI[archive.md5sum] = "af7c6a243df7a335a010bdc05b34ca93" 10SRC_URI[archive.md5sum] = "6cee2ecd677d87eaa0eb5ebfa7b45fb3"
11SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e" 11SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"
12 12
13SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \ 13SRC_URI += " \
14 file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \ 14 file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \
15" 15 file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \
16 file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \
17 "
16 18
17DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev" 19DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
18 20