From dbc24a883d61c5bc2b7cfaaac1831be40ee7d7fd Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 31 Mar 2006 09:21:51 +0000
Subject: libxsettings: Include libxt in DEPENDS as without it, configure pulls
 in system directories, corrupts its .la files and breaks later packages. Also
 add version 0.16 from OE.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@343 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../libxsettings-client-0.16/Makefile-am.patch     | 11 ++++++++++
 .../libxsettings-client_0.14.bb                    |  9 +++-----
 .../libxsettings-client_0.16.bb                    | 24 ++++++++++++++++++++++
 3 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 openembedded/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch
 create mode 100644 openembedded/packages/libxsettings-client/libxsettings-client_0.16.bb

(limited to 'openembedded/packages/libxsettings-client')

diff --git a/openembedded/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch b/openembedded/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch
new file mode 100644
index 000000000..fb5b1dbe6
--- /dev/null
+++ b/openembedded/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch
@@ -0,0 +1,11 @@
+--- libxsettings-client-0.16/Makefile.am.orig	2006-01-17 16:01:21.000000000 +0000
++++ libxsettings-client-0.16/Makefile.am	2006-01-17 16:01:30.000000000 +0000
+@@ -3,7 +3,7 @@
+ source_h = xsettings-client.h  xsettings-common.h
+ source_c = xsettings-client.c  xsettings-common.c
+ 
+-INCLUDES = -I $(includedir) $(X_CFLAGS)
++INCLUDES = $(X_CFLAGS)
+ 
+ libxsincludedir = $(includedir)
+ 
diff --git a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
index 7e1b4df2c..f2e77735f 100644
--- a/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ b/openembedded/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -1,17 +1,15 @@
 SECTION = "gpe/libs"
 LICENSE = "BSD-X"
 PRIORITY = "optional"
-DEPENDS = "libxsettings libx11"
-PR = "r1"
+DEPENDS = "libxsettings libx11 libxt"
+# libxt is required to stop configure breaking builds by
+# including system paths to find it if it isn't present.
 
 inherit autotools pkgconfig gpe
 
 SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2"
 S = ${WORKDIR}/xsettings-client-${PV}
 
-do_configure () {
-	X_LIBS=" -L${STAGING_LIBDIR}" oe_runconf
-}
 
 headers = "xsettings-client.h xsettings-common.h"
 do_stage () {
@@ -21,4 +19,3 @@ do_stage () {
                 install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
         done
 }
-
diff --git a/openembedded/packages/libxsettings-client/libxsettings-client_0.16.bb b/openembedded/packages/libxsettings-client/libxsettings-client_0.16.bb
new file mode 100644
index 000000000..45d9b1c30
--- /dev/null
+++ b/openembedded/packages/libxsettings-client/libxsettings-client_0.16.bb
@@ -0,0 +1,24 @@
+SECTION = "gpe/libs"
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+DEPENDS = "libxsettings libx11 libxt"
+# libxt is required to stop configure breaking builds by 
+# including system paths to find it if it isn't present.
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+PR="r1"
+
+inherit autotools pkgconfig gpe
+
+SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \
+	file://Makefile-am.patch;patch=1"
+
+
+headers = "xsettings-client.h xsettings-common.h"
+do_stage () {
+        oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
+        mkdir -p ${STAGING_INCDIR}
+        for h in ${headers}; do
+               install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
+        done
+}
+
-- 
cgit v1.2.3