gtk+: replace obsolete automake macros with working ones

Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

(From OE-Core rev: 0beee6281fed3926b6871dbfdd907416d4a04886)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Marko Lindqvist 2013-01-10 12:03:08 +02:00 committed by Richard Purdie
parent 2326328120
commit 45b958ba77
2 changed files with 24 additions and 0 deletions

View File

@ -0,0 +1,23 @@
Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691267]
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
diff -Nurd gtk+-2.24.14/configure.in gtk+-2.24.14/configure.in
--- gtk+-2.24.14/configure.in 2012-12-06 05:46:07.000000000 +0200
+++ gtk+-2.24.14/configure.in 2013-01-07 04:18:43.546039799 +0200
@@ -51,7 +51,7 @@
cflags_set=${CFLAGS+set}
AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Support silent build rules, requires at least automake-1.11. Enable
# by either passing --enable-silent-rules to configure or passing V=0
@@ -300,7 +300,6 @@
# Checks for programs.
AC_ISC_POSIX
-AM_PROG_CC_STDC
AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_PROG_MAKE_SET

View File

@ -14,6 +14,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \
file://doc-fixes.patch \
file://0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch \
file://obsolete_automake_macros.patch \
"
# TO MERGE