libxsettings-client: Use version 0.10. Remove libxsettings

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

4 files changed, 23 insertions, 66 deletions

diff --git a/meta/packages/libxsettings-client/libxsettings-client_0.10.bb b/meta/packages/libxsettings-client/libxsettings-client_0.10.bb
new file mode 100644
index 000000000..45b203507
--- /dev/null
+++ b/meta/packages/libxsettings-client/libxsettings-client_0.10.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Common code for XSETTINGS"
+SECTION = "x/libs"
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+DEPENDS = "libx11 libxt"
+# libxt is required to stop configure breaking builds by
+# including system paths to find it if it isn't present.
+
+headers = "xsettings-common.h xsettings-client.h"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/optional-dependencies/Xsettings-client-0.10.tar.gz"
+S = "${WORKDIR}/Xsettings-client-0.10"
+
+inherit autotools gettext
+
+do_stage () {
+        oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/gpe
+	for h in ${headers}; do
+		install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
+	done
+}
diff --git a/meta/packages/libxsettings-client/libxsettings-client_0.14.bb b/meta/packages/libxsettings-client/libxsettings-client_0.14.bb
deleted file mode 100644
index f2e77735f..000000000
--- a/meta/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-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.
-
-inherit autotools pkgconfig gpe
-
-SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2"
-S = ${WORKDIR}/xsettings-client-${PV}
-
-
-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
-}
diff --git a/meta/packages/libxsettings-client/make_pkgconfig_x11.patch b/meta/packages/libxsettings-client/make_pkgconfig_x11.patch
deleted file mode 100644
index 3a386672d..000000000
--- a/meta/packages/libxsettings-client/make_pkgconfig_x11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libxsettings-client0-0.12/Makefile.old	2004-04-20 16:48:18.000000000 +1000
-+++ libxsettings-client0-0.12/Makefile	2004-04-20 16:58:07.000000000 +1000
-@@ -20,6 +20,9 @@
- CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
- CPPFLAGS += -I../libxsettings
- 
-+CFLAGS += `pkg-config --cflags x11`
-+LDFLAGS += `pkg-config --ldflags x11`
-+
- XSETTINGS_OBJS = $(patsubst %,%.os,$(XSETTINGS_MEMBERS))
- DEPS = $(patsubst %,%.d,$(MEMBERS) $(XSETTINGS_MEMBERS))
- SOURCES = $(patsubst %,%.c,$(MEMBERS) $(XSETTINGS_MEMBERS))
-@@ -39,7 +42,7 @@
- 	ln -sf $^ $@
- 
- $(LIBXSETTINGS_SO): $(XSETTINGS_OBJS)
--	$(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles -L/usr/X11R6/lib -lX11 -L../libxsettings -lXsettings
-+	$(CC) -o $@ $^ -shared -Wl,-soname -Wl,$(LIBXSETTINGS_SO) -nostartfiles $(LDFLAGS) -L../libxsettings -lXsettings
- 
- install-program: $(LIBXSETTINGS_SO)
- 	install -d $(DESTDIR)$(PREFIX)/lib
diff --git a/meta/packages/libxsettings/libxsettings_0.11.bb b/meta/packages/libxsettings/libxsettings_0.11.bb
deleted file mode 100644
index caf2bc67a..000000000
--- a/meta/packages/libxsettings/libxsettings_0.11.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Common code for XSETTINGS"
-SECTION = "gpe/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "libx11"
-
-inherit gpe
-
-headers = "xsettings-common.h"
-
-do_stage () {
-        oe_libinstall -so libXsettings ${STAGING_LIBDIR}
-
-	mkdir -p ${STAGING_INCDIR}/gpe
-	for h in ${headers}; do
-		install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
-	done
-}
-
-do_install () {
-	gpe_do_install
-	oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
-}