bridges/source/cpp_uno/gcc3_ios_arm/helper.s | 99 +++++++++++++++- external/libfreehand/UnpackedTarball_libfreehand.mk | 4 external/libfreehand/iOS.patch.0 | 20 +++ external/libmspub/UnpackedTarball_libmspub.mk | 3 external/libmspub/iOS.patch.0 | 21 +++ external/libmwaw/UnpackedTarball_libmwaw.mk | 4 external/libmwaw/iOS.patch.0 | 20 +++ external/libodfgen/UnpackedTarball_libodfgen.mk | 1 external/libodfgen/iOS.patch.0 | 21 +++ external/libpagemaker/UnpackedTarball_libpagemaker.mk | 4 external/libpagemaker/iOS.patch.0 | 20 +++ external/libstaroffice/UnpackedTarball_libstaroffice.mk | 1 external/libstaroffice/iOS.patch.0 | 20 +++ external/libvisio/UnpackedTarball_libvisio.mk | 4 external/libvisio/iOS.patch.0 | 20 +++ external/libwpd/UnpackedTarball_libwpd.mk | 4 external/libwpd/iOS.patch.0 | 21 +++ external/libwpg/UnpackedTarball_libwpg.mk | 4 external/libwpg/iOS.patch.0 | 21 +++ external/libwps/UnpackedTarball_libwps.mk | 4 external/libwps/iOS.patch.0 | 20 +++ external/libxslt/UnpackedTarball_xslt.mk | 1 external/libxslt/iOS.patch.0 | 20 +++ external/libzmf/libzmf-config-guess.patch.1 | 6 external/mythes/UnpackedTarball_mythes.mk | 1 external/mythes/iOS.patch.0 | 20 +++ external/redland/UnpackedTarball_raptor.mk | 1 external/redland/UnpackedTarball_rasqal.mk | 1 external/redland/UnpackedTarball_redland.mk | 2 external/redland/raptor/iOS.patch.0 | 21 +++ external/redland/rasqal/iOS.patch.0 | 21 +++ external/redland/redland/iOS-libltdl.patch.0 | 21 +++ external/redland/redland/iOS.patch.0 | 21 +++ 33 files changed, 469 insertions(+), 3 deletions(-)
New commits: commit 4f3602f92d9daed32d7641bc468eb1b470508538 Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 14:03:12 2017 +0200 iOS, adding x86_64 to gcc_ios Adding support for x86_64 code from Linux Change-Id: Ia75109f0457177a8a5d5022d2de38aaab620a85f diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/helper.s b/bridges/source/cpp_uno/gcc3_ios_arm/helper.s index 8f4c61b82b39..7461cbccc4e7 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/helper.s +++ b/bridges/source/cpp_uno/gcc3_ios_arm/helper.s @@ -79,7 +79,7 @@ _privateSnippetExecutor: ret lr .cfi_endproc -#else +#elif defined(__i386) // i386 code, for the simulator .text @@ -369,6 +369,103 @@ L___gxx_personality_v0$non_lazy_ptr: .constructor .destructor .align 1 +#else + + .text + .align 2 +.globl privateSnippetExecutor +_privateSnippetExecutor: +.LFB3: + pushq %rbp +.LCFI0: + movq %rsp, %rbp +.LCFI1: + subq $160, %rsp +.LCFI2: + movq %r10, -152(%rbp) # Save (nVtableOffset << 32) + nFunctionIndex + + movq %rdi, -112(%rbp) # Save GP registers + movq %rsi, -104(%rbp) + movq %rdx, -96(%rbp) + movq %rcx, -88(%rbp) + movq %r8 , -80(%rbp) + movq %r9 , -72(%rbp) + + movsd %xmm0, -64(%rbp) # Save FP registers + movsd %xmm1, -56(%rbp) + movsd %xmm2, -48(%rbp) + movsd %xmm3, -40(%rbp) + movsd %xmm4, -32(%rbp) + movsd %xmm5, -24(%rbp) + movsd %xmm6, -16(%rbp) + movsd %xmm7, -8(%rbp) + + leaq -144(%rbp), %r9 # 6th param: sal_uInt64 * pRegisterReturn + leaq 16(%rbp), %r8 # 5rd param: void ** ovrflw + leaq -64(%rbp), %rcx # 4th param: void ** fpreg + leaq -112(%rbp), %rdx # 3rd param: void ** gpreg + movl -148(%rbp), %esi # 2nd param: sal_int32 nVtableOffset + movl -152(%rbp), %edi # 1st param: sal_int32 nFunctionIndex + + call cpp_vtable_call + + cmp $10, %rax # typelib_TypeClass_FLOAT + je .Lfloat + cmp $11, %rax # typelib_TypeClass_DOUBLE + je .Lfloat + + movq -144(%rbp), %rax # Return value (int case) + movq -136(%rbp), %rdx # Return value (int case) + movq -144(%rbp), %xmm0 # Return value (int case) + movq -136(%rbp), %xmm1 # Return value (int case) + jmp .Lfinish +.Lfloat: + movlpd -144(%rbp), %xmm0 # Return value (float/double case) + +.Lfinish: + leave + ret +.LFE3: + # see http://refspecs.linuxfoundation.org/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html + # for details of the .eh_frame, the "Common Information Entry" and "Frame Description Entry" formats + # and http://mentorembedded.github.io/cxx-abi/exceptions.pdf for more info +.Lframe1: + .long .LECIE1-.LSCIE1 +.LSCIE1: + .long 0x0 + .byte 0x1 + .string "zR" + .uleb128 0x1 + .sleb128 -8 + .byte 0x10 + .uleb128 0x1 + .byte 0x1b + .byte 0xc + .uleb128 0x7 + .uleb128 0x8 + .byte 0x90 + .uleb128 0x1 + .align 8 +.LECIE1: +.LSFDE1: + .long .LEFDE1-.LASFDE1 +.LASFDE1: + .long .LASFDE1-.Lframe1 + .long .LFB3-. + .long .LFE3-.LFB3 + .uleb128 0x0 + .byte 0x4 + .long .LCFI0-.LFB3 + .byte 0xe + .uleb128 0x10 + .byte 0x86 + .uleb128 0x2 + .byte 0x4 + .long .LCFI1-.LCFI0 + .byte 0xd + .uleb128 0x6 + .align 8 +.LEFDE1: #endif // vim:set shiftwidth=4 softtabstop=4 expandtab: commit a1f2b3cc8eb2cb5c8a4bc899dcb3230f4ba4b57a Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 13:44:39 2017 +0200 iOS, patch libodfgen Support for arm64 Change-Id: I9f5f6220dd4f3e6e2c008f9f8beebbaeb75a1f6b diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index f6695d90fb03..a6a45deaa3cc 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -37,6 +37,7 @@ endif $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 \ + external/libodfgen/iOS.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/iOS.patch.0 b/external/libodfgen/iOS.patch.0 new file mode 100644 index 000000000000..39dd97dd419d --- /dev/null +++ b/external/libodfgen/iOS.patch.0 @@ -0,0 +1,21 @@ +--- config.sub 2013-05-16 09:13:10.000000000 +0200 ++++ config.sub 2017-06-13 13:42:55.000000000 +0200 +@@ -253,7 +253,8 @@ + | 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 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ +@@ -365,7 +366,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 84175d72f590e06162a8fd677efb99c4a5796bf6 Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 13:40:04 2017 +0200 iOS patch libstaroffice support for arm64 Change-Id: I12557dee63ec14c0562c6d17f3b29fb5995b949f diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk index 271e6ca120f7..92a78fe9e5a4 100644 --- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk +++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk @@ -37,6 +37,7 @@ endif $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1 \ + external/libstaroffice/iOS.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libstaroffice/iOS.patch.0 b/external/libstaroffice/iOS.patch.0 new file mode 100644 index 000000000000..378acfcf4e58 --- /dev/null +++ b/external/libstaroffice/iOS.patch.0 @@ -0,0 +1,20 @@ +--- config.sub 2015-07-20 13:14:51.000000000 +0200 ++++ config.sub 2017-06-13 13:38:11.000000000 +0200 +@@ -253,7 +253,7 @@ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ +- | 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 \ +@@ -368,7 +368,7 @@ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ commit 344897d9f032d859952778255c8f4e76a772a1bf Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 13:36:39 2017 +0200 iOS patch libwpg Support for arm64 Change-Id: I86d51ac4d98bafe90271e5d0c7190eb4d02eaccb diff --git a/external/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk index f470bdf45cc6..d05f79308911 100644 --- a/external/libwpg/UnpackedTarball_libwpg.mk +++ b/external/libwpg/UnpackedTarball_libwpg.mk @@ -25,4 +25,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ endif endif +$(eval $(call gb_UnpackedTarball_add_patches,libwpg, \ + external/libwpg/iOS.patch.0 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libwpg/iOS.patch.0 b/external/libwpg/iOS.patch.0 new file mode 100644 index 000000000000..1b0d1155a99f --- /dev/null +++ b/external/libwpg/iOS.patch.0 @@ -0,0 +1,21 @@ +--- config.sub 2013-05-16 08:38:47.000000000 +0200 ++++ config.sub 2017-06-13 13:34:55.000000000 +0200 +@@ -253,7 +253,8 @@ + | 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 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ +@@ -365,7 +366,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 8040871f4416bfc36760e757a5afbf7dcd9832a2 Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 13:30:38 2017 +0200 iOS, patch libwpd Support for arm64 Change-Id: I7aeaab4c73315e8f66a617c9b258cfb02a54175b diff --git a/external/libwpd/UnpackedTarball_libwpd.mk b/external/libwpd/UnpackedTarball_libwpd.mk index 7fb7c3b2181d..f8907bd20c7a 100644 --- a/external/libwpd/UnpackedTarball_libwpd.mk +++ b/external/libwpd/UnpackedTarball_libwpd.mk @@ -26,4 +26,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ endif endif +$(eval $(call gb_UnpackedTarball_add_patches,libwpd,\ + external/libwpd/iOS.patch.0 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libwpd/iOS.patch.0 b/external/libwpd/iOS.patch.0 new file mode 100644 index 000000000000..4e97091da883 --- /dev/null +++ b/external/libwpd/iOS.patch.0 @@ -0,0 +1,21 @@ +--- config.sub 2013-05-16 08:47:04.000000000 +0200 ++++ config.sub 2017-06-13 13:28:55.000000000 +0200 +@@ -253,7 +253,8 @@ + | 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 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ +@@ -365,7 +366,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 e9e06bfb22f311f0aa79f32eba149b43b11d4e1b Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 13:26:49 2017 +0200 iOS patch libvisio Support for arm64 Change-Id: Ife38b174377ad79fb2364f31033416145a19a9cd diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index aa8b48fb40b9..62f42ab17044 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -25,4 +25,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \ endif endif +$(eval $(call gb_UnpackedTarball_add_patches,libvisio, \ + external/libvisio/iOS.patch.0 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libvisio/iOS.patch.0 b/external/libvisio/iOS.patch.0 new file mode 100644 index 000000000000..dc8d8b48c81a --- /dev/null +++ b/external/libvisio/iOS.patch.0 @@ -0,0 +1,20 @@ +--- config.sub 2015-12-29 20:42:59.000000000 +0100 ++++ config.sub 2017-06-13 13:24:25.000000000 +0200 +@@ -253,7 +253,7 @@ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ +- | 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 \ +@@ -374,7 +374,7 @@ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ commit 953b16051e83d2e136e472d2c6eac952bd289a26 Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 13:22:48 2017 +0200 iOS, patch libfreehand Support for arm64 Change-Id: I29ab33b192262597bf6d870a1c731770f2f134bf diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk index 7394b98fe8ae..1775f08c6517 100644 --- a/external/libfreehand/UnpackedTarball_libfreehand.mk +++ b/external/libfreehand/UnpackedTarball_libfreehand.mk @@ -26,4 +26,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \ endif endif +$(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \ + external/libfreehand/iOS.patch.0 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libfreehand/iOS.patch.0 b/external/libfreehand/iOS.patch.0 new file mode 100644 index 000000000000..9b603f81bbca --- /dev/null +++ b/external/libfreehand/iOS.patch.0 @@ -0,0 +1,20 @@ +--- config.sub 2015-06-11 16:52:21.000000000 +0200 ++++ config.sub 2017-06-13 13:21:15.000000000 +0200 +@@ -253,7 +253,7 @@ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ +- | 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 \ +@@ -374,7 +374,7 @@ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ commit 04f8b8e121a607018d5541db5c74059b9ad47eac Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 13:18:30 2017 +0200 iOS patch libpagemaker Support for arm64 Change-Id: I25389ae56884e96c4446e3412b7ed2613a10acae diff --git a/external/libpagemaker/UnpackedTarball_libpagemaker.mk b/external/libpagemaker/UnpackedTarball_libpagemaker.mk index ad857107698e..fba5659b8cc9 100644 --- a/external/libpagemaker/UnpackedTarball_libpagemaker.mk +++ b/external/libpagemaker/UnpackedTarball_libpagemaker.mk @@ -21,4 +21,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \ endif endif +$(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \ + external/libpagemaker/iOS.patch.0 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libpagemaker/iOS.patch.0 b/external/libpagemaker/iOS.patch.0 new file mode 100644 index 000000000000..5d8a06d86000 --- /dev/null +++ b/external/libpagemaker/iOS.patch.0 @@ -0,0 +1,20 @@ +--- config.sub 2016-02-18 09:18:26.000000000 +0100 ++++ config.sub 2017-06-13 13:16:43.000000000 +0200 +@@ -253,7 +253,7 @@ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ +- | 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 \ +@@ -374,7 +374,7 @@ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ commit ab829e23a0c382e1bd53a95caac3bd9ad00c7f9f Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 13:13:20 2017 +0200 iOS patch libzmf added support for arm64 Change-Id: I3f669b6256db69e0121e25bf586f2e9b842681b2 diff --git a/external/libzmf/libzmf-config-guess.patch.1 b/external/libzmf/libzmf-config-guess.patch.1 index bf9fffbdf88b..1ddd2cbb96eb 100644 --- a/external/libzmf/libzmf-config-guess.patch.1 +++ b/external/libzmf/libzmf-config-guess.patch.1 @@ -515,8 +515,9 @@ diff -up ./config.sub.dt ./config.sub | 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] \ + | arc | arceb \ - | 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 \ @@ -589,8 +590,9 @@ diff -up ./config.sub.dt ./config.sub | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ commit bd5fcc8bfd2542e052859091ff74e117dff26622 Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 12:42:05 2017 +0200 iOS patch libwps Support for arm64 Change-Id: I99dc397fe2b97f68723e2eccccf9940c2c311495 diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index 8551ef9bea18..fb88c2948453 100644 --- a/external/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -33,4 +33,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \ endif endif +$(eval $(call gb_UnpackedTarball_add_patches,libwps, \ + external/libwps/iOS.patch.0 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libwps/iOS.patch.0 b/external/libwps/iOS.patch.0 new file mode 100644 index 000000000000..85400b219006 --- /dev/null +++ b/external/libwps/iOS.patch.0 @@ -0,0 +1,20 @@ +--- config.sub 2014-02-04 09:33:52.000000000 +0100 ++++ config.sub 2017-06-13 12:39:43.000000000 +0200 +@@ -253,7 +253,7 @@ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ +- | 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 \ +@@ -368,7 +368,7 @@ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ commit 98abf61a8204992b64d0b22eeb9355bd035da411 Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 12:29:10 2017 +0200 iOS patch libmwaw support for arm64 Change-Id: I2a1c4201606b1d6bfbc4bfeeb0e40099e8860b31 diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index de99d5685378..d26751708956 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -40,4 +40,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\ external/libmwaw/libmwaw-fix-compare-assert.patch.1 \ )) +$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ + external/libmwaw/iOS.patch.0 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/iOS.patch.0 b/external/libmwaw/iOS.patch.0 new file mode 100644 index 000000000000..1147e98e68fc --- /dev/null +++ b/external/libmwaw/iOS.patch.0 @@ -0,0 +1,20 @@ +--- config.sub 2013-08-14 11:17:40.000000000 +0200 ++++ config.sub 2017-06-13 12:26:55.000000000 +0200 +@@ -253,7 +253,7 @@ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ +- | 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 \ +@@ -367,7 +367,7 @@ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ commit 3d926f17f20b76aca863af7b5655fed8b834780c Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 12:20:58 2017 +0200 iOS, patch libmspub support for arm64 Change-Id: Ife7a806bf8fff02c98f7c36bf831c1a9f52cd98d diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk index 57845333cb4e..d39d1d4aad36 100644 --- a/external/libmspub/UnpackedTarball_libmspub.mk +++ b/external/libmspub/UnpackedTarball_libmspub.mk @@ -25,4 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmspub, \ endif endif +$(eval $(call gb_UnpackedTarball_add_patches,libmspub, \ + external/libmspub/iOS.patch.0 \ +)) # vim: set noet sw=4 ts=4: diff --git a/external/libmspub/iOS.patch.0 b/external/libmspub/iOS.patch.0 new file mode 100644 index 000000000000..d8be1daec3d8 --- /dev/null +++ b/external/libmspub/iOS.patch.0 @@ -0,0 +1,21 @@ +--- config.sub 2012-06-30 14:54:32.000000000 +0200 ++++ config.sub 2017-06-13 12:15:26.000000000 +0200 +@@ -250,7 +250,8 @@ + | 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 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ +@@ -358,7 +359,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 f46e86e42f22341cd296ac85c9ea73ec49301cda Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 10:30:38 2017 +0200 iOS patch mythes Support for arm64 Change-Id: Icdd07d04f82696232e66dc0f3a159e571c61dac8 diff --git a/external/mythes/UnpackedTarball_mythes.mk b/external/mythes/UnpackedTarball_mythes.mk index 42e6524b8323..ddbb8f4827b0 100644 --- a/external/mythes/UnpackedTarball_mythes.mk +++ b/external/mythes/UnpackedTarball_mythes.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mythes,$(MYTHES_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,mythes,\ external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \ external/mythes/mythes-fdo48017-wfopen.patch \ + external/mythes/iOS.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/mythes/iOS.patch.0 b/external/mythes/iOS.patch.0 new file mode 100644 index 000000000000..45d399177a56 --- /dev/null +++ b/external/mythes/iOS.patch.0 @@ -0,0 +1,20 @@ +--- config.sub 2014-06-27 10:20:11.000000000 +0200 ++++ config.sub 2017-06-13 10:28:35.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 2a365cd2739285db8a2178531c289438f51270a7 Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 10:10:07 2017 +0200 iOS, patch redland Support for arm64 Change-Id: Id9f89452174bac4acb8d5b7dd3e23d91c2b2acf1 diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk index 6c4a0bc41780..daf4e0c64bca 100644 --- a/external/redland/UnpackedTarball_raptor.mk +++ b/external/redland/UnpackedTarball_raptor.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,raptor,\ external/redland/raptor/xml2-config.patch \ external/redland/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 \ external/redland/raptor/libtool.patch \ + external/redland/raptor/iOS.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk index 7ec66128733f..5bd7fb803dc7 100644 --- a/external/redland/UnpackedTarball_rasqal.mk +++ b/external/redland/UnpackedTarball_rasqal.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\ external/redland/rasqal/rpath.patch \ external/redland/rasqal/clang-cl.patch \ external/redland/rasqal/libtool.patch \ + external/redland/rasqal/iOS.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk index 657bf484153d..8a4e8f4617dc 100644 --- a/external/redland/UnpackedTarball_redland.mk +++ b/external/redland/UnpackedTarball_redland.mk @@ -28,6 +28,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\ external/redland/redland/rpath.patch \ external/redland/redland/clang-cl.patch \ external/redland/redland/libtool.patch \ + external/redland/redland/iOS.patch.0 \ + external/redland/redland/iOS-libltdl.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/redland/raptor/iOS.patch.0 b/external/redland/raptor/iOS.patch.0 new file mode 100644 index 000000000000..ecd51db1b720 --- /dev/null +++ b/external/redland/raptor/iOS.patch.0 @@ -0,0 +1,21 @@ +--- build/config.sub 2014-11-02 07:04:37.000000000 +0100 ++++ build/config.sub 2017-06-13 09:17:33.000000000 +0200 +@@ -259,7 +259,8 @@ + | 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 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ +@@ -371,7 +372,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-* \ diff --git a/external/redland/rasqal/iOS.patch.0 b/external/redland/rasqal/iOS.patch.0 new file mode 100644 index 000000000000..5d34175ef9cf --- /dev/null +++ b/external/redland/rasqal/iOS.patch.0 @@ -0,0 +1,21 @@ +--- build/config.sub 2014-03-17 03:39:35.000000000 +0100 ++++ build/config.sub 2017-06-13 09:44:04.000000000 +0200 +@@ -259,7 +259,8 @@ + | 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 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ +@@ -371,7 +372,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-* \ diff --git a/external/redland/redland/iOS-libltdl.patch.0 b/external/redland/redland/iOS-libltdl.patch.0 new file mode 100644 index 000000000000..6f26d591ace0 --- /dev/null +++ b/external/redland/redland/iOS-libltdl.patch.0 @@ -0,0 +1,21 @@ +--- libltdl/config/config.sub 2013-06-09 22:45:46.000000000 +0200 ++++ libltdl/config/config.sub 2017-06-13 10:05:41.000000000 +0200 +@@ -259,7 +259,8 @@ + | 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 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ +@@ -371,7 +372,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-* \ diff --git a/external/redland/redland/iOS.patch.0 b/external/redland/redland/iOS.patch.0 new file mode 100644 index 000000000000..facaa0c0ee77 --- /dev/null +++ b/external/redland/redland/iOS.patch.0 @@ -0,0 +1,21 @@ +--- build/config.sub 2013-06-09 22:45:51.000000000 +0200 ++++ build/config.sub 2017-06-13 09:48:08.000000000 +0200 +@@ -259,7 +259,8 @@ + | 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 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ +@@ -371,7 +372,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 db271bc960e4194c4ed8b342fa3f6996f3507f57 Author: jan Iversen <j...@libreoffice.org> Date: Tue Jun 13 09:13:25 2017 +0200 iOS, patch xslt Support for arm64 Change-Id: I18a36ab891f6d4fd72fb34292fd2f85d0d891727 diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk index f17a42aba179..2cf58d648f8a 100644 --- a/external/libxslt/UnpackedTarball_xslt.mk +++ b/external/libxslt/UnpackedTarball_xslt.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,xslt,\ external/libxslt/libxslt-msvc.patch.2 \ external/libxslt/libxslt-1.1.26-memdump.patch \ external/libxslt/rpath.patch.0 \ + external/libxslt/iOS.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libxslt/iOS.patch.0 b/external/libxslt/iOS.patch.0 new file mode 100644 index 000000000000..615726ee25eb --- /dev/null +++ b/external/libxslt/iOS.patch.0 @@ -0,0 +1,20 @@ +--- config.sub 2015-07-07 12:55:08.000000000 +0200 ++++ config.sub 2017-06-13 09:07:36.000000000 +0200 +@@ -253,7 +253,7 @@ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ +- | 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 \ +@@ -374,7 +374,7 @@ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ +- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits