summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-05-17 14:39:41 +0300
committerKhem Raj <raj.khem@gmail.com>2018-05-23 15:32:05 -0700
commit5d8570b30d45e74a8c3a88d6c9046535e8f6cc6e (patch)
treed1048d7c0d09b2a38315329562261dbeba03c34b /meta-gnome
parentd2a777b925ad9165f87163b7ca7927a6f7e8aee4 (diff)
downloadmeta-openembedded-5d8570b30d45e74a8c3a88d6c9046535e8f6cc6e.tar.gz
gnome-desktop3: add a recipe from oe-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch45
-rw-r--r--meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch61
-rw-r--r--meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb28
3 files changed, 134 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
new file mode 100644
index 000000000..aa11e8a62
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
@@ -0,0 +1,45 @@
1From 96753d85d8b53dd8f87b8f444892efffdbfab388 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---
12 configure.ac | 20 --------------------
13 1 file changed, 20 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 118d04f..47c8894 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -151,26 +151,6 @@ fi
20
21 SECCOMP_PKG=""
22 enable_seccomp="no"
23-dnl Check for bubblewrap compatible platform
24-case $host_os in
25- linux*)
26- case $host_cpu in
27- alpha|ia64|m68k|sh4|sparc64)
28- enable_seccomp="no (not available on this architecture)"
29- AC_MSG_WARN("seccomp not available on this architecture")
30- ;;
31- *)
32- PKG_CHECK_MODULES(LIBSECCOMP, [libseccomp])
33- SECCOMP_PKG="libseccomp"
34- AC_DEFINE([ENABLE_SECCOMP], [1], [Define if using seccomp])
35- enable_seccomp="yes"
36- ;;
37- esac
38- AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define to include GNU extensions])
39- AC_DEFINE_UNQUOTED(HAVE_BWRAP, 1, [Define to 1 if Bubblewrap support is available])
40- AC_DEFINE_UNQUOTED(INSTALL_PREFIX, "$prefix", [Path to library install prefix])
41- ;;
42-esac
43
44 dnl pkg-config dependency checks
45
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
new file mode 100644
index 000000000..fcc152fde
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
@@ -0,0 +1,61 @@
1From 9048939b76b3bd10783adb79ed0aaf6cd13895cc Mon Sep 17 00:00:00 2001
2From: Christopher Larson <chris_larson@mentor.com>
3Date: Tue, 13 Dec 2016 20:39:51 -0700
4Subject: [PATCH 1/2] gnome-desktop-thumbnail: don't convert time_t to long
5
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.
8
9Upstream-Status: Pending
10Signed-off-by: Christopher Larson <chris_larson@mentor.com>
11
12
13Modify patch described above to eliminate replacement of
14
15g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime)
16
17which is not necessary. Retain replacement of atol().
18
19Signed-off-by: Joe Slater <joe.slater@windriver.com>
20
21---
22 libgnome-desktop/gnome-desktop-thumbnail.c | 16 ++++++++++++++--
23 1 file changed, 14 insertions(+), 2 deletions(-)
24
25diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
26index e56c3d7..5d96bf3 100644
27--- a/libgnome-desktop/gnome-desktop-thumbnail.c
28+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
29@@ -120,6 +120,8 @@
30 * Since: 2.2
31 */
32
33+#define _XOPEN_SOURCE
34+
35 #include <config.h>
36
37 #include <glib.h>
38@@ -1319,6 +1326,7 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
39 {
40 const char *thumb_uri, *thumb_mtime_str;
41 time_t thumb_mtime;
42+ struct tm tmp_mtime;
43
44 thumb_uri = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::URI");
45 if (g_strcmp0 (uri, thumb_uri) != 0)
46@@ -1327,7 +1335,11 @@ gnome_desktop_thumbnail_is_valid (GdkPixbuf *pixbuf,
47 thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
48 if (!thumb_mtime_str)
49 return FALSE;
50- thumb_mtime = atol (thumb_mtime_str);
51+ if (!strptime (thumb_mtime_str, "%s", &tmp_mtime))
52+ return FALSE;
53+ thumb_mtime = mktime (&tmp_mtime);
54+ if (!thumb_mtime)
55+ return FALSE;
56 if (mtime != thumb_mtime)
57 return FALSE;
58
59--
602.14.1
61
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb
new file mode 100644
index 000000000..39b3491fd
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb
@@ -0,0 +1,28 @@
1SUMMARY = "GNOME library for reading .desktop files"
2SECTION = "x11/gnome"
3LICENSE = "GPLv2 & LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
5 file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2"
6
7BPN = "gnome-desktop"
8
9inherit gnome pkgconfig upstream-version-is-even gobject-introspection
10SRC_URI[archive.md5sum] = "bcbf906d94eb08060c60a7364384d678"
11SRC_URI[archive.sha256sum] = "78a397a2be47586e6dc075d6a7fc5659aae3d10713d76994ce1b46086e7ecb9a"
12
13SRC_URI += " \
14 file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \
15 file://0001-Disable-libseccomp-sycall-filtering-mechanism.patch \
16 "
17
18DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
19
20inherit distro_features_check gtk-doc
21REQUIRED_DISTRO_FEATURES = "x11"
22
23EXTRA_OECONF = "--disable-desktop-docs"
24
25PACKAGES =+ "libgnome-desktop3"
26FILES_libgnome-desktop3 = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop*/pnp.ids ${datadir}/gnome/*xml"
27
28RRECOMMENDS_libgnome-desktop3 += "gsettings-desktop-schemas"