[Libreoffice-commits] core.git: 3 commits - external/coinmp external/libexttextcat
jan Iversen
jani at libreoffice.org
Sun Jun 11 10:43:55 UTC 2017
external/coinmp/UnpackedTarball_coinmp.mk | 1
external/coinmp/iOS.patch.1 | 207 +++++++++++++++++++
external/libexttextcat/UnpackedTarball_exttextcat.mk | 4
external/libexttextcat/exttextcat-iOS.patch.1 | 20 +
4 files changed, 232 insertions(+)
New commits:
commit a18351ae2c90ff88cc9134ef3308fc2315ebcc09
Author: jan Iversen <jani at libreoffice.org>
Date: Sun Jun 11 12:35:55 2017 +0200
iOS, coinmp patch (addon)
support for arm64, in submodules as well
Change-Id: Idc13b03d2fcc9bcf11fe4dadc0fc298a9871848f
diff --git a/external/coinmp/iOS.patch.1 b/external/coinmp/iOS.patch.1
index dcb16d691603..740156a11ec8 100644
--- a/external/coinmp/iOS.patch.1
+++ b/external/coinmp/iOS.patch.1
@@ -1,6 +1,183 @@
+diff -ur CoinMP.org/BuildTools/config.sub CoinMP/BuildTools/config.sub
+--- CoinMP.org/BuildTools/config.sub 2007-06-24 05:08:32.000000000 +0200
++++ CoinMP/BuildTools/config.sub 2017-06-11 12:10:51.000000000 +0200
+@@ -241,7 +241,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+@@ -317,7 +317,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-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+diff -ur CoinMP.org/Cbc/config.sub CoinMP/Cbc/config.sub
+--- CoinMP.org/Cbc/config.sub 2010-06-13 19:52:10.000000000 +0200
++++ CoinMP/Cbc/config.sub 2017-06-11 12:11:42.000000000 +0200
+@@ -241,7 +241,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+@@ -317,7 +317,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-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+diff -ur CoinMP.org/Cgl/config.sub CoinMP/Cgl/config.sub
+--- CoinMP.org/Cgl/config.sub 2010-06-13 19:52:57.000000000 +0200
++++ CoinMP/Cgl/config.sub 2017-06-11 12:12:15.000000000 +0200
+@@ -241,7 +241,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+@@ -317,7 +317,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-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+diff -ur CoinMP.org/Clp/config.sub CoinMP/Clp/config.sub
+--- CoinMP.org/Clp/config.sub 2010-06-13 19:53:25.000000000 +0200
++++ CoinMP/Clp/config.sub 2017-06-11 12:12:34.000000000 +0200
+@@ -241,7 +241,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+@@ -317,7 +317,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-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+diff -ur CoinMP.org/CoinMP/config.sub CoinMP/CoinMP/config.sub
+--- CoinMP.org/CoinMP/config.sub 2011-08-07 17:09:46.000000000 +0200
++++ CoinMP/CoinMP/config.sub 2017-06-11 12:12:59.000000000 +0200
+@@ -241,7 +241,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+@@ -317,7 +317,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-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+diff -ur CoinMP.org/CoinUtils/config.sub CoinMP/CoinUtils/config.sub
+--- CoinMP.org/CoinUtils/config.sub 2010-06-13 19:53:51.000000000 +0200
++++ CoinMP/CoinUtils/config.sub 2017-06-11 12:13:20.000000000 +0200
+@@ -241,7 +241,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+@@ -317,7 +317,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-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+diff -ur CoinMP.org/Data/Sample/config.sub CoinMP/Data/Sample/config.sub
+--- CoinMP.org/Data/Sample/config.sub 2010-06-13 19:59:52.000000000 +0200
++++ CoinMP/Data/Sample/config.sub 2017-06-11 12:13:45.000000000 +0200
+@@ -241,7 +241,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+@@ -317,7 +317,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-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+diff -ur CoinMP.org/Osi/config.sub CoinMP/Osi/config.sub
+--- CoinMP.org/Osi/config.sub 2010-06-13 19:59:18.000000000 +0200
++++ CoinMP/Osi/config.sub 2017-06-11 12:14:05.000000000 +0200
+@@ -241,7 +241,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64 | avr | avr32 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+@@ -317,7 +317,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-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
diff -ur CoinMP.org/config.sub CoinMP/config.sub
--- CoinMP.org/config.sub 2013-11-21 05:36:29.000000000 +0100
-+++ CoinMP/config.sub 2017-06-11 11:32:20.000000000 +0200
++++ CoinMP/config.sub 2017-06-11 12:07:15.000000000 +0200
+@@ -120,7 +120,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
@@ -241,7 +241,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
@@ -19,3 +196,12 @@ diff -ur CoinMP.org/config.sub CoinMP/config.sub
| avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+@@ -1218,7 +1218,7 @@
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
commit ef8ed59a5c20206b8d9b9d92434614b381639bf5
Author: jan Iversen <jani at libreoffice.org>
Date: Sun Jun 11 11:46:40 2017 +0200
iOS, exttextcat patch
support for arm64
Change-Id: I4e92c55253fba95944972401bbb948caf1ea903e
diff --git a/external/libexttextcat/UnpackedTarball_exttextcat.mk b/external/libexttextcat/UnpackedTarball_exttextcat.mk
index 9a272b5720e3..cdd2d5e32374 100644
--- a/external/libexttextcat/UnpackedTarball_exttextcat.mk
+++ b/external/libexttextcat/UnpackedTarball_exttextcat.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_UnpackedTarball_UnpackedTarball,exttextcat))
+$(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\
+ external/libexttextcat/exttextcat-iOS.patch.1 \
+))
+
$(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL)))
# vim: set noet sw=4 ts=4:
diff --git a/external/libexttextcat/exttextcat-iOS.patch.1 b/external/libexttextcat/exttextcat-iOS.patch.1
new file mode 100644
index 000000000000..39e31e21c68b
--- /dev/null
+++ b/external/libexttextcat/exttextcat-iOS.patch.1
@@ -0,0 +1,20 @@
+--- libexttextcat.org/config.sub 2014-06-27 12:16:52.000000000 +0200
++++ libexttextcat/config.sub 2017-06-11 11:39:17.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 3e2d4224c64fffac63b2e89a340a31118113d44b
Author: jan Iversen <jani at libreoffice.org>
Date: Sun Jun 11 11:36:07 2017 +0200
iOS coinmp patch
add support for arm64
Change-Id: I76dc00058abd27b8e022ffcd0d68ff00446ebeb6
diff --git a/external/coinmp/UnpackedTarball_coinmp.mk b/external/coinmp/UnpackedTarball_coinmp.mk
index b643b8e5d7d4..c6836e20748d 100644
--- a/external/coinmp/UnpackedTarball_coinmp.mk
+++ b/external/coinmp/UnpackedTarball_coinmp.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,coinmp,\
external/coinmp/ubsan.patch.0 \
external/coinmp/rpath.patch \
external/coinmp/libtool.patch \
+ external/coinmp/iOS.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/coinmp/iOS.patch.1 b/external/coinmp/iOS.patch.1
new file mode 100644
index 000000000000..dcb16d691603
--- /dev/null
+++ b/external/coinmp/iOS.patch.1
@@ -0,0 +1,21 @@
+diff -ur CoinMP.org/config.sub CoinMP/config.sub
+--- CoinMP.org/config.sub 2013-11-21 05:36:29.000000000 +0100
++++ CoinMP/config.sub 2017-06-11 11:32:20.000000000 +0200
+@@ -241,7 +241,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 | arm64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+@@ -317,7 +317,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-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
More information about the Libreoffice-commits
mailing list