summaryrefslogtreecommitdiff
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-15 13:49:48 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-16 11:54:45 +0000
commit703ea77f1869c1101e1637831a83ca2d754907da (patch)
tree4faa0a7212d818d7dc86f7b4daceb473f3dc22cb /meta/recipes-graphics
parent16df16408719b93f595412a4c10df793d847dd19 (diff)
downloadopenembedded-core-703ea77f1869c1101e1637831a83ca2d754907da.tar.gz
openembedded-core-703ea77f1869c1101e1637831a83ca2d754907da.tar.bz2
openembedded-core-703ea77f1869c1101e1637831a83ca2d754907da.zip
libxsettings-client: 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-graphics')
-rw-r--r--meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb6
2 files changed, 18 insertions, 2 deletions
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..905d08e616
--- /dev/null
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch
@@ -0,0 +1,14 @@
+Upstream-Status: Pending
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff -Nurd Xsettings-client-0.10/configure.ac Xsettings-client-0.10/configure.ac
+--- Xsettings-client-0.10/configure.ac 2003-03-28 12:39:51.000000000 +0200
++++ Xsettings-client-0.10/configure.ac 2013-01-11 07:37:21.491597743 +0200
+@@ -1,7 +1,7 @@
+ # Process this file with autoconf to produce a configure script.
+ AC_INIT(xsettings-client.c)
+ AM_INIT_AUTOMAKE(Xsettings-client, 0.10)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ CFLAGS="-Os -Wall"
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
index a12b5e0863..0a1f9530f0 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
@@ -12,14 +12,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
DEPENDS = "virtual/libx11"
-PR = "r4"
+PR = "r5"
headers = "xsettings-common.h xsettings-client.h"
SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-0.10.tar.gz \
file://MIT-style-license \
file://link-x11.patch;apply=yes \
- file://disable_Os_option.patch"
+ file://disable_Os_option.patch \
+ file://obsolete_automake_macros.patch \
+"
SRC_URI[md5sum] = "c14aa9db6c097e0306dac97fb7da1add"
SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43"