libxsettings-client: unbreak every version that isn't 0.16

* please test any refactoring you do, bitbake -c patch -b foo.bb exists for a reason

diff --git a/packages/libxsettings-client/files/.mtn2git_empty b/packages/libxsettings-client/files/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/libxsettings-client/make_pkgconfig_x11.patch b/packages/libxsettings-client/files/make_pkgconfig_x11.patch
similarity index 100%
rename from packages/libxsettings-client/make_pkgconfig_x11.patch
rename to packages/libxsettings-client/files/make_pkgconfig_x11.patch

diff --git a/packages/libxsettings-client/no-host-includes.patch b/packages/libxsettings-client/files/no-host-includes.patch
similarity index 100%
rename from packages/libxsettings-client/no-host-includes.patch
rename to packages/libxsettings-client/files/no-host-includes.patch

diff --git a/packages/libxsettings-client/libxsettings-client.inc b/packages/libxsettings-client/libxsettings-client.inc
index 319a4f192dae677fdd54bd9f171a89b17410df19..bfcf1245f6d700837711218813fe1f443bccc901 100644 (file)
--- a/packages/libxsettings-client/libxsettings-client.inc
+++ b/packages/libxsettings-client/libxsettings-client.inc
@@ -9,7 +9,7 @@ GPE_TARBALL_SUFFIX = "bz2"
 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 () {

diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb
index 725172b94466b6b5178341649007f8b5516b71bc..dff73c3422aec3a247765a8aa1822a9fcf788bd8 100644 (file)
--- a/packages/libxsettings-client/libxsettings-client_0.16.bb
+++ b/packages/libxsettings-client/libxsettings-client_0.16.bb
@@ -1,3 +1,6 @@
 require libxsettings-client.inc
 
+SRC_URI += "        file://Makefile-am.patch;patch=1"
+
+
 PR="r2"