ZANavi: Fix 32bit build

metadata/com.zoffcc.applications.zanavi.txt

@@ -5,7 +5,7 @@ Source Code:https://github.com/zoff99/zanavi
 Issue Tracker:https://github.com/zoff99/zanavi/issues
 
 Name:ZANavi
-Summary:Navigation system
+Summary:Car Navigation System
 Description:
 ZANavi tries to make a specific android port and to succeed where NavIT can not.
 It’s only aimed at Android devices (Android 2.3 or higher) and should bring maximum user experience to the android device.
@@ -15,15 +15,20 @@ In short: it should be “install” and “start using”, but no fiddling with
 Repo Type:git
 Repo:https://github.com/zoff99/zanavi.git
 
-Build:2.0.44,244
+Build:2.0.40,240
-    disable=needs testing
-    ndk=r10e
     target=21
+    ndk=r10e
     commit=2ab763a86e8728c7200247f1cc4f57d6917a571e
-    prebuild=echo '<project name="ZANavi"><target name="clean"/></project>' > build.xml
+    prebuild=echo '<project name="ZANavi"><target name="clean"/></project>' > build.xml && \
+    mkdir -p po/lp/navit-orig-import && rm navit/maptool/poly2tri-c/001/seidel-1.0/triangulate && \
+    rm pngout-static && echo '#! /bin/bash' > pngout-static && echo 'echo $*' >> pngout-static && \
+    chmod u+rx pngout-static
     update=no
-    build=export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/bin && \
+    build=if [ `uname -m` == 'x86_64' ] ; then SUFFIX2='_64' ; else SUFFIX2='' ; fi && \
+        export PATH=$PATH:$$SDK$$/tools:$$SDK$$/platform-tools:$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/bin && \
         rm build.xml && \
+        mkdir nav2 && for i in `ls -1`; do if [ "$i" != "nav2" ]; then mv $i nav2/ ; fi ; done && \
+        mv nav2 navit && \
         mkdir android-build && \
         cd android-build/ && \
         DEBUG_="-fpic -ffunction-sections -fstack-protector -fomit-frame-pointer -fno-strict-aliasing -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ \
@@ -33,8 +38,8 @@ Build:2.0.44,244
         -L$$NDK$$/platforms/android-14/arch-arm/usr/lib" && \
         ../navit/configure \
         RANLIB=arm-linux-androideabi-ranlib AR=arm-linux-androideabi-ar \
-		CC="ccache arm-linux-androideabi-gcc -O2 $DEBUG_ -L. -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " \
+        CC="arm-linux-androideabi-gcc -O2 $DEBUG_ -L. -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " \
-		CXX="ccache arm-linux-androideabi-g++ -O2 -fno-rtti -fno-exceptions -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " \
+        CXX="arm-linux-androideabi-g++ -O2 -fno-rtti -fno-exceptions -L$$NDK$$/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86$SUFFIX2/lib/gcc/arm-linux-androideabi/4.8/ -lgcc -ljnigraphics " \
         --host=arm-eabi-linux_android \
         --enable-avoid-float --enable-avoid-unaligned \
         --disable-glib \
@@ -59,12 +64,36 @@ Build:2.0.44,244
         export DO_PNG_BUILD=1 && \
         export NDK_CCACHE="" && \
         make && \
-        cd .. && \
+        pwd && \
+        cd navit && \
+        make apkg-release || \
+        pwd && \
+        cd android-support-v7-appcompat && \
+        cat local.properties |sed -e 's#/home/navit/_navit_develop/_need/SDK/_unpack/android-sdk-linux_x86#$$SDK$$#' > l.txt && \
+        mv l.txt local.properties && \
+        cat local.properties && \
+        echo android update project -t android-21 -p . && \
+        pwd && \
+        cd ../android && \
+        pwd && \
+        cat AndroidManifest.xml | \
+        sed -e 's#android:debuggable="true"#android:debuggable="false"#' > l.txt && \
+        mv l.txt AndroidManifest.xml && \
+        cat AndroidManifest.xml | \
+        sed -e 's#android:versionName=".*"#android:versionName="2.0.40"#' > l.txt && \
+        mv l.txt AndroidManifest.xml && \
+        ant release && \
+        cd ../../../ && \
+        pwd && \
+        cat android-build/navit/android/project.properties | \
+        sed -e 's#^android.library.reference.*$#android.library.reference.1=./android-support-v7-appcompat#' > l.txt && \
+        mv l.txt android-build/navit/android/project.properties && \
+        ln -s android-build/navit/android-support-v7-appcompat . && \
         ln -s android-build/navit/android/* .
     novcheck=yes
 
 Bitcoin:1ZANav18WY8ytM7bhnAEBS3bdrTohsD9p
 Auto Update Mode:None
 Update Check Mode:RepoTrunk
-Current Version:2.0.44
+Current Version:2.0.40
-Current Version Code:244
+Current Version Code:240