From 60009b5ba1e0222c4011c00f6846f9b1ff3c1c80 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 24 Aug 2013 21:28:25 +0300 Subject: [PATCH] OsmAnd: Fix broken link to download zlib during build. Also submitted upstream: https://github.com/osmandapp/OsmAnd-core/pull/24 https://github.com/osmandapp/OsmAnd-tools/pull/57 --- build/extlib/osmand-zlib-url_145.patch | 15 +++++++++++++++ metadata/net.osmand.plus.txt | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 build/extlib/osmand-zlib-url_145.patch diff --git a/build/extlib/osmand-zlib-url_145.patch b/build/extlib/osmand-zlib-url_145.patch new file mode 100644 index 0000000000..15b7c0687d --- /dev/null +++ b/build/extlib/osmand-zlib-url_145.patch @@ -0,0 +1,15 @@ +Only latest release appears to be hosted on http://zlib.net/ + +diff --git a/externals/zlib/configure.sh b/externals/zlib/configure.sh +index e6d4103..c35f74c 100755 +--- a/externals/zlib/configure.sh ++++ b/externals/zlib/configure.sh +@@ -16,7 +16,7 @@ fi + + # Download + echo "Zlib Downloading new upstream..." +-curl -L http://zlib.net/zlib-1.2.7.tar.bz2 > $SRCLOC/upstream.tar.bz2 || { echo "Failed to download!" 1>&2; exit; } ++curl -L http://sourceforge.net/projects/libpng/files/zlib/1.2.7/zlib-1.2.7.tar.bz2/download > $SRCLOC/upstream.tar.bz2 || { echo "Failed to download!" 1>&2; exit; } + + # Extract + echo "Zlib Extracting upstream..." diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 2dd84fa363..45d71cf88c 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -97,14 +97,15 @@ forcevercode=yes,\ rm=SherlockBar/build.xml,\ encoding=utf-8,\ srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481,\ -extlibs=perms-osmand_145.diff,\ +extlibs=perms-osmand_145.diff;osmand-zlib-url_145.patch,\ patch=remove_analytics_android_145.diff,\ prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \ sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ $$SDK$$/tools/android update project -p ../SherlockBar && \ sed -i 's/app_version">[^<]*/app_version">1.5-ARM/' \ res/values/no_translate.xml && sed -i '/keys/d' ant.properties && \ - cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff,\ + cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff && \ + git apply ../android/OsmAnd/libs/osmand-zlib-url_145.patch,\ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.sh && \ ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ ant build -f ../OsmAnd-java/build.xml,\