summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-10 12:03:08 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-15 08:10:13 +0000
commit45b958ba7762aef4beb72e5a5579cb8450a25d4a (patch)
tree49152cf7ca48e3976f3f8c1ec311aafe41545efa /meta
parent2326328120c430551ac64d54e58e6e24111955c3 (diff)
downloadpoky-45b958ba7762aef4beb72e5a5579cb8450a25d4a.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.14/obsolete_automake_macros.patch23
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.14.bb1
2 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.14/obsolete_automake_macros.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.14/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..322de8fd4a
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.14/obsolete_automake_macros.patch
@@ -0,0 +1,23 @@
1Upstream-Status: Accepted [https://bugzilla.gnome.org/show_bug.cgi?id=691267]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd gtk+-2.24.14/configure.in gtk+-2.24.14/configure.in
5--- gtk+-2.24.14/configure.in 2012-12-06 05:46:07.000000000 +0200
6+++ gtk+-2.24.14/configure.in 2013-01-07 04:18:43.546039799 +0200
7@@ -51,7 +51,7 @@
8 cflags_set=${CFLAGS+set}
9
10 AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2])
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 # Support silent build rules, requires at least automake-1.11. Enable
15 # by either passing --enable-silent-rules to configure or passing V=0
16@@ -300,7 +300,6 @@
17
18 # Checks for programs.
19 AC_ISC_POSIX
20-AM_PROG_CC_STDC
21 AM_PROG_CC_C_O
22 AC_PROG_INSTALL
23 AC_PROG_MAKE_SET
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
index 028b2384c1..d794840bfc 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb
@@ -14,6 +14,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
14 file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \ 14 file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch \
15 file://doc-fixes.patch \ 15 file://doc-fixes.patch \
16 file://0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch \ 16 file://0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch \
17 file://obsolete_automake_macros.patch \
17 " 18 "
18 19
19# TO MERGE 20# TO MERGE