[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - external/libxml2

[Christian Lohmaier]

 external/libxml2/libxml2-android.patch |   15 ---------------
 1 file changed, 15 deletions(-)

New commits:
commit 7890aabc073e277d43f081a70ee8480741ec4f51
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Nov 21 11:16:16 2015 +0100

    gradle based apk packing doesn't have .so limitation anymore
    
    and even if it had, everything ends up in liblo-native-code.so now
    
    Change-Id: I5d62cf619867d6d0f7c5d4f91acf529706ebdc75
    (cherry picked from commit e6ca4cf597d9fd1d2d34058adc70d22f2d7ec508)

diff --git a/external/libxml2/libxml2-android.patch b/external/libxml2/libxml2-android.patch
index 53011e1..f9057f6 100644
--- a/external/libxml2/libxml2-android.patch
+++ b/external/libxml2/libxml2-android.patch
@@ -1,18 +1,3 @@
---- misc/libxml2-2.7.6/ltmain.sh
-+++ misc/build/libxml2-2.7.6/ltmain.sh
-@@ -3228,6 +3228,12 @@
- 	  func_warning "\`-release' is ignored for convenience libraries"
-       else
- 
-+	# Force no versioning suffix for Android thanks to silly
-+	# apkbuilder which doesn't add extra native libs unless their
-+	# name ends with .so
-+
-+	version_type=none
-+
- 	# Parse the version information argument.
- 	save_ifs="$IFS"; IFS=':'
- 	set dummy $vinfo 0 0 0
 --- misc/libxml2-2.7.6/trionan.c
 +++ misc/build/libxml2-2.7.6/trionan.c
 @@ -327,7 +327,7 @@