diff options
| author |   Marko Lindqvist <cazfi74@gmail.com> | 2013-01-10 12:03:08 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-15 08:09:29 +0000 |
| commit | 0beee6281fed3926b6871dbfdd907416d4a04886 (patch) | |
| tree | 4be1e0a85b0fbd64777d423365162eb5ae36c0de /meta/recipes-gnome | |
| parent | f311b2d9978e07d4e5f4b6687ff2dba41b5e5da4 (diff) | |
| download | openembedded-core-contrib-0beee6281fed3926b6871dbfdd907416d4a04886.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.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.24.14/obsolete_automake_macros.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.24.14.bb | 1 |
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 00000000000..322de8fd4a3 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+-2.24.14/obsolete_automake_macros.patch @@ -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 diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.14.bb index 028b2384c12..d794840bfc3 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 \ 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 |