From 0c1c4dabb397b4dec444a000808defe75126c708 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Sun, 23 Oct 2016 22:59:28 +0200
Subject: [PATCH] Add 5.2.3.1 libreoffice build

* UnoUrlTest.java lead to a scanner error due to unicode problems [1],
  work around the issue by removing the offending line
* work around upstream problems with clew which is not included in
  android builds but still some of the compiled files rely on it [2]
* use NDK r10e because newer NDKs don't have a README.txt and upstream
  wants that file [3]
* Update the LOTarballs srclib to include the newest srclibs. If you
  wonder how I created them: I built it locally without disabling
  external fetching, so I got all the files needed, then I copied those
  over.
* Remove some test blobs that the scanner complains about

[1]: https://gitlab.com/fdroid/fdroidserver/issues/226
[2]: https://bugs.documentfoundation.org/show_bug.cgi?id=103443
[3]: https://bugs.documentfoundation.org/show_bug.cgi?id=103442
---
 .../org.documentfoundation.libreoffice.txt    | 58 +++++++++++++++++++
 srclibs/LOTarballs.txt                        |  2 +-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/metadata/org.documentfoundation.libreoffice.txt b/metadata/org.documentfoundation.libreoffice.txt
index ae19281778..b56bb2079c 100644
--- a/metadata/org.documentfoundation.libreoffice.txt
+++ b/metadata/org.documentfoundation.libreoffice.txt
@@ -97,6 +97,64 @@ Build:5.1.0.0.alpha1+/5b791ec,5
         make && \
         popd
 
+Build:5.2.3.1/01ec8f3,10
+    commit=01ec8f357e651ca9656837b783cf7e6a32ee4d92
+    subdir=android/source
+    gradle=StrippedUI
+    srclibs=LOTarballs@7af09343d73215d3556898d70a35af94efd02cec
+    rm=setup_native/source/packinfo/DS_Store*,oox/qa/unit/data,writerperfect/qa/unit/data/writer/libmwaw/pass/WriterPlus
+    prebuild=pushd ../../ && \
+        sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
+        sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
+        sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac && \
+        sed -i -e '/debug/d' android/CustomTarget_lo_android.mk && \
+        sed -i -e 's/rm /true /g' android/source/Makefile && \
+        sed -i -e 's/\.\/gradlew/true/g' android/source/Makefile && \
+        sed -i -e '/opencl.openclwrapper.hxx/d' -i -e 's/bOpenCL = .*;$/bOpenCL = false;/' cui/source/dialogs/about.cxx && \
+        sed -i -e '/desktop\/source\/app\/opencl/d' desktop/Library_sofficeapp.mk && \
+        rm desktop/source/app/opencl.cxx && \
+        sed -i '/"horst"/d' javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java && \
+        sed -i -e 's/^\(\s*\).*debug.*$/\1 true/' android/CustomTarget_lo_android.mk && \
+        echo "Typo" && \
+        sed -i -e 's/share\/share/share/g' android/source/build.gradle && \
+        ./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="org.documentfoundation.libreoffice" --enable-fetch-external=no --with-android-ndk=$$NDK$$ --with-android-ndk-toolchain-version=4.9 --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroid --with-build-platform-configure-options="--with-system-jpeg=no --with-system-libxml=no --disable-dbus --disable-gconf --disable-python --disable-gui --disable-gtk --disable-gstreamer-1.0" && \
+        popd && \
+        make liboSettings.gradle versionCode=10
+    build=pushd ../../ && \
+        ln -s ../android/source/$$LOTarballs$$ external/tarballs && \
+        make && \
+        popd
+    ndk=r10e
+
+Build:5.2.3.1/01ec8f3,11
+    commit=01ec8f357e651ca9656837b783cf7e6a32ee4d92
+    subdir=android/source
+    gradle=StrippedUI
+    srclibs=LOTarballs@7af09343d73215d3556898d70a35af94efd02cec
+    rm=setup_native/source/packinfo/DS_Store*,oox/qa/unit/data,writerperfect/qa/unit/data/writer/libmwaw/pass/WriterPlus
+    prebuild=pushd ../../ && \
+        sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
+        sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
+        sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac && \
+        sed -i -e '/debug/d' android/CustomTarget_lo_android.mk && \
+        sed -i -e 's/rm /true /g' android/source/Makefile && \
+        sed -i -e 's/\.\/gradlew/true/g' android/source/Makefile && \
+        sed -i -e '/opencl.openclwrapper.hxx/d' -i -e 's/bOpenCL = .*;$/bOpenCL = false;/' cui/source/dialogs/about.cxx && \
+        sed -i -e '/desktop\/source\/app\/opencl/d' desktop/Library_sofficeapp.mk && \
+        rm desktop/source/app/opencl.cxx && \
+        sed -i '/"horst"/d' javaunohelper/test/com/sun/star/lib/uno/helper/UnoUrlTest.java && \
+        sed -i -e 's/^\(\s*\).*debug.*$/\1 true/' android/CustomTarget_lo_android.mk && \
+        echo "Typo" && \
+        sed -i -e 's/share\/share/share/g' android/source/build.gradle && \
+        ./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="org.documentfoundation.libreoffice" --enable-fetch-external=no --with-android-ndk=$$NDK$$ --with-android-ndk-toolchain-version=4.9 --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroidX86 --with-build-platform-configure-options="--with-system-jpeg=no --with-system-libxml=no --disable-dbus --disable-gconf --disable-python --disable-gui --disable-gtk --disable-gstreamer-1.0" && \
+        popd && \
+        make liboSettings.gradle versionCode=11
+    build=pushd ../../ && \
+        ln -s ../android/source/$$LOTarballs$$ external/tarballs && \
+        make && \
+        popd
+    ndk=r10e
+
 Archive Policy:4 versions
 Auto Update Mode:None
 Update Check Mode:None
diff --git a/srclibs/LOTarballs.txt b/srclibs/LOTarballs.txt
index 036b0cb896..09dbf68d32 100644
--- a/srclibs/LOTarballs.txt
+++ b/srclibs/LOTarballs.txt
@@ -1,2 +1,2 @@
 Repo Type:git
-Repo:https://gitlab.com/Manizuca/LOTarballs.git
+Repo:https://gitlab.com/est/LOTarballs.git