From 81c78befb077a51eecd456b168eb29dc2a7bdea4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 15 Jan 2013 13:49:48 +0200 Subject: [PATCH] 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. (From OE-Core rev: 703ea77f1869c1101e1637831a83ca2d754907da) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../obsolete_automake_macros.patch | 14 ++++++++++++++ .../libxsettings-client_0.10.bb | 6 ++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch 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 +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"