From 830db10b8a1e6fc2964bb2840dc5ecb34945eaf4 Mon Sep 17 00:00:00 2001
From: Kilian Holzinger <kilian.holzinger@gmail.com>
Date: Mon, 28 Oct 2013 19:46:36 +0100
Subject: [PATCH] I2P

---
 metadata/net.i2p.android.router.txt           |  8 +--
 .../net.i2p.android.router/build.sh.patch     | 56 +++++++++++++++++++
 metadata/net.i2p.android.router/jni.patch     | 22 --------
 3 files changed, 60 insertions(+), 26 deletions(-)
 create mode 100644 metadata/net.i2p.android.router/build.sh.patch
 delete mode 100644 metadata/net.i2p.android.router/jni.patch

diff --git a/metadata/net.i2p.android.router.txt b/metadata/net.i2p.android.router.txt
index 8d8abe003a..eb09a74458 100644
--- a/metadata/net.i2p.android.router.txt
+++ b/metadata/net.i2p.android.router.txt
@@ -22,8 +22,8 @@ For detailed information, security information, and usage examples see the [Rele
 Repo Type:git
 Repo:https://github.com/i2p/i2p.android.base.git
 
-Build Version:0.9.7.1,0,!needs legacy toolchains e4c9095626cce668de33,\
-srclibs=I2P@06d2db0046efa1f5bd766,update=no,patch=jni.patch,novcheck=yes,prebuild=\
+Build Version:0.9.8.1,0,788445f6ceb0d0c165e98b9b7d1aa732c98d37ac,\
+srclibs=I2P@d7c3ffa4def637f1c18dbd316f9e06093b113e09,update=no,patch=build.sh.patch,novcheck=yes,prebuild=\
     sed -i '41s|#export NDK=$(realpath ../../android-ndk-r5b/)|export NDK=$$NDK$$|' ./routerjars/jni/build.sh && \
     cp -R $$I2P$$* ./i2p.i2p && \
     echo -e "\nsdk.dir=$$SDK$$" >> ./local.properties && \
@@ -32,6 +32,8 @@ srclibs=I2P@06d2db0046efa1f5bd766,update=no,patch=jni.patch,novcheck=yes,prebuil
     echo -e "\ni2psrc=./i2p.i2p" >> ./local.properties && \
     rm -R ./i2p.i2p/installer/lib/jbigi/* &&\
     rm -R ./i2p.i2p/installer/lib/wrapper/* && \
+    rm -R ./i2p.i2p/installer/lib/launch4j/bin* && \
+    rm -R ./i2p.i2p/installer/lib/launch4j/w32api* && \
     rm -R ./routerjars/jni/libjbigi.so && \
     cp -R $$SDK$$/extras/android/support/v7/appcompat/ appcompat/ && \
     echo -e "\nandroid.library.reference.2=./appcompat/" >> ./local.properties && \
@@ -50,5 +52,3 @@ srclibs=I2P@06d2db0046efa1f5bd766,update=no,patch=jni.patch,novcheck=yes,prebuil
 
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:0.9.7.1
-Current Version Code:0
diff --git a/metadata/net.i2p.android.router/build.sh.patch b/metadata/net.i2p.android.router/build.sh.patch
new file mode 100644
index 0000000000..1baa44be26
--- /dev/null
+++ b/metadata/net.i2p.android.router/build.sh.patch
@@ -0,0 +1,56 @@
+*** a/routerjars/jni/build.sh	2013-10-28 19:34:32.790844250 +0100
+--- b/routerjars/jni/build.sh	2013-10-28 19:35:39.906841258 +0100
+***************
+*** 41,51 ****
+  #export NDK=$(realpath ../../android-ndk-r5b/)
+  
+  ## Simple fix for osx development
+! if [ "`uname -s`" == "Darwin" ]; then
+!     export NDK=/Developer/android/ndk/
+! else
+!     export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`"
+! fi
+  #
+  # API level, must match that in ../AndroidManifest.xml
+  #
+--- 41,51 ----
+  #export NDK=$(realpath ../../android-ndk-r5b/)
+  
+  ## Simple fix for osx development
+! #if [ "`uname -s`" == "Darwin" ]; then
+! #    export NDK=/Developer/android/ndk/
+! #else
+! #    export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`"
+! #fi
+  #
+  # API level, must match that in ../AndroidManifest.xml
+  #
+***************
+*** 53,63 ****
+  ARCH=arm
+  export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/
+  export AABI=arm-linux-androideabi-4.4.3
+! if [ "`uname -s`" == "Darwin" ]; then
+!     export SYSTEM=darwin-x86
+! else
+!     export SYSTEM=linux-x86
+! fi
+  export BINPREFIX=arm-linux-androideabi-
+  export CC="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}gcc --sysroot=$SYSROOT"
+  # worked without this on 4.3.2, but 5.0.2 couldn't find it
+--- 53,67 ----
+  ARCH=arm
+  export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/
+  export AABI=arm-linux-androideabi-4.4.3
+! if [ "`uname -s`" == "Darwin" ]
+! 	then
+! 		export SYSTEM=darwin-x86
+! 	elif [ "`uname -m`" == "x86_64" ]
+! 	then
+! 		export SYSTEM=linux-x86_64
+! 	else
+! 		export SYSTEM=linux-x86
+! fi 
+  export BINPREFIX=arm-linux-androideabi-
+  export CC="$NDK/toolchains/$AABI/prebuilt/$SYSTEM/bin/${BINPREFIX}gcc --sysroot=$SYSROOT"
+  # worked without this on 4.3.2, but 5.0.2 couldn't find it
diff --git a/metadata/net.i2p.android.router/jni.patch b/metadata/net.i2p.android.router/jni.patch
deleted file mode 100644
index 10202a7dac..0000000000
--- a/metadata/net.i2p.android.router/jni.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/routerjars/jni/build.sh2013-09-19 12:51:29.865886937 +0200
-+++ b/routerjars/jni/build.sh	2013-09-19 12:51:20.755000838 +0200
-@@ -41,14 +41,14 @@
- #export NDK=$(realpath ../../android-ndk-r5b/)
- 
- ## Simple fix for osx development
--if [ "`uname -s`" == "Darwin" ]; then
--    export NDK=/Developer/android/ndk/
--else
--    export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`"
--fi
-+#if [ "`uname -s`" == "Darwin" ]; then
-+#    export NDK=/Developer/android/ndk/
-+#else
-+#    export NDK="`readlink -n -e $(for last in ../../android-ndk-r*/.; do true; done ; echo $last)`"
-+#fi
- #
- # API level, must match that in ../AndroidManifest.xml
- #
- LEVEL=8
- ARCH=arm
- export SYSROOT=$NDK/platforms/android-$LEVEL/arch-$ARCH/