merge of '43c960d45911aef12f2312ce6684bc1c3678b4c1'

     and 'fd24a981d47c073f1728f3aba7eaabcf9a2ac424'

12 files changed, 7 insertions, 13 deletions

diff --git a/packages/dbus/dbus-1.0.2/.mtn2git_empty b/packages/dbus/dbus-1.0.3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/dbus/dbus-1.0.2/.mtn2git_empty
+++ b/packages/dbus/dbus-1.0.3/.mtn2git_empty
diff --git a/packages/dbus/dbus-1.0.2/cross.patch b/packages/dbus/dbus-1.0.3/cross.patch
index 268a3ae3de..268a3ae3de 100644
--- a/packages/dbus/dbus-1.0.2/cross.patch
+++ b/packages/dbus/dbus-1.0.3/cross.patch
diff --git a/packages/dbus/dbus-1.0.2/dbus-1.init b/packages/dbus/dbus-1.0.3/dbus-1.init
index 0725083c69..0725083c69 100644
--- a/packages/dbus/dbus-1.0.2/dbus-1.init
+++ b/packages/dbus/dbus-1.0.3/dbus-1.init
diff --git a/packages/dbus/dbus-1.0.2/fix-install-daemon.patch b/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
index c31786357d..c31786357d 100644
--- a/packages/dbus/dbus-1.0.2/fix-install-daemon.patch
+++ b/packages/dbus/dbus-1.0.3/fix-install-daemon.patch
diff --git a/packages/dbus/dbus-1.0.2/fix-waitpid.patch b/packages/dbus/dbus-1.0.3/fix-waitpid.patch
index 80c431809c..80c431809c 100644
--- a/packages/dbus/dbus-1.0.2/fix-waitpid.patch
+++ b/packages/dbus/dbus-1.0.3/fix-waitpid.patch
diff --git a/packages/dbus/dbus-1.0.2/tmpdir.patch b/packages/dbus/dbus-1.0.3/tmpdir.patch
index 838b903f0a..838b903f0a 100644
--- a/packages/dbus/dbus-1.0.2/tmpdir.patch
+++ b/packages/dbus/dbus-1.0.3/tmpdir.patch
diff --git a/packages/dbus/dbus-native_1.0.2.bb b/packages/dbus/dbus-native_1.0.3.bb
index 0149ab374f..0149ab374f 100644
--- a/packages/dbus/dbus-native_1.0.2.bb
+++ b/packages/dbus/dbus-native_1.0.3.bb
diff --git a/packages/dbus/dbus_1.0.2.bb b/packages/dbus/dbus_1.0.3.bb
index 6a54a62d9a..6a54a62d9a 100644
--- a/packages/dbus/dbus_1.0.2.bb
+++ b/packages/dbus/dbus_1.0.3.bb
diff --git a/packages/libspiff/files/autofoo.patch b/packages/libspiff/files/autofoo.patch
index 2fcd7ebb47..5f96a2c217 100644
--- a/packages/libspiff/files/autofoo.patch
+++ b/packages/libspiff/files/autofoo.patch
@@ -1,17 +1,15 @@
-Index: libspiff-0.7.2/configure.in
+Index: libspiff-0.8.2/configure.in
 ===================================================================
---- libspiff-0.7.2.orig/configure.in	2007-08-25 15:47:29.000000000 +0000
-+++ libspiff-0.7.2/configure.in	2007-08-25 15:47:48.000000000 +0000
-@@ -78,26 +78,6 @@
- 	LDFLAGS="-L${withval} ${LDFLAGS}"
- ], [])
+--- libspiff-0.8.2.orig/configure.in
++++ libspiff-0.8.2/configure.in
+@@ -80,24 +80,6 @@ AC_ARG_WITH(uriparser-lib, [  --with-uri
+ 
+ 
  
--
--
 -# Local headers must come very first. Otherwise we
 -# risk including headers of an already installed
 -# libSpiff version if its path is in CPPFLAGS
--CPPFLAGS="-Iinclude ${CPPFLAGS}"
+-CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
 -
 -
 -
diff --git a/packages/libspiff/libspiff_0.7.2.bb b/packages/libspiff/libspiff_0.8.2.bb
index 06be4b3aa4..06be4b3aa4 100644
--- a/packages/libspiff/libspiff_0.7.2.bb
+++ b/packages/libspiff/libspiff_0.8.2.bb
diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb
index 58f5b82419..5243de4259 100644
--- a/packages/xorg-lib/libx11_1.1.2.bb
+++ b/packages/xorg-lib/libx11_1.1.2.bb
@@ -17,8 +17,6 @@ do_compile() {
 	(
 		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
 		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-		# mv to stop it getting rebuilt
-		mv makekeys.c makekeys.c.orig
 		cd ../../
 	) || exit 1
 	oe_runmake
diff --git a/packages/xorg-lib/libx11_1.1.3.bb b/packages/xorg-lib/libx11_1.1.3.bb
index 58f5b82419..5243de4259 100644
--- a/packages/xorg-lib/libx11_1.1.3.bb
+++ b/packages/xorg-lib/libx11_1.1.3.bb
@@ -17,8 +17,6 @@ do_compile() {
 	(
 		unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
 		cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
-		# mv to stop it getting rebuilt
-		mv makekeys.c makekeys.c.orig
 		cd ../../
 	) || exit 1
 	oe_runmake