From 529938a06225cf5005204a85ae175ed254061834 Mon Sep 17 00:00:00 2001
From: Christopher Gittner <christopher@gittner.org>
Date: Wed, 30 Jul 2014 19:11:05 +0200
Subject: [PATCH 1/2] Update of org.navitproject.navit to build with current
 F-Droid Version

---
 metadata/org.navitproject.navit.txt | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index 3eb27589dd..153455ddec 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -26,7 +26,9 @@ Repo:https://svn.code.sf.net/p/navit/code/trunk
 Build:5650,5650
     commit=5650
     update=no
-    build=export PATH=$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+    prebuild=echo '<project name="Navit"><target name="clean"/></project>' > build.xml
+    build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+        rm build.xml && \
         mkdir android-build && \
         cd android-build/ && \
         cmake -DCMAKE_TOOLCHAIN_FILE=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
@@ -39,7 +41,9 @@ Build:5650,5650
 Build:5720,5720
     commit=5720
     update=no
-    build=export PATH=$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+    prebuild=echo '<project name="Navit"><target name="clean"/></project>' > build.xml
+    build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+        rm build.xml && \
         mkdir android-build && \
         cd android-build/ && \
         cmake -DCMAKE_TOOLCHAIN_FILE=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
@@ -50,10 +54,26 @@ Build:5720,5720
     novcheck=yes
 
 Build:5740,5740
-    disable=fails, android update needed
     commit=5740
     update=no
-    build=export PATH=$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+    prebuild=echo '<project name="Navit"><target name="clean"/></project>' > build.xml
+    build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+        rm build.xml && \
+        mkdir android-build && \
+        cd android-build/ && \
+        cmake -DCMAKE_TOOLCHAIN_FILE=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
+        make && \
+        make android_resources && \
+        cd .. && \
+        ln -s android-build/navit/android/* .
+    novcheck=yes
+
+Build:5827,5827
+    commit=5827
+    update=no
+    prebuild=echo '<project name="Navit"><target name="clean"/></project>' > build.xml
+    build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+        rm build.xml && \
         mkdir android-build && \
         cd android-build/ && \
         cmake -DCMAKE_TOOLCHAIN_FILE=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \

From 6193feb2c4d07d5fcd4feb24deb61d74778ccf8e Mon Sep 17 00:00:00 2001
From: Christopher Gittner <christopher@gittner.org>
Date: Sat, 2 Aug 2014 14:55:59 +0200
Subject: [PATCH 2/2] Removed 5740 build of org.navitproject.navit

---
 metadata/org.navitproject.navit.txt | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/metadata/org.navitproject.navit.txt b/metadata/org.navitproject.navit.txt
index 153455ddec..f55091ace8 100644
--- a/metadata/org.navitproject.navit.txt
+++ b/metadata/org.navitproject.navit.txt
@@ -53,21 +53,6 @@ Build:5720,5720
         ln -s android-build/navit/android/* .
     novcheck=yes
 
-Build:5740,5740
-    commit=5740
-    update=no
-    prebuild=echo '<project name="Navit"><target name="clean"/></project>' > build.xml
-    build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
-        rm build.xml && \
-        mkdir android-build && \
-        cd android-build/ && \
-        cmake -DCMAKE_TOOLCHAIN_FILE=../navit/Toolchain/arm-eabi.cmake -DDISABLE_QT=true ../navit && \
-        make && \
-        make android_resources && \
-        cd .. && \
-        ln -s android-build/navit/android/* .
-    novcheck=yes
-
 Build:5827,5827
     commit=5827
     update=no