summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-05-17 14:38:31 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:13 +0100
commitaaa0808e0e7603a9d3b0a2db050fd5d83e87354b (patch)
tree4f5526537febde6b5a11a71abcbc2ee8e2393ca3 /meta
parente99d5512a5c921299f1069eb2fa4ee0ec11381d4 (diff)
downloadpoky-aaa0808e0e7603a9d3b0a2db050fd5d83e87354b.tar.gz
gnome-desktop3: remove the recipe
Epiphany no longer needs it, nothing else does, and so it will be moved to meta-oe. (From OE-Core rev: 1e89ec37cac834498a391a0d438dce73acde58ce) 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/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_3.28.1.1.bb2
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch45
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch61
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb28
5 files changed, 1 insertions, 136 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 7787a2c137..6d6c148de8 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -206,7 +206,6 @@ RECIPE_MAINTAINER_pn-glide = "Otavio Salvador <otavio.salvador@ossystems.com.br>
206RECIPE_MAINTAINER_pn-gmp = "Khem Raj <raj.khem@gmail.com>" 206RECIPE_MAINTAINER_pn-gmp = "Khem Raj <raj.khem@gmail.com>"
207RECIPE_MAINTAINER_pn-gnome-common = "Maxin B. John <maxin.john@intel.com>" 207RECIPE_MAINTAINER_pn-gnome-common = "Maxin B. John <maxin.john@intel.com>"
208RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Maxin B. John <maxin.john@intel.com>" 208RECIPE_MAINTAINER_pn-gnome-desktop-testing = "Maxin B. John <maxin.john@intel.com>"
209RECIPE_MAINTAINER_pn-gnome-desktop3 = "Alexander Kanavin <alexander.kanavin@intel.com>"
210RECIPE_MAINTAINER_pn-gnome-doc-utils = "Maxin B. John <maxin.john@intel.com>" 209RECIPE_MAINTAINER_pn-gnome-doc-utils = "Maxin B. John <maxin.john@intel.com>"
211RECIPE_MAINTAINER_pn-gnome-themes-standard = "Maxin B. John <maxin.john@intel.com>" 210RECIPE_MAINTAINER_pn-gnome-themes-standard = "Maxin B. John <maxin.john@intel.com>"
212RECIPE_MAINTAINER_pn-gnu-config = "Robert Yang <liezhi.yang@windriver.com>" 211RECIPE_MAINTAINER_pn-gnu-config = "Robert Yang <liezhi.yang@windriver.com>"
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.28.1.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.28.1.1.bb
index 490d0f6a9c..d6f8eda902 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.28.1.1.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.28.1.1.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv3+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 3LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
4 4
5DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ 5DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \
6 gsettings-desktop-schemas gnome-desktop3 libxml2-native \ 6 gsettings-desktop-schemas libxml2-native \
7 glib-2.0 glib-2.0-native json-glib" 7 glib-2.0 glib-2.0-native json-glib"
8 8
9GNOMEBASEBUILDCLASS = "meson" 9GNOMEBASEBUILDCLASS = "meson"
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
deleted file mode 100644
index aa11e8a62e..0000000000
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch
+++ /dev/null
@@ -1,45 +0,0 @@
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/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
deleted file mode 100644
index fcc152fdef..0000000000
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch
+++ /dev/null
@@ -1,61 +0,0 @@
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/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb
deleted file mode 100644
index 39b3491fdb..0000000000
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.28.1.bb
+++ /dev/null
@@ -1,28 +0,0 @@
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"