diff options
Diffstat (limited to 'poky/meta/recipes-gnome/gnome-desktop')
4 files changed, 0 insertions, 161 deletions
diff --git a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch deleted file mode 100644 index 10b07435c..000000000 --- a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-Disable-libseccomp-sycall-filtering-mechanism.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch deleted file mode 100644 index e95393c6b..000000000 --- a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Thu, 6 Jul 2017 13:13:45 +0300 -Subject: [PATCH] configure.ac: Remove gnome-common macro calls - -gnome-common is deprecated and these aren't doing much for us. - -Upstreamable fix would probably involve using autoconf-archive: -Trying to avoid that dependency for now. - -Upstream-Status: Inappropriate -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7adcf0e..bb7659d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE) - AC_SUBST(GNOME_DATE_COMMENT_START) - AC_SUBST(GNOME_DATE_COMMENT_END) - --GNOME_COMPILE_WARNINGS([maximum]) --GNOME_MAINTAINER_MODE_DEFINES -- - AC_ARG_ENABLE(deprecation_flags, - [AC_HELP_STRING([--enable-deprecation-flags], - [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],, --- -2.1.4 - diff --git a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch deleted file mode 100644 index fcc152fde..000000000 --- a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch +++ /dev/null @@ -1,61 +0,0 @@ -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 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> - - -Modify patch described above to eliminate replacement of - -g_snprintf (mtime_str, 21, "%" G_GINT64_FORMAT, (gint64) mtime) - -which is not necessary. Retain replacement of atol(). - -Signed-off-by: Joe Slater <joe.slater@windriver.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 e56c3d7..5d96bf3 100644 ---- a/libgnome-desktop/gnome-desktop-thumbnail.c -+++ b/libgnome-desktop/gnome-desktop-thumbnail.c -@@ -120,6 +120,8 @@ - * Since: 2.2 - */ - -+#define _XOPEN_SOURCE -+ - #include <config.h> - - #include <glib.h> -@@ -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 (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; -- thumb_mtime = atol (thumb_mtime_str); -+ if (!strptime (thumb_mtime_str, "%s", &tmp_mtime)) -+ return FALSE; -+ thumb_mtime = mktime (&tmp_mtime); -+ if (!thumb_mtime) -+ return FALSE; - if (mtime != thumb_mtime) - return FALSE; - --- -2.14.1 - diff --git a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb b/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb deleted file mode 100644 index 879dc9a2f..000000000 --- a/poky/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.26.2.bb +++ /dev/null @@ -1,29 +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] = "6cee2ecd677d87eaa0eb5ebfa7b45fb3" -SRC_URI[archive.sha256sum] = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a" - -SRC_URI += " \ - file://gnome-desktop-thumbnail-don-t-assume-time_t-is-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" |