merge of '92b50128e188e5fefd038726a401a9de2dd1ef56'

     and 'ca639ce6da41e90a150a4efd5a0738273cd10607'

4 files changed, 11 insertions, 79 deletions

diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb
index 6504405d49..35a2e5ec33 100644
--- a/packages/libxsettings-client/libxsettings-client_0.14.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -1,21 +1,5 @@
-SECTION = "gpe/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-DEPENDS = "libxsettings virtual/libx11 libxt"
-# libxt is required to stop configure breaking builds by
-# including system paths to find it if it isn't present.
+require libxsettings-client.inc
 
-inherit autotools pkgconfig gpe
+PR = "r1"
 
 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/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb
index cfec0904e9..725172b944 100644
--- a/packages/libxsettings-client/libxsettings-client_0.16.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.16.bb
@@ -1,23 +1,3 @@
-SECTION = "gpe/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-DEPENDS = "libxsettings virtual/libx11 libxt"
-# libxt is required to stop configure breaking builds by
-# including system paths to find it if it isn't present.
-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
-}
+require libxsettings-client.inc
 
+PR="r2"
diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb
index 41f3e8f6e4..2178b749fb 100644
--- a/packages/libxsettings-client/libxsettings-client_0.17.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.17.bb
@@ -1,22 +1,6 @@
-SECTION = "gpe/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc"
-# libxt is required to stop configure breaking builds by
-# including system paths to find it if it isn't present.
-PR="r1"
+require libxsettings-client.inc
 
-GPE_TARBALL_SUFFIX = "bz2"
-inherit autotools pkgconfig gpe
+DEPENDS += "gtk-doc"
+PR="r2"
 
 SRC_URI += "file://no-host-includes.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
-}
-
diff --git a/packages/libxsettings-client/libxsettings-client_svn.bb b/packages/libxsettings-client/libxsettings-client_svn.bb
index 111c692603..c9705b5673 100644
--- a/packages/libxsettings-client/libxsettings-client_svn.bb
+++ b/packages/libxsettings-client/libxsettings-client_svn.bb
@@ -1,26 +1,10 @@
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc"
-PV = "0.17+svn${SRCDATE}"
-# libxt is required to stop configure breaking builds by
-# including system paths to find it if it isn't present.
-PR = "r0"
+require libxsettings-client.inc
 
-inherit autotools pkgconfig gpe
+DEPENDS += "gtk-doc"
+PV = "0.17+svn${SRCDATE}"
+PR = "r1"
 
 SRC_URI = "${GPE_SVN}"
-
 S = "${WORKDIR}/${PN}"
 
-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
-}
-
-headers = "xsettings-client.h xsettings-common.h"
-
 DEFAULT_PREFERENCE = "-1"