/soc/2012/michael/android: bbe6b8bf53db: Added patches send in b...

[Michael Zangl]

Changeset: bbe6b8bf53dbbe4a750eac0561ad56c360b95183
Author:	 Michael Zangl <michael at soc.pidgin.im>
Date:	 2012-07-06 19:58 +0200
Branch:	 soc.2012.android
URL: http://hg.pidgin.im/soc/2012/michael/android/rev/bbe6b8bf53db

Description:

Added patches send in by Krzysztof to fix libxml2 build and header creation script.

diffstat:

 android/workspace/im.pidgin.libpurple.build/buildscripts/libxml2.ant |  5 ++---
 android/workspace/im.pidgin.libpurple/native/build.ant               |  1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diffs (29 lines):

diff --git a/android/workspace/im.pidgin.libpurple.build/buildscripts/libxml2.ant b/android/workspace/im.pidgin.libpurple.build/buildscripts/libxml2.ant
--- a/android/workspace/im.pidgin.libpurple.build/buildscripts/libxml2.ant
+++ b/android/workspace/im.pidgin.libpurple.build/buildscripts/libxml2.ant
@@ -13,12 +13,11 @@
 	<property name="builddir" value="${libpurple.build}/libxml2-${libxml2.version}" />
 	<property name="download-filename" value="ftp://xmlsoft.org/libxml2/libxml2-${libxml2.version}.tar.gz" />
 	<property name="config.dir" value="${builddir}" />
-	<property name="configure.flags" value="
-			CFLAGS="-I`pwd`../build/include -L`pwd`/../build/lib -D _GL_JUST_INCLUDE_SYSTEM_STDINT_H -DANDROID" " />
+	<property name="configure.flags" value=" --without-python
+	CFLAGS="-I${libpurple.prefix}/include -L${libpurple.prefix}/lib -D _GL_JUST_INCLUDE_SYSTEM_STDINT_H -DANDROID" " />
 
 	<property name="make.flags" value="noinst_PROGRAMS="/>
 
-	
 	<description>
             builds libxml2 for dbus and libpurple
     </description>
diff --git a/android/workspace/im.pidgin.libpurple/native/build.ant b/android/workspace/im.pidgin.libpurple/native/build.ant
--- a/android/workspace/im.pidgin.libpurple/native/build.ant
+++ b/android/workspace/im.pidgin.libpurple/native/build.ant
@@ -36,7 +36,6 @@
 		<javah classdefinition="im.pidgin.libpurple.account.PurpleAccountManager" to="${javah.out}" />
 		<javah classdefinition="im.pidgin.libpurple.account.PurpleStatus" to="${javah.out}" />
 
-		<javah classdefinition="im.pidgin.libpurple.blist.PurpleBlist" to="${javah.out}" />
 		<javah classdefinition="im.pidgin.libpurple.blist.PurpleBlistManager" to="${javah.out}" />
 		<javah classdefinition="im.pidgin.libpurple.blist.PurpleBlistGroup" to="${javah.out}" />
 		<javah classdefinition="im.pidgin.libpurple.blist.PurpleBlistNode" to="${javah.out}" />