libxsettings-client: convert to new-style staging

* remove unused/unpinned versions
* bump PR

9 files changed, 9 insertions, 115 deletions

diff --git a/recipes/libxsettings-client/files/make_pkgconfig_x11.patch b/recipes/libxsettings-client/files/make_pkgconfig_x11.patch
deleted file mode 100644
index 3a386672d2..0000000000
--- a/recipes/libxsettings-client/files/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/recipes/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch b/recipes/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch
deleted file mode 100644
index fb5b1dbe65..0000000000
--- a/recipes/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/recipes/libxsettings-client/libxsettings-client.inc b/recipes/libxsettings-client/libxsettings-client.inc
index 1eb8961c1c..d999f8c997 100644
--- a/recipes/libxsettings-client/libxsettings-client.inc
+++ b/recipes/libxsettings-client/libxsettings-client.inc
@@ -9,20 +9,16 @@ RDEPENDS_${PN}-dev += " libxsettings-dev"
 GPE_TARBALL_SUFFIX = "bz2"
 inherit autotools pkgconfig gpe
 
-INC_PR = "r3"
+INC_PR = "r4"
 
-SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \
-"
+SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2"
 
 headers = "xsettings-client.h"
-do_stage () {
-        oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
-        mkdir -p ${STAGING_INCDIR}
+
+do_install () {
+        oe_libinstall -so libXsettings-client ${D}${libdir}
+        install -d ${D}${includedir}
         for h in ${headers}; do
-               install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
+               install -m 0644 ${S}/$h ${D}${includedir}/$h
         done
 }
-
-do_install_append () {
-	rm ${D}/${includedir}/xsettings-common.h
-}
diff --git a/recipes/libxsettings-client/libxsettings-client_0.12.bb b/recipes/libxsettings-client/libxsettings-client_0.12.bb
deleted file mode 100644
index deb8dd8911..0000000000
--- a/recipes/libxsettings-client/libxsettings-client_0.12.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SECTION = "gpe/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-DEPENDS = "libgpewidget libxsettings virtual/libx11"
-
-inherit pkgconfig gpe
-
-SRC_URI += "file://make_pkgconfig_x11.patch"
-
-S = "${WORKDIR}/libxsettings-client0-0.12"
-
-headers = "xsettings-client.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
-}
-
-do_install () {
-        gpe_do_install
-	install -d ${D}${includedir}/
-	install xsettings-client.h ${D}${includedir}/
-}
-
-SRC_URI[md5sum] = "43c0e93e2f96878856ad9475c702b2bb"
-SRC_URI[sha256sum] = "4fa21cc5118b66986f067e064971159849242662f7ad49faeff2d4e20f746bc1"
diff --git a/recipes/libxsettings-client/libxsettings-client_0.13.bb b/recipes/libxsettings-client/libxsettings-client_0.13.bb
deleted file mode 100644
index 344341ce17..0000000000
--- a/recipes/libxsettings-client/libxsettings-client_0.13.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SECTION = "gpe/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-DEPENDS = "libgpewidget libxsettings virtual/libx11"
-
-inherit pkgconfig gpe
-
-SRC_URI += "file://make_pkgconfig_x11.patch"
-
-headers = "xsettings-client.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
-}
-
-do_install () {
-        gpe_do_install
-        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
-}
-
-SRC_URI[md5sum] = "6a9d49b146abafcc9a7e67baed800cf6"
-SRC_URI[sha256sum] = "3e9f5e5e61611e8df234aedd48286407ae57e40e8f6e6499eb66accb09d6b5c4"
diff --git a/recipes/libxsettings-client/libxsettings-client_0.14.bb b/recipes/libxsettings-client/libxsettings-client_0.14.bb
deleted file mode 100644
index 539706b9c1..0000000000
--- a/recipes/libxsettings-client/libxsettings-client_0.14.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require libxsettings-client.inc
-
-PR = "${INC_PR}.1"
-
-SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "63e6c23e5a2036cfba77bd22c9a7bff2"
-SRC_URI[sha256sum] = "33237bb8fdad27e7f9fef9122198654e4e39081582baeb60ca4246308ffa4eb2"
diff --git a/recipes/libxsettings-client/libxsettings-client_0.16.bb b/recipes/libxsettings-client/libxsettings-client_0.16.bb
deleted file mode 100644
index a0b128be0d..0000000000
--- a/recipes/libxsettings-client/libxsettings-client_0.16.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libxsettings-client.inc
-
-SRC_URI += "        file://Makefile-am.patch"
-
-
-PR ="${INC_PR}.1"
-
-SRC_URI[md5sum] = "bd572a17dce9bb5826441a8d1d5f3da5"
-SRC_URI[sha256sum] = "1622c837f0a7fef79b523b07d936bb807404974610a239cf3ada04fce2b13a11"
diff --git a/recipes/libxsettings-client/libxsettings-client_0.17.bb b/recipes/libxsettings-client/libxsettings-client_0.17.bb
index c3f693493a..627d656152 100644
--- a/recipes/libxsettings-client/libxsettings-client_0.17.bb
+++ b/recipes/libxsettings-client/libxsettings-client_0.17.bb
@@ -3,7 +3,7 @@ require libxsettings-client.inc
 DEPENDS += "gtk-doc"
 PR ="${INC_PR}.1"
 
-SRC_URI += "file://no-host-includes.patch "
+SRC_URI += "file://no-host-includes.patch"
 
 SRC_URI[md5sum] = "2c052bbe613d2d83abad391824b217ad"
 SRC_URI[sha256sum] = "900e9b131bd357a3e6bcc5fe9a94d42018d9cf52e85d1c772a7e69a7f99ea9ab"
diff --git a/recipes/libxsettings-client/libxsettings-client_svn.bb b/recipes/libxsettings-client/libxsettings-client_svn.bb
index c9705b5673..5c4d338366 100644
--- a/recipes/libxsettings-client/libxsettings-client_svn.bb
+++ b/recipes/libxsettings-client/libxsettings-client_svn.bb
@@ -2,7 +2,7 @@ require libxsettings-client.inc
 
 DEPENDS += "gtk-doc"
 PV = "0.17+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GPE_SVN}"
 S = "${WORKDIR}/${PN}"