From 9c3e4be45268d4ba91558751d0a35858aed53f27 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 14 Jul 2017 15:39:55 +0300 Subject: gnome-desktop: Don't use gnome-common Add a patch to no use gnome-common macros Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- ...figure.ac-Remove-gnome-common-macro-calls.patch | 33 ++++++++++++++++++++++ .../gnome-desktop/gnome-desktop3_3.24.2.bb | 6 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch 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 @@ +From 834bc861921fe0361f2d6a5b5716fc97a9519478 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +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 +--- + 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/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 SRC_URI[archive.md5sum] = "af7c6a243df7a335a010bdc05b34ca93" SRC_URI[archive.sha256sum] = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e" -SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch" +SRC_URI += "file://gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch \ + file://0001-configure.ac-Remove-gnome-common-macro-calls.patch \ +" -DEPENDS += "intltool-native gnome-common-native gsettings-desktop-schemas gconf virtual/libx11 gtk+3 glib-2.0 startup-notification xkeyboard-config iso-codes udev" +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" -- cgit 1.2.3-korg