summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-07-14 15:39:55 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:39 +0100
commita1d94933f2713479ec46d86372229bc14f8d7134 (patch)
tree480dde84eff0f39ece11baa372c5943972ff1d9f
parentb663374cf41465c6dc94001d6fa73a5523542fb6 (diff)
downloadpoky-a1d94933f2713479ec46d86372229bc14f8d7134.tar.gz
gnome-desktop: Don't use gnome-common
Add a patch to no use gnome-common macros (From OE-Core rev: 9c3e4be45268d4ba91558751d0a35858aed53f27) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch33
-rw-r--r--meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb6
2 files changed, 37 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
new file mode 100644
index 0000000000..e95393c6b5
--- /dev/null
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch
@@ -0,0 +1,33 @@
1From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Thu, 6 Jul 2017 13:13:45 +0300
4Subject: [PATCH] configure.ac: Remove gnome-common macro calls
5
6gnome-common is deprecated and these aren't doing much for us.
7
8Upstreamable fix would probably involve using autoconf-archive:
9Trying to avoid that dependency for now.
10
11Upstream-Status: Inappropriate
12Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
13---
14 configure.ac | 3 ---
15 1 file changed, 3 deletions(-)
16
17diff --git a/configure.ac b/configure.ac
18index 7adcf0e..bb7659d 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -71,9 +71,6 @@ AC_SUBST(GNOME_DATE)
22 AC_SUBST(GNOME_DATE_COMMENT_START)
23 AC_SUBST(GNOME_DATE_COMMENT_END)
24
25-GNOME_COMPILE_WARNINGS([maximum])
26-GNOME_MAINTAINER_MODE_DEFINES
27-
28 AC_ARG_ENABLE(deprecation_flags,
29 [AC_HELP_STRING([--enable-deprecation-flags],
30 [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
31--
322.1.4
33
diff --git a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
index 24d23bad0e..5c1c213002 100644
--- a/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
+++ b/meta/recipes-gnome/gnome-desktop/gnome-desktop3_3.24.2.bb
@@ -10,9 +10,11 @@ inherit gnome pkgconfig upstream-version-is-even gobject-introspection
10SRC_URI[archive.md5sum] = "af7c6a243df7a335a010bdc05b34ca93" 10SRC_URI[archive.md5sum] = "af7c6a243df7a335a010bdc05b34ca93"
11SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e" 11SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e"
12 12
13SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch" 13SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \
14 file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \
15"
14 16
15DEPENDS += "intltool-native gnome-common-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev" 17DEPENDS += "intltool-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev"
16 18
17inherit distro_features_check gtk-doc 19inherit distro_features_check gtk-doc
18REQUIRED_DISTRO_FEATURES = "x11" 20REQUIRED_DISTRO_FEATURES = "x11"