libxsettings-client: add patch to fix missing linking to X11, spotted by --as-needed

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3703 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 16 insertions, 2 deletions

diff --git a/meta/packages/libxsettings-client/files/link-x11.patch b/meta/packages/libxsettings-client/files/link-x11.patch
new file mode 100644
index 0000000000..ee12f0a5b3
--- /dev/null
+++ b/meta/packages/libxsettings-client/files/link-x11.patch
@@ -0,0 +1,11 @@
+Index: Xsettings-client-0.10/Makefile.am
+===================================================================
+--- Xsettings-client-0.10.orig/Makefile.am      2008-02-07 14:49:54.000000000 +0000
++++ Xsettings-client-0.10/Makefile.am   2008-02-07 14:50:00.000000000 +0000
+@@ -9,4 +9,4 @@
+ 
+ libXsettings_client_la_SOURCES= $(source_c) $(source_h)
+ 
+-libXsettings_client_la_LIBADD      = @X_LIBS@
+\ No newline at end of file
++libXsettings_client_la_LIBADD      = @X_LIBS@ -lX11
diff --git a/meta/packages/libxsettings-client/libxsettings-client_0.10.bb b/meta/packages/libxsettings-client/libxsettings-client_0.10.bb
index bc4af80170..5201f3167b 100644
--- a/meta/packages/libxsettings-client/libxsettings-client_0.10.bb
+++ b/meta/packages/libxsettings-client/libxsettings-client_0.10.bb
@@ -4,16 +4,19 @@ LICENSE = "BSD-X"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11"
 
-PR = "r1"
+PR = "r2"
 
 headers = "xsettings-common.h xsettings-client.h"
 
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/optional-dependencies/Xsettings-client-0.10.tar.gz"
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/optional-dependencies/Xsettings-client-0.10.tar.gz \
+        file://link-x11.patch;patch=1"
+
 S = "${WORKDIR}/Xsettings-client-0.10"
 
 inherit autotools gettext
 
 do_stage () {
+        # TODO: replace with autotools_stage_all?
         oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
 
         for h in ${headers}; do