[Libreoffice-commits] core.git: 2 commits - external/libabw external/librevenge

[jan Iversen]

 external/libabw/UnpackedTarball_libabw.mk         |    4 ++++
 external/libabw/iOS.patch.0                       |   20 ++++++++++++++++++++
 external/librevenge/UnpackedTarball_librevenge.mk |    1 +
 external/librevenge/librevenge-iOS.patch.0        |   20 ++++++++++++++++++++
 4 files changed, 45 insertions(+)

New commits:
commit a5f19b5fc210148dc54ec89dfd5e230aac5ac013
Author: jan Iversen <jani at libreoffice.org>
Date:   Mon Jun 12 17:40:02 2017 +0200

    iOS patch libabw
    
    support for arm64
    
    Change-Id: Ia5a00ef55929a71e05e3547a7ac11e8ab876e953

diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk
index b0d1610671c7..aeb482975b0e 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -21,4 +21,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libabw, \
 endif
 endif
 
+$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
+    external/libabw/iOS.patch.0 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/iOS.patch.0 b/external/libabw/iOS.patch.0
new file mode 100644
index 000000000000..9d69d6ace91e
--- /dev/null
+++ b/external/libabw/iOS.patch.0
@@ -0,0 +1,20 @@
+--- config.sub	2014-03-29 11:28:53.000000000 +0100
++++ config.sub	2017-06-12 17:37:29.000000000 +0200
+@@ -257,7 +257,7 @@
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+ 	| arc \
+-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
+ 	| avr | avr32 \
+ 	| be32 | be64 \
+ 	| bfin \
+@@ -370,7 +370,7 @@
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+ 	| avr-* | avr32-* \
+ 	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \
commit f43ea5d5276be50c87ea764131fd4c82995c15fc
Author: jan Iversen <jani at libreoffice.org>
Date:   Mon Jun 12 17:35:28 2017 +0200

    iOS patch librevenge
    
    Support for arm64
    
    Change-Id: Ibba1a9486b8eaee4bf3c0cf673dd4cc112d084e0

diff --git a/external/librevenge/UnpackedTarball_librevenge.mk b/external/librevenge/UnpackedTarball_librevenge.mk
index d44678469389..84a5a9a1eaf7 100644
--- a/external/librevenge/UnpackedTarball_librevenge.mk
+++ b/external/librevenge/UnpackedTarball_librevenge.mk
@@ -25,6 +25,7 @@ ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \
     external/librevenge/librevenge-bundled-soname.patch.0 \
+    external/librevenge/librevenge-iOS.patch.0 \
 ))
 endif
 endif
diff --git a/external/librevenge/librevenge-iOS.patch.0 b/external/librevenge/librevenge-iOS.patch.0
new file mode 100644
index 000000000000..78ee4d737def
--- /dev/null
+++ b/external/librevenge/librevenge-iOS.patch.0
@@ -0,0 +1,20 @@
+--- config.sub	2014-05-08 14:03:43.000000000 +0200
++++ config.sub	2017-06-12 17:33:01.000000000 +0200
+@@ -257,7 +257,7 @@
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+ 	| arc \
+-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
+ 	| avr | avr32 \
+ 	| be32 | be64 \
+ 	| bfin \
+@@ -370,7 +370,7 @@
+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+ 	| avr-* | avr32-* \
+ 	| be32-* | be64-* \
+ 	| bfin-* | bs2000-* \