[oe-commits] org.oe.dev matchbox-wm: Drop old versions, add patch from poky to fix expat configure option

[rpurdie commit]

matchbox-wm: Drop old versions, add patch from poky to fix expat configure option

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 8407454b2153558ec70df9d357c20b3c7154c0a1
ViewMTN: http://monotone.openembedded.org/revision/info/8407454b2153558ec70df9d357c20b3c7154c0a1
Files:
1
packages/matchbox-wm/matchbox-wm_0.8.3.bb
packages/matchbox-wm/matchbox-wm_0.8.4.bb
packages/matchbox-wm/matchbox-wm_0.9.2.bb
packages/matchbox-wm/matchbox-wm_0.9.3.bb
packages/matchbox-wm/matchbox-wm_0.9.4.bb
packages/matchbox-wm/matchbox-wm_0.9.bb
packages/matchbox-wm/matchbox-wm/configure_fix.patch
packages/matchbox-wm/matchbox-wm_1.2.bb
Diffs:

#
# mt diff -rbca6af36a59512900e51fee6e3ce4b7ad37326b3 -r8407454b2153558ec70df9d357c20b3c7154c0a1
#
# 
# 
# delete "packages/matchbox-wm/matchbox-wm_0.8.3.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.8.4.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.9.2.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.9.3.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.9.4.bb"
# 
# delete "packages/matchbox-wm/matchbox-wm_0.9.bb"
# 
# add_file "packages/matchbox-wm/matchbox-wm/configure_fix.patch"
#  content [bae834deeca2d5f8f79cc2ac7ad96dac873df15a]
# 
# patch "packages/matchbox-wm/matchbox-wm_1.2.bb"
#  from [98095f550f8c77883c44c40c96ff2b2161a07c87]
#    to [12502c8a947c859da87bc31d714b44edeec78784]
# 
============================================================
--- packages/matchbox-wm/matchbox-wm/configure_fix.patch	bae834deeca2d5f8f79cc2ac7ad96dac873df15a
+++ packages/matchbox-wm/matchbox-wm/configure_fix.patch	bae834deeca2d5f8f79cc2ac7ad96dac873df15a
@@ -0,0 +1,13 @@
+Index: matchbox-window-manager/configure.ac
+===================================================================
+--- matchbox-window-manager.orig/configure.ac	2007-11-14 12:02:28.000000000 +0000
++++ matchbox-window-manager/configure.ac	2007-11-14 12:18:55.000000000 +0000
+@@ -283,7 +283,7 @@
+     yes)
+ 
+ 	case "$expat" in
+-	  yes)
++	  yes|"")
+ 		EXPAT_LIBS="-lexpat"
+ 		;;
+ 	    *)
============================================================
--- packages/matchbox-wm/matchbox-wm_1.2.bb	98095f550f8c77883c44c40c96ff2b2161a07c87
+++ packages/matchbox-wm/matchbox-wm_1.2.bb	12502c8a947c859da87bc31d714b44edeec78784
@@ -1,11 +1,12 @@ RDEPENDS = ""
 require matchbox-wm.inc
 
 DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native "
 RDEPENDS = ""
 
-PR="r3"
+PR="r4"
 
-SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
+SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \
+           file://configure_fix.patch;patch=1 \
            file://gconf-2.m4 \
            file://kbdconfig"
 
@@ -29,7 +30,8 @@ EXTRA_OECONF = " \
 EXTRA_OECONF = " \
                 --enable-startup-notification\
 		--enable-gconf \
-		--enable-expat \
+		 --with-expat-lib=${STAGING_LIBDIR} \
+		 --with-expat-includes=${STAGING_INCDIR} \
 		--disable-xrm"
 
 do_configure_prepend () {