diff --git a/patches/boost_macosx_older_openssl.patch b/patches/boost_macosx_older_openssl.patch deleted file mode 100644 index 29f2ca80d0..0000000000 --- a/patches/boost_macosx_older_openssl.patch +++ /dev/null @@ -1,55 +0,0 @@ -=== modified file 'boost/asio/ssl/impl/context.ipp' ---- boost/asio/ssl/impl/context.ipp 2013-12-30 14:53:15 +0000 -+++ boost/asio/ssl/impl/context.ipp 2013-12-30 19:08:01 +0000 -@@ -236,19 +236,27 @@ - boost::system::error_code context::clear_options( - context::options o, boost::system::error_code& ec) - { --#if !defined(SSL_OP_NO_COMPRESSION) -+#if (OPENSSL_VERSION_NUMBER >= 0x009080DFL) \ -+ && (OPENSSL_VERSION_NUMBER != 0x00909000L) -+# if !defined(SSL_OP_NO_COMPRESSION) - if ((o & context::no_compression) != 0) - { --#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) -+# if (OPENSSL_VERSION_NUMBER >= 0x00908000L) - handle_->comp_methods = SSL_COMP_get_compression_methods(); --#endif // (OPENSSL_VERSION_NUMBER >= 0x00908000L) -+# endif // (OPENSSL_VERSION_NUMBER >= 0x00908000L) - o ^= context::no_compression; - } --#endif // !defined(SSL_OP_NO_COMPRESSION) -+# endif // !defined(SSL_OP_NO_COMPRESSION) - - ::SSL_CTX_clear_options(handle_, o); - - ec = boost::system::error_code(); -+#else // (OPENSSL_VERSION_NUMBER >= 0x009080DFL) -+ // && (OPENSSL_VERSION_NUMBER != 0x00909000L) -+ (void)o; -+ ec = boost::asio::error::operation_not_supported; -+#endif // (OPENSSL_VERSION_NUMBER >= 0x009080DFL) -+ // && (OPENSSL_VERSION_NUMBER != 0x00909000L) - return ec; - } - -@@ -428,7 +436,8 @@ - - if (format == context_base::asn1) - { -- if (::SSL_CTX_use_certificate_ASN1(handle_, buffer_size(certificate), -+ if (::SSL_CTX_use_certificate_ASN1(handle_, -+ static_cast(buffer_size(certificate)), - buffer_cast(certificate)) == 1) - { - ec = boost::system::error_code(); -@@ -929,7 +938,7 @@ - { - return ::BIO_new_mem_buf( - const_cast(buffer_cast(b)), -- buffer_size(b)); -+ static_cast(buffer_size(b))); - } - - #endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL) - diff --git a/patches/boost_macosx_x86.patch b/patches/boost_macosx_x86.patch deleted file mode 100644 index 9f8f1f898f..0000000000 --- a/patches/boost_macosx_x86.patch +++ /dev/null @@ -1,72 +0,0 @@ -=== modified file 'libs/context/build/Jamfile.v2' ---- libs/context/build/Jamfile.v2 2013-12-29 11:28:14 +0000 -+++ libs/context/build/Jamfile.v2 2013-12-29 11:31:05 +0000 -@@ -414,6 +414,25 @@ - ; - - alias asm_context_sources -+# : asm/make_i386_x86_64_sysv_macho_gas.S -+# asm/jump_i386_x86_64_sysv_macho_gas.S -+# : 32_64 -+# x86 -+# mach-o -+# darwin -+# darwin -+# ; -+# -+#alias asm_context_sources -+ : [ make asm/make_i386_x86_64_sysv_macho_gas.o : asm/make_i386_x86_64_sysv_macho_gas.S : @gas ] -+ [ make asm/jump_i386_x86_64_sysv_macho_gas.o : asm/jump_i386_x86_64_sysv_macho_gas.S : @gas ] -+ : 32_64 -+ x86 -+ mach-o -+ darwin -+ ; -+ -+alias asm_context_sources - : asm/make_x86_64_ms_pe_masm.asm - asm/jump_x86_64_ms_pe_masm.asm - dummy.cpp - -=== added file 'libs/context/src/asm/jump_i386_x86_64_sysv_macho_gas.S' ---- libs/context/src/asm/jump_i386_x86_64_sysv_macho_gas.S 1970-01-01 00:00:00 +0000 -+++ libs/context/src/asm/jump_i386_x86_64_sysv_macho_gas.S 2013-12-29 11:33:46 +0000 -@@ -0,0 +1,16 @@ -+/* -+ Copyright Sergue E. Leontiev 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Stub file for universal binary -+ -+#if defined(__i386__) -+ #include "jump_i386_sysv_macho_gas.S" -+#elif defined(__x86_64__) -+ #include "jump_x86_64_sysv_macho_gas.S" -+#else -+ #error "No arch's" -+#endif - -=== added file 'libs/context/src/asm/make_i386_x86_64_sysv_macho_gas.S' ---- libs/context/src/asm/make_i386_x86_64_sysv_macho_gas.S 1970-01-01 00:00:00 +0000 -+++ libs/context/src/asm/make_i386_x86_64_sysv_macho_gas.S 2013-12-29 11:32:49 +0000 -@@ -0,0 +1,16 @@ -+/* -+ Copyright Sergue E. Leontiev 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Stub file for universal binary -+ -+#if defined(__i386__) -+ #include "make_i386_sysv_macho_gas.S" -+#elif defined(__x86_64__) -+ #include "make_x86_64_sysv_macho_gas.S" -+#else -+ #error "No arch's" -+#endif - diff --git a/patches/boost_macosx_x86_build.patch b/patches/boost_macosx_x86_build.patch deleted file mode 100644 index 4beb68444b..0000000000 --- a/patches/boost_macosx_x86_build.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'tools/build/v2/tools/gcc.jam' ---- tools/build/v2/tools/gcc.jam 2013-12-29 13:13:00 +0000 -+++ tools/build/v2/tools/gcc.jam 2013-12-29 14:36:31 +0000 -@@ -635,7 +635,7 @@ - - actions compile.asm - { -- "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" -+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) -D$(DEFINES) $(USER_OPTIONS) -I"$(INCLUDES)" -c -o "$(<)" "$(>)" - } - - # Class checking that we do not try to use the static property - diff --git a/patches/patch_macosx_context_ppc_v2.patch b/patches/patch_macosx_context_ppc_v2.patch deleted file mode 100644 index e4e795608a..0000000000 --- a/patches/patch_macosx_context_ppc_v2.patch +++ /dev/null @@ -1,782 +0,0 @@ -=== modified file 'libs/context/build/Jamfile.v2' ---- libs/context/build/Jamfile.v2 2013-12-30 19:16:18 +0000 -+++ libs/context/build/Jamfile.v2 2014-01-03 18:10:41 +0000 -@@ -188,6 +188,15 @@ - elf - ; - -+alias asm_context_sources -+ : [ make asm/make_ppc32_sysv_macho_gas.o : asm/make_ppc32_sysv_macho_gas.S : @gas ] -+ [ make asm/jump_ppc32_sysv_macho_gas.o : asm/jump_ppc32_sysv_macho_gas.S : @gas ] -+ : 32 -+ power -+ mach-o -+ darwin -+ ; -+ - # POWERPC_64 - alias asm_context_sources - : asm/make_ppc64_sysv_elf_gas.S -@@ -215,6 +224,15 @@ - elf - ; - -+alias asm_context_sources -+ : [ make asm/make_ppc64_sysv_macho_gas.o : asm/make_ppc64_sysv_macho_gas.S : @gas ] -+ [ make asm/jump_ppc64_sysv_macho_gas.o : asm/jump_ppc64_sysv_macho_gas.S : @gas ] -+ : 64 -+ power -+ mach-o -+ darwin -+ ; -+ - # SPARC - alias asm_context_sources - : asm/make_sparc_sysv_elf_gas.S -@@ -414,6 +432,25 @@ - ; - - alias asm_context_sources -+ : asm/make_i386_x86_64_sysv_macho_gas.S -+ asm/jump_i386_x86_64_sysv_macho_gas.S -+ : 32_64 -+ x86 -+ mach-o -+ darwin -+ darwin -+ ; -+ -+alias asm_context_sources -+ : [ make asm/make_i386_x86_64_sysv_macho_gas.o : asm/make_i386_x86_64_sysv_macho_gas.S : @gas ] -+ [ make asm/jump_i386_x86_64_sysv_macho_gas.o : asm/jump_i386_x86_64_sysv_macho_gas.S : @gas ] -+ : 32_64 -+ x86 -+ mach-o -+ darwin -+ ; -+ -+alias asm_context_sources - : asm/make_x86_64_ms_pe_masm.asm - asm/jump_x86_64_ms_pe_masm.asm - dummy.cpp -@@ -424,6 +461,25 @@ - intel - ; - -+#COMBINED -+ -+alias asm_context_sources -+ : asm/make_combined_sysv_macho_gas.S -+ asm/jump_combined_sysv_macho_gas.S -+ : combined -+ mach-o -+ darwin -+ darwin -+ ; -+ -+alias asm_context_sources -+ : [ make asm/make_combined_sysv_macho_gas.o : asm/make_combined_sysv_macho_gas.S : @gas ] -+ [ make asm/jump_combined_sysv_macho_gas.o : asm/jump_combined_sysv_macho_gas.S : @gas ] -+ : combined -+ mach-o -+ darwin -+ ; -+ - alias asm_context_sources - : asm/make_x86_64_ms_pe_masm.asm - asm/jump_x86_64_ms_pe_masm.asm - -=== modified file 'libs/context/build/architecture.jam' ---- libs/context/build/architecture.jam 2013-12-30 19:16:18 +0000 -+++ libs/context/build/architecture.jam 2014-01-02 10:47:09 +0000 -@@ -71,6 +71,14 @@ - { - return x86 ; - } -+ else if [ configure.builds /boost/architecture//ppc : $(properties) : ppc ] -+ { -+ return ppc ; -+ } -+ else if [ configure.builds /boost/architecture//combined : $(properties) : combined ] -+ { -+ return combined ; -+ } - } - } - - -=== added file 'libs/context/src/asm/jump_combined_sysv_macho_gas.S' ---- libs/context/src/asm/jump_combined_sysv_macho_gas.S 1970-01-01 00:00:00 +0000 -+++ libs/context/src/asm/jump_combined_sysv_macho_gas.S 2014-01-03 17:46:02 +0000 -@@ -0,0 +1,20 @@ -+/* -+ Copyright Sergue E. Leontiev 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Stub file for universal binary -+ -+#if defined(__i386__) -+ #include "jump_i386_sysv_macho_gas.S" -+#elif defined(__x86_64__) -+ #include "jump_x86_64_sysv_macho_gas.S" -+#elif defined(__ppc__) -+ #include "jump_ppc32_sysv_macho_gas.S" -+#elif defined(__ppc64__) -+ #include "jump_ppc64_sysv_macho_gas.S" -+#else -+ #error "No arch's" -+#endif - -=== added file 'libs/context/src/asm/jump_ppc32_sysv_macho_gas.S' ---- libs/context/src/asm/jump_ppc32_sysv_macho_gas.S 1970-01-01 00:00:00 +0000 -+++ libs/context/src/asm/jump_ppc32_sysv_macho_gas.S 2014-01-03 15:18:19 +0000 -@@ -0,0 +1,180 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************* -+ * * -+ * ------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | * -+ * ------------------------------------------------------------- * -+ * | 0 | 4 | 8 | 12 | 16 | 20 | 24 | 28 | 32 | 36 | * -+ * ------------------------------------------------------------- * -+ * | R13 | R14 | R15 | R16 | R17 | R18 | R19 | R20 | R21 | R22 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | * -+ * ------------------------------------------------------------- * -+ * | 40 | 44 | 48 | 52 | 56 | 60 | 64 | 68 | 72 | 76 | * -+ * ------------------------------------------------------------- * -+ * | R23 | R24 | R25 | R26 | R27 | R28 | R29 | R30 | R31 | SP | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 20 | 21 | 22 | | * -+ * ------------------------------------------------------------- * -+ * | 80 | 84 | 88 | | * -+ * ------------------------------------------------------------- * -+ * | CR | LR | PC | | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 23 | 24 | 25 | | * -+ * ------------------------------------------------------------- * -+ * | 92 | 96 | 100 | | * -+ * ------------------------------------------------------------- * -+ * | sp | size|| | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ------------------------------------------------------------- * -+ * | 104 | 108 | 112 | 116 | 120 | 124 | 128 | 132 | 136 | 140 | * -+ * ------------------------------------------------------------- * -+ * | F14 | F15 | F16 | F17 | F18 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | * -+ * ------------------------------------------------------------- * -+ * | 144 | 148 | 152 | 156 | 160 | 164 | 168 | 172 | 176 | 180 | * -+ * ------------------------------------------------------------- * -+ * | F19 | F20 | F21 | F22 | F23 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | * -+ * ------------------------------------------------------------- * -+ * | 184 | 188 | 192 | 196 | 200 | 204 | 208 | 212 | 216 | 220 | * -+ * ------------------------------------------------------------- * -+ * | F24 | F25 | F26 | F27 | F28 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | | * -+ * ------------------------------------------------------------- * -+ * | 224 | 228 | 232 | 236 | 240 | 244 | 248 | 252 | | * -+ * ------------------------------------------------------------- * -+ * | F29 | F30 | F31 | fpscr | | * -+ * ------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.machine ppc -+ -+.text -+.globl _jump_fcontext -+.align 2 -+_jump_fcontext: -+ stw r13, 0(r3) ; save R13 -+ stw r14, 4(r3) ; save R14 -+ stw r15, 8(r3) ; save R15 -+ stw r16, 12(r3) ; save R16 -+ stw r17, 16(r3) ; save R17 -+ stw r18, 20(r3) ; save R18 -+ stw r19, 24(r3) ; save R19 -+ stw r20, 28(r3) ; save R20 -+ stw r21, 32(r3) ; save R21 -+ stw r22, 36(r3) ; save R22 -+ stw r23, 40(r3) ; save R23 -+ stw r24, 44(r3) ; save R24 -+ stw r25, 48(r3) ; save R25 -+ stw r26, 52(r3) ; save R26 -+ stw r27, 56(r3) ; save R27 -+ stw r28, 60(r3) ; save R28 -+ stw r29, 64(r3) ; save R29 -+ stw r30, 68(r3) ; save R30 -+ stw r31, 72(r3) ; save R31 -+ stw r1, 76(r3) ; save SP -+ -+ mfcr r0 ; load CR -+ stw r0, 80(r3) ; save CR -+ mflr r0 ; load LR -+ stw r0, 84(r3) ; save LR -+ stw r0, 88(r3) ; save LR as PC -+ -+ cmpwi cr7, r6, 0 ; test if fpu env should be preserved -+ beq cr7, l1 -+ -+ stfd f14, 104(r3) ; save F14 -+ stfd f15, 112(r3) ; save F15 -+ stfd f16, 120(r3) ; save F16 -+ stfd f17, 128(r3) ; save F17 -+ stfd f18, 136(r3) ; save F18 -+ stfd f19, 144(r3) ; save F19 -+ stfd f20, 152(r3) ; save F20 -+ stfd f21, 160(r3) ; save F21 -+ stfd f22, 168(r3) ; save F22 -+ stfd f23, 176(r3) ; save F23 -+ stfd f24, 184(r3) ; save F24 -+ stfd f25, 192(r3) ; save F25 -+ stfd f26, 200(r3) ; save F26 -+ stfd f27, 208(r3) ; save F27 -+ stfd f28, 216(r3) ; save F28 -+ stfd f29, 224(r3) ; save F29 -+ stfd f30, 232(r3) ; save F30 -+ stfd f31, 240(r3) ; save F31 -+ mffs f0 ; load FPSCR -+ stfd f0, 248(r3) ; save FPSCR -+ -+ lfd f14, 104(r4) ; restore F14 -+ lfd f15, 112(r4) ; restore F15 -+ lfd f16, 120(r4) ; restore F16 -+ lfd f17, 128(r4) ; restore F17 -+ lfd f18, 136(r4) ; restore F18 -+ lfd f19, 144(r4) ; restore F19 -+ lfd f20, 152(r4) ; restore F20 -+ lfd f21, 160(r4) ; restore F21 -+ lfd f22, 168(r4) ; restore F22 -+ lfd f23, 176(r4) ; restore F23 -+ lfd f24, 184(r4) ; restore F24 -+ lfd f25, 192(r4) ; restore F25 -+ lfd f26, 200(r4) ; restore F26 -+ lfd f27, 208(r4) ; restore F27 -+ lfd f28, 216(r4) ; restore F28 -+ lfd f29, 224(r4) ; restore F29 -+ lfd f30, 232(r4) ; restore F30 -+ lfd f31, 240(r4) ; restore F31 -+ lfd f0, 248(r4) ; load FPSCR -+ mtfsf 0xff, f0 ; restore FPSCR -+l1: -+ -+ lwz r13, 0(r4) ; restore R13 -+ lwz r14, 4(r4) ; restore R14 -+ lwz r15, 8(r4) ; restore R15 -+ lwz r16, 12(r4) ; restore R16 -+ lwz r17, 16(r4) ; restore R17 -+ lwz r18, 20(r4) ; restore R18 -+ lwz r19, 24(r4) ; restore R19 -+ lwz r20, 28(r4) ; restore R20 -+ lwz r21, 32(r4) ; restore R21 -+ lwz r22, 36(r4) ; restore R22 -+ lwz r23, 40(r4) ; restore R23 -+ lwz r24, 44(r4) ; restore R24 -+ lwz r25, 48(r4) ; restore R25 -+ lwz r26, 52(r4) ; restore R26 -+ lwz r27, 56(r4) ; restore R27 -+ lwz r28, 60(r4) ; restore R28 -+ lwz r29, 64(r4) ; restore R29 -+ lwz r30, 68(r4) ; restore R30 -+ lwz r31, 72(r4) ; restore R31 -+ lwz r1, 76(r4) ; restore SP -+ -+ lwz r0, 80(r4) ; load CR -+ mtcr r0 ; restore CR -+ lwz r0, 84(r4) ; load LR -+ mtlr r0 ; restore LR -+ -+ mr r3, r5 ; use third arg as return value after jump -+ ; and as first arg in context function -+ -+ lwz r0, 88(r4) ; load PC -+ mtctr r0 ; restore CTR -+ -+ bctr ; jump to context - -=== added file 'libs/context/src/asm/jump_ppc64_sysv_macho_gas.S' ---- libs/context/src/asm/jump_ppc64_sysv_macho_gas.S 1970-01-01 00:00:00 +0000 -+++ libs/context/src/asm/jump_ppc64_sysv_macho_gas.S 2014-01-03 17:54:53 +0000 -@@ -0,0 +1,193 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************* -+ * * -+ * ------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | * -+ * ------------------------------------------------------------- * -+ * | 0 | 4 | 8 | 12 | 16 | 20 | 24 | 28 | 32 | 36 | * -+ * ------------------------------------------------------------- * -+ * | R13 | R14 | R15 | R16 | R17 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | * -+ * ------------------------------------------------------------- * -+ * | 40 | 44 | 48 | 52 | 56 | 60 | 64 | 68 | 72 | 76 | * -+ * ------------------------------------------------------------- * -+ * | R18 | R19 | R20 | R21 | R22 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | * -+ * ------------------------------------------------------------- * -+ * | 80 | 84 | 88 | 92 | 96 | 100 | 104 | 108 | 112 | 116 | * -+ * ------------------------------------------------------------- * -+ * | R23 | R24 | R25 | R26 | R27 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | * -+ * ------------------------------------------------------------- * -+ * | 120 | 124 | 128 | 132 | 136 | 140 | 144 | 148 | 152 | 156 | * -+ * ------------------------------------------------------------- * -+ * | R28 | R29 | R30 | R31 | SP | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 40 | 41 | 42 | 43 | 44 | 45 | | * -+ * ------------------------------------------------------------- * -+ * | 160 | 164 | 168 | 172 | 176 | 180 | | * -+ * ------------------------------------------------------------- * -+ * | CR | LR | PC | | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 46 | 47 | 48 | 49 | | * -+ * ------------------------------------------------------------- * -+ * | 184 | 188 | 192 | 196 | | * -+ * ------------------------------------------------------------- * -+ * | sp | size | | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ------------------------------------------------------------- * -+ * | 200 | 204 | 208 | 212 | 216 | 220 | 224 | 228 | 232 | 236 | * -+ * ------------------------------------------------------------- * -+ * | F14 | F15 | F16 | F17 | F18 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | 68 | 69 | * -+ * ------------------------------------------------------------- * -+ * | 240 | 244 | 248 | 252 | 256 | 260 | 264 | 268 | 272 | 276 | * -+ * ------------------------------------------------------------- * -+ * | F19 | F20 | F21 | F22 | F23 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 70 | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | 79 | * -+ * ------------------------------------------------------------- * -+ * | 280 | 284 | 288 | 292 | 296 | 300 | 304 | 308 | 312 | 316 | * -+ * ------------------------------------------------------------- * -+ * | F24 | F25 | F26 | F27 | F28 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 80 | 81 | 82 | 83 | 84 | 85 | 86 | 87 | | * -+ * ------------------------------------------------------------- * -+ * | 320 | 324 | 328 | 332 | 336 | 340 | 344 | 348 | | * -+ * ------------------------------------------------------------- * -+ * | F29 | F30 | F31 | fpscr | | * -+ * ------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.text -+.align 2 -+.globl jump_fcontext -+ -+_jump_fcontext: -+ std r13, 0(r3) ; save R13 -+ std r14, 8(r3) ; save R14 -+ std r15, 16(r3) ; save R15 -+ std r16, 24(r3) ; save R16 -+ std r17, 32(r3) ; save R17 -+ std r18, 40(r3) ; save R18 -+ std r19, 48(r3) ; save R19 -+ std r20, 56(r3) ; save R20 -+ std r21, 64(r3) ; save R21 -+ std r22, 72(r3) ; save R22 -+ std r23, 80(r3) ; save R23 -+ std r24, 88(r3) ; save R24 -+ std r25, 96(r3) ; save R25 -+ std r26, 104(r3) ; save R26 -+ std r27, 112(r3) ; save R27 -+ std r28, 120(r3) ; save R28 -+ std r29, 128(r3) ; save R29 -+ std r30, 136(r3) ; save R30 -+ std r31, 144(r3) ; save R31 -+ std r1, 152(r3) ; save SP -+ -+ mfcr r0 ; load CR -+ std r0, 160(r3) ; save CR -+ mflr r0 ; load LR -+ std r0, 168(r3) ; save LR -+ std r0, 176(r3) ; save LR as PC -+ -+ cmpwi cr7, r6, 0 ; test if fpu env should be preserved -+ beq cr7, l1 -+ -+ stfd f14, 200(r3) ; save F14 -+ stfd f15, 208(r3) ; save F15 -+ stfd f16, 216(r3) ; save F16 -+ stfd f17, 224(r3) ; save F17 -+ stfd f18, 232(r3) ; save F18 -+ stfd f19, 240(r3) ; save F19 -+ stfd f20, 248(r3) ; save F20 -+ stfd f21, 256(r3) ; save F21 -+ stfd f22, 264(r3) ; save F22 -+ stfd f23, 272(r3) ; save F23 -+ stfd f24, 280(r3) ; save F24 -+ stfd f25, 288(r3) ; save F25 -+ stfd f26, 296(r3) ; save F26 -+ stfd f27, 304(r3) ; save F27 -+ stfd f28, 312(r3) ; save F28 -+ stfd f29, 320(r3) ; save F29 -+ stfd f30, 328(r3) ; save F30 -+ stfd f31, 336(r3) ; save F31 -+ mffs f0 ; load FPSCR -+ stfd f0, 344(r3) ; save FPSCR -+ -+ lfd f14, 200(r4) ; restore F14 -+ lfd f15, 208(r4) ; restore F15 -+ lfd f16, 216(r4) ; restore F16 -+ lfd f17, 224(r4) ; restore F17 -+ lfd f18, 232(r4) ; restore F18 -+ lfd f19, 240(r4) ; restore F19 -+ lfd f20, 248(r4) ; restore F20 -+ lfd f21, 256(r4) ; restore F21 -+ lfd f22, 264(r4) ; restore F22 -+ lfd f23, 272(r4) ; restore F23 -+ lfd f24, 280(r4) ; restore F24 -+ lfd f25, 288(r4) ; restore F25 -+ lfd f26, 296(r4) ; restore F26 -+ lfd f27, 304(r4) ; restore F27 -+ lfd f28, 312(r4) ; restore F28 -+ lfd f29, 320(r4) ; restore F29 -+ lfd f30, 328(r4) ; restore F30 -+ lfd f31, 336(r4) ; restore F31 -+ lfd f0, 344(r4) ; load FPSCR -+ mtfsf 0xff, f0 ; restore FPSCR -+l1: -+ -+ ld r13, 0(r4) ; restore R13 -+ ld r14, 8(r4) ; restore R14 -+ ld r15, 16(r4) ; restore R15 -+ ld r16, 24(r4) ; restore R16 -+ ld r17, 32(r4) ; restore R17 -+ ld r18, 40(r4) ; restore R18 -+ ld r19, 48(r4) ; restore R19 -+ ld r20, 56(r4) ; restore R20 -+ ld r21, 64(r4) ; restore R21 -+ ld r22, 72(r4) ; restore R22 -+ ld r23, 80(r4) ; restore R23 -+ ld r24, 88(r4) ; restore R24 -+ ld r25, 96(r4) ; restore R25 -+ ld r26, 104(r4) ; restore R26 -+ ld r27, 112(r4) ; restore R27 -+ ld r28, 120(r4) ; restore R28 -+ ld r29, 128(r4) ; restore R29 -+ ld r30, 136(r4) ; restore r30 -+ ld r31, 144(r4) ; restore r31 -+ ld r1, 152(r4) ; restore SP -+ -+ ld r0, 160(r4) ; load CR -+ mtcr r0 ; restore CR -+ ld r0, 168(r4) ; load LR -+ mtlr r0 ; restore LR -+ -+ mr r3, r5 ; use third arg as return value after jump -+ ; and as first arg in context function -+ -+ ld r0, 176(r4) ; load PC -+ mtctr r0 ; restore CTR -+ -+ bctr ; jump to context - -=== added file 'libs/context/src/asm/make_combined_sysv_macho_gas.S' ---- libs/context/src/asm/make_combined_sysv_macho_gas.S 1970-01-01 00:00:00 +0000 -+++ libs/context/src/asm/make_combined_sysv_macho_gas.S 2014-01-03 17:50:32 +0000 -@@ -0,0 +1,20 @@ -+/* -+ Copyright Sergue E. Leontiev 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+// Stub file for universal binary -+ -+#if defined(__i386__) -+ #include "make_i386_sysv_macho_gas.S" -+#elif defined(__x86_64__) -+ #include "make_x86_64_sysv_macho_gas.S" -+#elif defined(__ppc__) -+ #include "make_ppc32_sysv_macho_gas.S" -+#elif defined(__ppc64__) -+ #include "make_ppc64_sysv_macho_gas.S" -+#else -+ #error "No arch's" -+#endif - -=== added file 'libs/context/src/asm/make_ppc32_sysv_macho_gas.S' ---- libs/context/src/asm/make_ppc32_sysv_macho_gas.S 1970-01-01 00:00:00 +0000 -+++ libs/context/src/asm/make_ppc32_sysv_macho_gas.S 2014-01-02 21:27:23 +0000 -@@ -0,0 +1,109 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************* -+ * * -+ * ------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | * -+ * ------------------------------------------------------------- * -+ * | 0 | 4 | 8 | 12 | 16 | 20 | 24 | 28 | 32 | 36 | * -+ * ------------------------------------------------------------- * -+ * | R13 | R14 | R15 | R16 | R17 | R18 | R19 | R20 | R21 | R22 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | * -+ * ------------------------------------------------------------- * -+ * | 40 | 44 | 48 | 52 | 56 | 60 | 64 | 68 | 72 | 76 | * -+ * ------------------------------------------------------------- * -+ * | R23 | R24 | R25 | R26 | R27 | R28 | R29 | R30 | R31 | SP | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 20 | 21 | 22 | | * -+ * ------------------------------------------------------------- * -+ * | 80 | 84 | 88 | | * -+ * ------------------------------------------------------------- * -+ * | CR | LR | PC | | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 23 | 24 | 25 | | * -+ * ------------------------------------------------------------- * -+ * | 92 | 96 | 100 | | * -+ * ------------------------------------------------------------- * -+ * | sp | size|| | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | * -+ * ------------------------------------------------------------- * -+ * | 104 | 108 | 112 | 116 | 120 | 124 | 128 | 132 | 136 | 140 | * -+ * ------------------------------------------------------------- * -+ * | F14 | F15 | F16 | F17 | F18 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | * -+ * ------------------------------------------------------------- * -+ * | 144 | 148 | 152 | 156 | 160 | 164 | 168 | 172 | 176 | 180 | * -+ * ------------------------------------------------------------- * -+ * | F19 | F20 | F21 | F22 | F23 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 46 | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | 55 | * -+ * ------------------------------------------------------------- * -+ * | 184 | 188 | 192 | 196 | 200 | 204 | 208 | 212 | 216 | 220 | * -+ * ------------------------------------------------------------- * -+ * | F24 | F25 | F26 | F27 | F28 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | | * -+ * ------------------------------------------------------------- * -+ * | 224 | 228 | 232 | 236 | 240 | 244 | 248 | 252 | | * -+ * ------------------------------------------------------------- * -+ * | F29 | F30 | F31 | fpscr | | * -+ * ------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.text -+.globl _make_fcontext -+.align 2 -+_make_fcontext: -+ mflr r6 ; save return address into R6 -+ -+ mr r0, r3 -+ subi r3, r3, 256 ; reserve space for fcontext_t at top of context stack -+ -+ ; call align_stack, R3 contains address at 16 byte boundary after return -+ ; == pointer to fcontext_t and address of context stack -+ clrrwi r3, r3, 4 -+ -+ stw r0, 92(r3) ; save address of context stack (base) in fcontext_t -+ stw r4, 96(r3) ; save context stack size in fcontext_t -+ stw r5, 88(r3) ; save address of context function in fcontext_t -+ -+ subi r0, r3, 64 ; reserve 64 bytes (linkage + parameter area), R4 % 16 == 0 -+ stw r0, 76(r3) ; save address in R3 as stack pointer for context function -+ -+ mflr r0 ; load LR -+ bl l1 ; jump to label 1 -+l1: -+ mflr r4 ; load LR into R4 -+ addi r4, r4, lo16((finish - .)+4) ; compute abs address of label finish -+ mtlr r0 ; restore LR -+ stw r4, 84(r3) ; save address of finish as return address for context function -+ ; entered after context function returns -+ -+ mtlr r6 ; restore return address from R6 -+ -+ blr -+ -+finish: -+ ; SP points to same address as SP on entry of context function -+ mflr r0 ; save return address into R0 -+ stw r0, 4(r1) ; save return address on stack, set up stack frame -+ stwu r1, -16(r1) ; allocate stack space, SP % 16 == 0 -+ -+ li r3, 0 ; exit code is zero -+ bl __exit ; exit application - -=== added file 'libs/context/src/asm/make_ppc64_sysv_macho_gas.S' ---- libs/context/src/asm/make_ppc64_sysv_macho_gas.S 1970-01-01 00:00:00 +0000 -+++ libs/context/src/asm/make_ppc64_sysv_macho_gas.S 2014-01-03 18:04:45 +0000 -@@ -0,0 +1,123 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/******************************************************************* -+ * * -+ * ------------------------------------------------------------- * -+ * | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | * -+ * ------------------------------------------------------------- * -+ * | 0 | 4 | 8 | 12 | 16 | 20 | 24 | 28 | 32 | 36 | * -+ * ------------------------------------------------------------- * -+ * | R13 | R14 | R15 | R16 | R17 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | * -+ * ------------------------------------------------------------- * -+ * | 40 | 44 | 48 | 52 | 56 | 60 | 64 | 68 | 72 | 76 | * -+ * ------------------------------------------------------------- * -+ * | R18 | R19 | R20 | R21 | R22 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | * -+ * ------------------------------------------------------------- * -+ * | 80 | 84 | 88 | 92 | 96 | 100 | 104 | 108 | 112 | 116 | * -+ * ------------------------------------------------------------- * -+ * | R23 | R24 | R25 | R26 | R27 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | * -+ * ------------------------------------------------------------- * -+ * | 120 | 124 | 128 | 132 | 136 | 140 | 144 | 148 | 152 | 156 | * -+ * ------------------------------------------------------------- * -+ * | R28 | R29 | R30 | R31 | SP | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 40 | 41 | 42 | 43 | 44 | 45 | | * -+ * ------------------------------------------------------------- * -+ * | 160 | 164 | 168 | 172 | 176 | 180 | | * -+ * ------------------------------------------------------------- * -+ * | CR | LR | PC | | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 46 | 47 | 48 | 49 | | * -+ * ------------------------------------------------------------- * -+ * | 184 | 188 | 192 | 196 | | * -+ * ------------------------------------------------------------- * -+ * | sp | size | | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | 58 | 59 | * -+ * ------------------------------------------------------------- * -+ * | 200 | 204 | 208 | 212 | 216 | 220 | 224 | 228 | 232 | 236 | * -+ * ------------------------------------------------------------- * -+ * | F14 | F15 | F16 | F17 | F18 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | 68 | 69 | * -+ * ------------------------------------------------------------- * -+ * | 240 | 244 | 248 | 252 | 256 | 260 | 264 | 268 | 272 | 276 | * -+ * ------------------------------------------------------------- * -+ * | F19 | F20 | F21 | F22 | F23 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 70 | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | 79 | * -+ * ------------------------------------------------------------- * -+ * | 280 | 284 | 288 | 292 | 296 | 300 | 304 | 308 | 312 | 316 | * -+ * ------------------------------------------------------------- * -+ * | F24 | F25 | F26 | F27 | F28 | * -+ * ------------------------------------------------------------- * -+ * ------------------------------------------------------------- * -+ * | 80 | 81 | 82 | 83 | 84 | 85 | 86 | 87 | | * -+ * ------------------------------------------------------------- * -+ * | 320 | 324 | 328 | 332 | 336 | 340 | 344 | 348 | | * -+ * ------------------------------------------------------------- * -+ * | F29 | F30 | F31 | fpscr | | * -+ * ------------------------------------------------------------- * -+ * * -+ * *****************************************************************/ -+ -+.text -+.globl _make_fcontext -+_make_fcontext: -+ mflr r6 ; save return address into R6 -+ -+ mr r0, r3 -+ subi r3, r3, 352 ; reserve space for fcontext_t at top of context stack -+ -+ ; call align_stack, R3 contains address at 16 byte boundary after return -+ ; == pointer to fcontext_t and address of context stack -+ clrrdi r3, r3, 4 -+ -+ std r0, 184(r3) ; save address of context stack (base) in fcontext_t -+ std r4, 192(r3) ; save context stack size in fcontext_t -+ std r5, 176(r3) ; save address of context function in fcontext_t -+ -+ subi r0, r3, 64 ; 64 bytes on stack for parameter area (== 8 registers) -+ std r0, 152(r3) ; save the stack base -+ -+ mflr r0 ; load LR -+ bl l1 ; jump to label 1 -+l1: -+ mflr r4 ; load LR into R4 -+ addi r4, r4, lo16((finish - .) + 4) ; compute abs address of label finish -+ mtlr r0 ; restore LR -+ std r4, 168(r3) ; save address of finish as return address for context function -+ ; entered after context function returns -+ -+ mtlr r6 ; restore return address from R6 -+ -+ blr -+ -+finish: -+ ; SP points to same address as SP on entry of context function -+ mflr r0 ; save return address into R0 -+ stw r0, 8(r1) ; save return address on stack, set up stack frame -+ stwu r1, -32(r1) ; allocate stack space, SP % 16 == 0 -+ -+ li r3, 0 ; set return value to zero -+ bl __exit ; exit application -+ nop - diff --git a/patches/wxpython-3.0.0_macosx.patch b/patches/wxpython-3.0.0_macosx.patch deleted file mode 100644 index 627faf6c6a..0000000000 --- a/patches/wxpython-3.0.0_macosx.patch +++ /dev/null @@ -1,293 +0,0 @@ -=== modified file 'Makefile.in' ---- Makefile.in 2014-06-11 15:08:00 +0000 -+++ Makefile.in 2014-06-11 15:10:36 +0000 -@@ -14601,7 +14601,7 @@ - monodll_carbon_frame.o \ - monodll_carbon_mdi.o \ - monodll_carbon_metafile.o \ -- monodll_carbon_overlay.o \ -+ monodll_osx_cocoa_overlay.o \ - monodll_carbon_popupwin.o \ - monodll_carbon_renderer.o \ - monodll_carbon_settings.o \ -@@ -14748,7 +14748,7 @@ - monolib_carbon_frame.o \ - monolib_carbon_mdi.o \ - monolib_carbon_metafile.o \ -- monolib_carbon_overlay.o \ -+ monolib_osx_cocoa_overlay.o \ - monolib_carbon_popupwin.o \ - monolib_carbon_renderer.o \ - monolib_carbon_settings.o \ -@@ -14895,7 +14895,7 @@ - coredll_carbon_frame.o \ - coredll_carbon_mdi.o \ - coredll_carbon_metafile.o \ -- coredll_carbon_overlay.o \ -+ coredll_osx_cocoa_overlay.o \ - coredll_carbon_popupwin.o \ - coredll_carbon_renderer.o \ - coredll_carbon_settings.o \ -@@ -15027,7 +15027,7 @@ - corelib_carbon_frame.o \ - corelib_carbon_mdi.o \ - corelib_carbon_metafile.o \ -- corelib_carbon_overlay.o \ -+ corelib_osx_cocoa_overlay.o \ - corelib_carbon_popupwin.o \ - corelib_carbon_renderer.o \ - corelib_carbon_settings.o \ -@@ -17774,6 +17774,9 @@ - monodll_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm - -+monodll_osx_cocoa_overla.o: $(srcdir)/src/osx/cocoa/overlay.mm $(MONODLL_ODEP) -+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm -+ - monodll_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm - -@@ -21683,8 +21686,8 @@ - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP) --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(MONODLL_ODEP) -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm - - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(MONODLL_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp -@@ -23642,6 +23645,9 @@ - monolib_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm - -+monolib_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(MONOLIB_ODEP) -+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm -+ - monolib_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm - -@@ -33584,8 +33590,8 @@ - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(COREDLL_ODEP) -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm - - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp -@@ -37961,8 +37967,8 @@ - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(CORELIB_ODEP) -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm - - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - -=== modified file 'include/wx/overlay.h' ---- include/wx/overlay.h 2014-06-11 15:08:00 +0000 -+++ include/wx/overlay.h 2014-06-11 15:10:36 +0000 -@@ -13,7 +13,7 @@ - - #include "wx/defs.h" - --#if defined(__WXMAC__) && wxOSX_USE_CARBON -+#if defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON - #define wxHAS_NATIVE_OVERLAY 1 - #elif defined(__WXDFB__) - #define wxHAS_NATIVE_OVERLAY 1 - -=== modified file 'include/wx/private/overlay.h' ---- include/wx/private/overlay.h 2014-06-11 15:08:00 +0000 -+++ include/wx/private/overlay.h 2014-06-11 15:10:36 +0000 -@@ -16,7 +16,11 @@ - #ifdef wxHAS_NATIVE_OVERLAY - - #if defined(__WXMAC__) -+#if wxOSX_USE_CARBON - #include "wx/osx/carbon/private/overlay.h" -+#else -+ #include "wx/osx/cocoa/private/overlay.h" -+#endif - #elif defined(__WXDFB__) - #include "wx/dfb/private/overlay.h" - #else - -=== modified file 'src/osx/cocoa/overlay.mm' ---- src/osx/cocoa/overlay.mm 2014-06-11 15:08:00 +0000 -+++ src/osx/cocoa/overlay.mm 2014-06-11 15:12:45 +0000 -@@ -34,6 +34,7 @@ - #include "wx/private/overlay.h" - - #ifdef wxHAS_NATIVE_OVERLAY -+#import - - // ============================================================================ - // implementation -@@ -58,48 +59,6 @@ - - void wxOverlayImpl::CreateOverlayWindow() - { -- if ( m_window ) -- { -- m_overlayParentWindow = m_window->MacGetTopLevelWindowRef(); -- [m_overlayParentWindow makeKeyAndOrderFront:nil]; -- -- NSView* view = m_window->GetHandle(); -- -- NSPoint viewOriginBase, viewOriginScreen; -- viewOriginBase = [view convertPoint:NSMakePoint(0, 0) toView:nil]; -- viewOriginScreen = [m_overlayParentWindow convertBaseToScreen:viewOriginBase]; -- -- NSSize viewSize = [view frame].size; -- if ( [view isFlipped] ) -- viewOriginScreen.y -= viewSize.height; -- -- m_overlayWindow=[[NSWindow alloc] initWithContentRect:NSMakeRect(viewOriginScreen.x,viewOriginScreen.y, -- viewSize.width, -- viewSize.height) -- styleMask:NSBorderlessWindowMask -- backing:NSBackingStoreBuffered -- defer:YES]; -- -- [m_overlayParentWindow addChildWindow:m_overlayWindow ordered:NSWindowAbove]; -- } -- else -- { -- m_overlayParentWindow = NULL ; -- CGRect cgbounds ; -- cgbounds = CGDisplayBounds(CGMainDisplayID()); -- -- m_overlayWindow=[[NSWindow alloc] initWithContentRect:NSMakeRect(cgbounds.origin.x,cgbounds.origin.y, -- cgbounds.size.width, -- cgbounds.size.height) -- styleMask:NSBorderlessWindowMask -- backing:NSBackingStoreBuffered -- defer:YES]; -- } -- [m_overlayWindow setOpaque:NO]; -- [m_overlayWindow setIgnoresMouseEvents:YES]; -- [m_overlayWindow setAlphaValue:1.0]; -- -- [m_overlayWindow orderFront:nil]; - } - - void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height ) -@@ -107,84 +66,54 @@ - wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") ); - - m_window = dc->GetWindow(); -- m_x = x ; -- m_y = y ; -- if ( dc->IsKindOf( CLASSINFO( wxClientDC ) )) -- { -- wxPoint origin = m_window->GetClientAreaOrigin(); -- m_x += origin.x; -- m_y += origin.y; -- } -- m_width = width ; -- m_height = height ; -- -- CreateOverlayWindow(); -- wxASSERT_MSG( m_overlayWindow != NULL , _("Couldn't create the overlay window") ); -- m_overlayContext = (CGContextRef) [[m_overlayWindow graphicsContext] graphicsPort]; -- wxASSERT_MSG( m_overlayContext != NULL , _("Couldn't init the context on the overlay window") ); -- -- int ySize = 0; -- if ( m_window ) -- { -- NSView* view = m_window->GetHandle(); -- NSSize viewSize = [view frame].size; -- ySize = viewSize.height; -- } -- else -- { -- CGRect cgbounds ; -- cgbounds = CGDisplayBounds(CGMainDisplayID()); -- ySize = cgbounds.size.height; -- -- -- -- } -- CGContextTranslateCTM( m_overlayContext, 0, ySize ); -- CGContextScaleCTM( m_overlayContext, 1, -1 ); -- CGContextTranslateCTM( m_overlayContext, -m_x , -m_y ); -+ m_overlayWindow = m_window->MacGetTopLevelWindowRef(); -+ -+ NSRect box = [m_overlayWindow frame]; -+ box.origin.x = 0; -+ box.origin.y = 0; -+ -+ if( [m_overlayWindow isVisible] ) -+ { -+ [m_overlayWindow discardCachedImage]; -+ [m_overlayWindow cacheImageInRect:box]; -+ } - } - - void wxOverlayImpl::BeginDrawing( wxDC* dc) - { -- wxDCImpl *impl = dc->GetImpl(); -- wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl); -- if (win_impl) -- { -- win_impl->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) ); -- dc->SetClippingRegion( m_x , m_y , m_width , m_height ) ; -- } -+ - } - - void wxOverlayImpl::EndDrawing( wxDC* dc) - { -- wxDCImpl *impl = dc->GetImpl(); -- wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl); -- if (win_impl) -- win_impl->SetGraphicsContext(NULL); -- -- CGContextFlush( m_overlayContext ); - } - - void wxOverlayImpl::Clear(wxDC* WXUNUSED(dc)) - { - wxASSERT_MSG( IsOk() , _("You cannot Clear an overlay that is not inited") ); -- CGRect box = CGRectMake( m_x - 1, m_y - 1 , m_width + 2 , m_height + 2 ); -- CGContextClearRect( m_overlayContext, box ); -+ if( [m_overlayWindow isVisible] ) -+ { -+ [m_overlayWindow restoreCachedImage]; -+// [m_overlayWindow flushWindow]; -+ } - } - - void wxOverlayImpl::Reset() - { -- if ( m_overlayContext ) -+ if ( m_overlayContext) - { - m_overlayContext = NULL ; - } - - // todo : don't dispose, only hide and reposition on next run -- if (m_overlayWindow) -+ if (m_overlayWindow && [m_overlayWindow isVisible]) - { -- [m_overlayParentWindow removeChildWindow:m_overlayWindow]; -- [m_overlayWindow release]; -- m_overlayWindow = NULL ; -+ NSRect box = [m_overlayWindow frame]; -+ box.origin.x = 0; -+ box.origin.y = 0; -+ -+ [m_overlayWindow discardCachedImage]; -+ [m_overlayWindow cacheImageInRect:box]; - } - } - - diff --git a/patches/wxpython-3.0.0_macosx_multiarch.patch b/patches/wxpython-3.0.0_macosx_multiarch.patch deleted file mode 100644 index b3d39dc7cc..0000000000 --- a/patches/wxpython-3.0.0_macosx_multiarch.patch +++ /dev/null @@ -1,26 +0,0 @@ -=== modified file 'wxPython/config.py' ---- wxPython/config.py 2014-02-15 10:10:05 +0000 -+++ wxPython/config.py 2014-02-15 18:05:33 +0000 -@@ -22,6 +22,7 @@ - - import sys, os, glob, fnmatch, tempfile - import subprocess -+import re - - EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv - if not EGGing: -@@ -1059,10 +1060,9 @@ - libs = ['stdc++'] - NO_SCRIPTS = 1 - if ARCH != "": -- cflags.append("-arch") -- cflags.append(ARCH) -- lflags.append("-arch") -- lflags.append(ARCH) -+ splitArch = "-arch " + re.sub(","," -arch ",ARCH) -+ cflags.extend(splitArch.split(' ')) -+ lflags.extend(splitArch.split(' ')) - - if not os.environ.get('CC') or not os.environ.get('CXX'): - os.environ["CXX"] = getWxConfigValue('--cxx') - diff --git a/patches/wxwidgets-3.0.0_macosx.patch b/patches/wxwidgets-3.0.0_macosx.patch deleted file mode 100644 index b1d7931f04..0000000000 --- a/patches/wxwidgets-3.0.0_macosx.patch +++ /dev/null @@ -1,310 +0,0 @@ -=== modified file 'Makefile.in' ---- Makefile.in 2014-06-08 14:30:42 +0000 -+++ Makefile.in 2014-06-08 14:30:57 +0000 -@@ -14619,7 +14619,7 @@ - monodll_carbon_frame.o \ - monodll_carbon_mdi.o \ - monodll_carbon_metafile.o \ -- monodll_carbon_overlay.o \ -+ monodll_osx_cocoa_overlay.o \ - monodll_carbon_popupwin.o \ - monodll_carbon_renderer.o \ - monodll_carbon_settings.o \ -@@ -14766,7 +14766,7 @@ - monolib_carbon_frame.o \ - monolib_carbon_mdi.o \ - monolib_carbon_metafile.o \ -- monolib_carbon_overlay.o \ -+ monolib_osx_cocoa_overlay.o \ - monolib_carbon_popupwin.o \ - monolib_carbon_renderer.o \ - monolib_carbon_settings.o \ -@@ -14913,7 +14913,7 @@ - coredll_carbon_frame.o \ - coredll_carbon_mdi.o \ - coredll_carbon_metafile.o \ -- coredll_carbon_overlay.o \ -+ coredll_osx_cocoa_overlay.o \ - coredll_carbon_popupwin.o \ - coredll_carbon_renderer.o \ - coredll_carbon_settings.o \ -@@ -15045,7 +15045,7 @@ - corelib_carbon_frame.o \ - corelib_carbon_mdi.o \ - corelib_carbon_metafile.o \ -- corelib_carbon_overlay.o \ -+ corelib_osx_cocoa_overlay.o \ - corelib_carbon_popupwin.o \ - corelib_carbon_renderer.o \ - corelib_carbon_settings.o \ -@@ -17792,6 +17792,9 @@ - monodll_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm - -+monodll_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(MONODLL_ODEP) -+ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm -+ - monodll_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONODLL_ODEP) - $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm - -@@ -23666,6 +23669,9 @@ - monolib_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/notebook.mm - -+monolib_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(MONOLIB_ODEP) -+ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm -+ - monolib_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONOLIB_ODEP) - $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm - -@@ -33620,8 +33626,8 @@ - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(COREDLL_ODEP) -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm - - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(COREDLL_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp -@@ -38003,8 +38009,8 @@ - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) --@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_osx_cocoa_overlay.o: $(srcdir)/src/osx/cocoa/overlay.mm $(CORELIB_ODEP) -+@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/cocoa/overlay.mm - - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_overlay.o: $(srcdir)/src/osx/carbon/overlay.cpp $(CORELIB_ODEP) - @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/overlay.cpp - -=== modified file 'include/wx/osx/cocoa/private/overlay.h' ---- include/wx/osx/cocoa/private/overlay.h 2014-06-08 14:30:42 +0000 -+++ include/wx/osx/cocoa/private/overlay.h 2014-06-11 12:07:05 +0000 -@@ -41,15 +41,8 @@ - void CreateOverlayWindow(); - - WXWindow m_overlayWindow; -- WXWindow m_overlayParentWindow; -- CGContextRef m_overlayContext ; - // we store the window in case we would have to issue a Refresh() - wxWindow* m_window ; -- -- int m_x ; -- int m_y ; -- int m_width ; -- int m_height ; - } ; - - #endif // _WX_MAC_CARBON_PRIVATE_OVERLAY_H_ - -=== modified file 'include/wx/overlay.h' ---- include/wx/overlay.h 2014-06-08 14:30:42 +0000 -+++ include/wx/overlay.h 2014-06-08 14:30:57 +0000 -@@ -13,7 +13,7 @@ - - #include "wx/defs.h" - --#if defined(__WXMAC__) && wxOSX_USE_CARBON -+#if defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON - #define wxHAS_NATIVE_OVERLAY 1 - #elif defined(__WXDFB__) - #define wxHAS_NATIVE_OVERLAY 1 - -=== modified file 'include/wx/private/overlay.h' ---- include/wx/private/overlay.h 2014-06-08 14:30:42 +0000 -+++ include/wx/private/overlay.h 2014-06-08 14:30:57 +0000 -@@ -16,7 +16,11 @@ - #ifdef wxHAS_NATIVE_OVERLAY - - #if defined(__WXMAC__) -+#if wxOSX_USE_CARBON - #include "wx/osx/carbon/private/overlay.h" -+#else -+ #include "wx/osx/cocoa/private/overlay.h" -+#endif - #elif defined(__WXDFB__) - #include "wx/dfb/private/overlay.h" - #else - -=== modified file 'src/osx/cocoa/overlay.mm' ---- src/osx/cocoa/overlay.mm 2014-06-08 14:30:42 +0000 -+++ src/osx/cocoa/overlay.mm 2014-06-11 12:06:53 +0000 -@@ -34,6 +34,7 @@ - #include "wx/private/overlay.h" - - #ifdef wxHAS_NATIVE_OVERLAY -+#import - - // ============================================================================ - // implementation -@@ -42,7 +43,6 @@ - wxOverlayImpl::wxOverlayImpl() - { - m_window = NULL ; -- m_overlayContext = NULL ; - m_overlayWindow = NULL ; - } - -@@ -58,48 +58,6 @@ - - void wxOverlayImpl::CreateOverlayWindow() - { -- if ( m_window ) -- { -- m_overlayParentWindow = m_window->MacGetTopLevelWindowRef(); -- [m_overlayParentWindow makeKeyAndOrderFront:nil]; -- -- NSView* view = m_window->GetHandle(); -- -- NSPoint viewOriginBase, viewOriginScreen; -- viewOriginBase = [view convertPoint:NSMakePoint(0, 0) toView:nil]; -- viewOriginScreen = [m_overlayParentWindow convertBaseToScreen:viewOriginBase]; -- -- NSSize viewSize = [view frame].size; -- if ( [view isFlipped] ) -- viewOriginScreen.y -= viewSize.height; -- -- m_overlayWindow=[[NSWindow alloc] initWithContentRect:NSMakeRect(viewOriginScreen.x,viewOriginScreen.y, -- viewSize.width, -- viewSize.height) -- styleMask:NSBorderlessWindowMask -- backing:NSBackingStoreBuffered -- defer:YES]; -- -- [m_overlayParentWindow addChildWindow:m_overlayWindow ordered:NSWindowAbove]; -- } -- else -- { -- m_overlayParentWindow = NULL ; -- CGRect cgbounds ; -- cgbounds = CGDisplayBounds(CGMainDisplayID()); -- -- m_overlayWindow=[[NSWindow alloc] initWithContentRect:NSMakeRect(cgbounds.origin.x,cgbounds.origin.y, -- cgbounds.size.width, -- cgbounds.size.height) -- styleMask:NSBorderlessWindowMask -- backing:NSBackingStoreBuffered -- defer:YES]; -- } -- [m_overlayWindow setOpaque:NO]; -- [m_overlayWindow setIgnoresMouseEvents:YES]; -- [m_overlayWindow setAlphaValue:1.0]; -- -- [m_overlayWindow orderFront:nil]; - } - - void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height ) -@@ -107,84 +65,49 @@ - wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") ); - - m_window = dc->GetWindow(); -- m_x = x ; -- m_y = y ; -- if ( dc->IsKindOf( CLASSINFO( wxClientDC ) )) -- { -- wxPoint origin = m_window->GetClientAreaOrigin(); -- m_x += origin.x; -- m_y += origin.y; -- } -- m_width = width ; -- m_height = height ; -- -- CreateOverlayWindow(); -- wxASSERT_MSG( m_overlayWindow != NULL , _("Couldn't create the overlay window") ); -- m_overlayContext = (CGContextRef) [[m_overlayWindow graphicsContext] graphicsPort]; -- wxASSERT_MSG( m_overlayContext != NULL , _("Couldn't init the context on the overlay window") ); -- -- int ySize = 0; -- if ( m_window ) -- { -- NSView* view = m_window->GetHandle(); -- NSSize viewSize = [view frame].size; -- ySize = viewSize.height; -- } -- else -- { -- CGRect cgbounds ; -- cgbounds = CGDisplayBounds(CGMainDisplayID()); -- ySize = cgbounds.size.height; -- -- -- -- } -- CGContextTranslateCTM( m_overlayContext, 0, ySize ); -- CGContextScaleCTM( m_overlayContext, 1, -1 ); -- CGContextTranslateCTM( m_overlayContext, -m_x , -m_y ); -+ m_overlayWindow = m_window->MacGetTopLevelWindowRef(); -+ -+ NSRect box = [m_overlayWindow frame]; -+ box.origin.x = 0; -+ box.origin.y = 0; -+ -+ if( [m_overlayWindow isVisible] ) -+ { -+ [m_overlayWindow discardCachedImage]; -+ [m_overlayWindow cacheImageInRect:box]; -+ } - } - - void wxOverlayImpl::BeginDrawing( wxDC* dc) - { -- wxDCImpl *impl = dc->GetImpl(); -- wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl); -- if (win_impl) -- { -- win_impl->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) ); -- dc->SetClippingRegion( m_x , m_y , m_width , m_height ) ; -- } - } - - void wxOverlayImpl::EndDrawing( wxDC* dc) - { -- wxDCImpl *impl = dc->GetImpl(); -- wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl); -- if (win_impl) -- win_impl->SetGraphicsContext(NULL); -- -- CGContextFlush( m_overlayContext ); - } - --void wxOverlayImpl::Clear(wxDC* WXUNUSED(dc)) -+void wxOverlayImpl::Clear( wxDC* WXUNUSED(dc) ) - { - wxASSERT_MSG( IsOk() , _("You cannot Clear an overlay that is not inited") ); -- CGRect box = CGRectMake( m_x - 1, m_y - 1 , m_width + 2 , m_height + 2 ); -- CGContextClearRect( m_overlayContext, box ); -+ -+ if( [m_overlayWindow isVisible] ) -+ { -+ [m_overlayWindow restoreCachedImage]; -+// [m_overlayWindow flushWindow]; -+ } - } - - void wxOverlayImpl::Reset() - { -- if ( m_overlayContext ) -- { -- m_overlayContext = NULL ; -- } -- - // todo : don't dispose, only hide and reposition on next run -- if (m_overlayWindow) -+ if (m_overlayWindow && [m_overlayWindow isVisible]) - { -- [m_overlayParentWindow removeChildWindow:m_overlayWindow]; -- [m_overlayWindow release]; -- m_overlayWindow = NULL ; -+ NSRect box = [m_overlayWindow frame]; -+ box.origin.x = 0; -+ box.origin.y = 0; -+ -+ [m_overlayWindow discardCachedImage]; -+ [m_overlayWindow cacheImageInRect:box]; - } - } - - diff --git a/patches/wxwidgets-3.0.0_macosx_bug_15908.patch b/patches/wxwidgets-3.0.0_macosx_bug_15908.patch deleted file mode 100644 index 9fdbd5f12e..0000000000 --- a/patches/wxwidgets-3.0.0_macosx_bug_15908.patch +++ /dev/null @@ -1,14 +0,0 @@ -=== modified file 'src/common/translation.cpp' ---- src/common/translation.cpp 2014-01-26 13:59:40 +0000 -+++ src/common/translation.cpp 2014-01-26 15:18:47 +0000 -@@ -1611,6 +1611,9 @@ - /* static */ - const wxString& wxTranslations::GetUntranslatedString(const wxString& str) - { -+ // Marco Serantoni - Dirty Patch -+ // Awaiting for http://trac.wxwidgets.org/ticket/15908 -+ if( gs_translationsOwned == false) return str; - wxLocaleUntranslatedStrings& strings = wxThreadInfo.untranslatedStrings; - - wxLocaleUntranslatedStrings::iterator i = strings.find(str); - diff --git a/patches/wxwidgets-3.0.0_macosx_scrolledwindow.patch b/patches/wxwidgets-3.0.0_macosx_scrolledwindow.patch deleted file mode 100644 index c842dca813..0000000000 --- a/patches/wxwidgets-3.0.0_macosx_scrolledwindow.patch +++ /dev/null @@ -1,50 +0,0 @@ -=== modified file 'src/generic/scrlwing.cpp' ---- src/generic/scrlwing.cpp 2013-12-16 05:42:30 -0800 -+++ src/generic/scrlwing.cpp 2014-10-21 01:19:02 -0700 -@@ -214,9 +214,6 @@ - return true; - } - -- if ( processed && event.IsCommandEvent()) -- return true; -- - // For wxEVT_PAINT the user code can either handle this event as usual or - // override virtual OnDraw(), so if the event hasn't been handled we need - // to call this virtual function ourselves. -@@ -235,6 +232,11 @@ - return true; - } - -+ // If the user code handled this event, it should prevent the default -+ // handling from taking place, so don't do anything else in this case. -+ if ( processed ) -+ return true; -+ - if ( evType == wxEVT_CHILD_FOCUS ) - { - m_scrollHelper->HandleOnChildFocus((wxChildFocusEvent &)event); -=== modified file 'src/generic/vscroll.cpp' ---- src/generic/vscroll.cpp 2013-12-16 05:42:30 -0800 -+++ src/generic/vscroll.cpp 2014-10-21 01:19:09 -0700 -@@ -89,9 +89,6 @@ - return true; - } - -- if ( processed && event.IsCommandEvent()) -- return true; -- - // For wxEVT_PAINT the user code can either handle this event as usual or - // override virtual OnDraw(), so if the event hasn't been handled we need - // to call this virtual function ourselves. -@@ -110,6 +107,11 @@ - return true; - } - -+ // If the user code handled this event, it should prevent the default -+ // handling from taking place, so don't do anything else in this case. -+ if ( processed ) -+ return true; -+ - // reset the skipped flag (which might have been set to true in - // ProcessEvent() above) to be able to test it below - bool wasSkipped = event.GetSkipped(); diff --git a/patches/wxwidgets-3.0.0_macosx_soname.patch b/patches/wxwidgets-3.0.0_macosx_soname.patch deleted file mode 100644 index 854348722b..0000000000 --- a/patches/wxwidgets-3.0.0_macosx_soname.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: configure -=================================================================== ---- configure (revision 77757) -+++ configure (working copy) -@@ -29176,7 +29176,7 @@ - *-*-darwin* ) - install_name_tool=`which ${HOST_PREFIX}install_name_tool` - if test "$install_name_tool" -a -x "$install_name_tool"; then -- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" -+ DYLIB_RPATH_POSTLINK="" - cat <change-install-names - #!/bin/sh - libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` -@@ -29189,7 +29189,7 @@ - done - EOF - chmod +x change-install-names -- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" -+ DYLIB_RPATH_INSTALL="" - fi - - HEADER_PAD_OPTION="-headerpad_max_install_names" -Index: configure.in -=================================================================== ---- configure.in (revision 77757) -+++ configure.in (working copy) -@@ -3772,7 +3772,7 @@ - *-*-darwin* ) - install_name_tool=`which ${HOST_PREFIX}install_name_tool` - if test "$install_name_tool" -a -x "$install_name_tool"; then -- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" -+ DYLIB_RPATH_POSTLINK="" - cat <change-install-names - #!/bin/sh - libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` -@@ -3785,7 +3785,7 @@ - done - EOF - chmod +x change-install-names -- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" -+ DYLIB_RPATH_INSTALL="" - fi - - dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error: diff --git a/patches/wxwidgets-3.0.0_macosx_staticbox_tabbing.patch b/patches/wxwidgets-3.0.0_macosx_staticbox_tabbing.patch deleted file mode 100644 index 302726544c..0000000000 --- a/patches/wxwidgets-3.0.0_macosx_staticbox_tabbing.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 05c5d6676056f4f6689cabf701d4ea69f419fa0f Mon Sep 17 00:00:00 2001 -From: Jeff Young -Date: Wed, 27 Dec 2017 19:13:34 +0000 -Subject: [PATCH] Inherit from StaticBoxBase so that tabbing works. -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------2.14.3 (Apple Git-98)" - -This is a multi-part message in MIME format. ---------------2.14.3 (Apple Git-98) -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - include/wx/osx/statbox.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - - ---------------2.14.3 (Apple Git-98) -Content-Type: text/x-patch; name="0001-Inherit-from-StaticBoxBase-so-that-tabbing-works.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: attachment; filename="0001-Inherit-from-StaticBoxBase-so-that-tabbing-works.patch" - -diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h -index 5b5f049c58..2428f401fb 100644 ---- a/include/wx/osx/statbox.h -+++ b/include/wx/osx/statbox.h -@@ -14,7 +14,7 @@ - #include "wx/control.h" - - // Group box --class WXDLLIMPEXP_CORE wxStaticBox: public wxControl -+class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase - { - DECLARE_DYNAMIC_CLASS(wxStaticBox) - - ---------------2.14.3 (Apple Git-98)-- - - diff --git a/patches/wxwidgets-3.0.2_macosx_data_view_ctrl.patch b/patches/wxwidgets-3.0.2_macosx_data_view_ctrl.patch deleted file mode 100644 index c5662f38c9..0000000000 --- a/patches/wxwidgets-3.0.2_macosx_data_view_ctrl.patch +++ /dev/null @@ -1,11 +0,0 @@ -=== modified file 'src/osx/dataview_osx.cpp' ---- src/osx/dataview_osx.cpp -+++ src/osx/dataview_osx.cpp -@@ -378,7 +378,6 @@ bool wxDataViewCtrl::Create(wxWindow *parent, - const wxValidator& validator, - const wxString& name) - { -- DontCreatePeer(); - if (!(wxControl::Create(parent,id,pos,size,style,validator,name))) - return false; - SetPeer(::CreateDataView(this,parent,id,pos,size,style,GetExtraStyle())); diff --git a/patches/wxwidgets-3.0.2_macosx_high_sierra.patch b/patches/wxwidgets-3.0.2_macosx_high_sierra.patch deleted file mode 100644 index 134fccc020..0000000000 --- a/patches/wxwidgets-3.0.2_macosx_high_sierra.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- src/stc/scintilla/src/Editor.cxx.orig 2014-10-06 21:33:44 UTC -+++ src/stc/scintilla/src/Editor.cxx -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include "Platform.h" diff --git a/patches/wxwidgets-3.0.2_macosx_magnify_event.patch b/patches/wxwidgets-3.0.2_macosx_magnify_event.patch deleted file mode 100644 index e4ed86aa29..0000000000 --- a/patches/wxwidgets-3.0.2_macosx_magnify_event.patch +++ /dev/null @@ -1,121 +0,0 @@ -=== modified file 'include/wx/event.h' ---- include/wx/event.h 2015-05-21 23:18:15.126136156 +0200 -+++ include/wx/event.h 2015-05-21 23:20:35.112797127 +0200 -@@ -11,6 +11,8 @@ - #ifndef _WX_EVENT_H_ - #define _WX_EVENT_H_ - -+#define USE_OSX_MAGNIFY_EVENT -+ - #include "wx/defs.h" - #include "wx/cpp.h" - #include "wx/object.h" -@@ -716,6 +718,7 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_COR - wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DOWN, wxMouseEvent); - wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_UP, wxMouseEvent); - wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DCLICK, wxMouseEvent); -+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MAGNIFY, wxMouseEvent); - - // Character input event type - wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR, wxKeyEvent); -@@ -1751,6 +1754,8 @@ public: - bool Aux1DClick() const { return (m_eventType == wxEVT_AUX1_DCLICK); } - bool Aux2DClick() const { return (m_eventType == wxEVT_AUX2_DCLICK); } - -+ bool Magnify() const { return (m_eventType == wxEVT_MAGNIFY); } -+ - // True if a button is down and the mouse is moving - bool Dragging() const - { -@@ -1805,6 +1810,8 @@ public: - // Is the system set to do page scrolling? - bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); } - -+ float GetMagnification() const { return m_magnification; } -+ - virtual wxEvent *Clone() const { return new wxMouseEvent(*this); } - virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } - -@@ -1824,6 +1831,8 @@ public: - int m_linesPerAction; - int m_columnsPerAction; - -+ float m_magnification; -+ - protected: - void Assign(const wxMouseEvent& evt); - -@@ -4218,6 +4227,7 @@ typedef void (wxEvtHandler::*wxClipboard - #define EVT_MOUSE_AUX2_DOWN(func) wx__DECLARE_EVT0(wxEVT_AUX2_DOWN, wxMouseEventHandler(func)) - #define EVT_MOUSE_AUX2_UP(func) wx__DECLARE_EVT0(wxEVT_AUX2_UP, wxMouseEventHandler(func)) - #define EVT_MOUSE_AUX2_DCLICK(func) wx__DECLARE_EVT0(wxEVT_AUX2_DCLICK, wxMouseEventHandler(func)) -+#define EVT_MAGNIFY(func) wx__DECLARE_EVT0(wxEVT_MAGNIFY, wxMouseEventHandler(func)) - - // All mouse events - #define EVT_MOUSE_EVENTS(func) \ -@@ -4239,7 +4249,8 @@ typedef void (wxEvtHandler::*wxClipboard - EVT_MOTION(func) \ - EVT_LEAVE_WINDOW(func) \ - EVT_ENTER_WINDOW(func) \ -- EVT_MOUSEWHEEL(func) -+ EVT_MOUSEWHEEL(func) \ -+ EVT_MAGNIFY(func) - - // Scrolling from wxWindow (sent to wxScrolledWindow) - #define EVT_SCROLLWIN_TOP(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_TOP, wxScrollWinEventHandler(func)) -=== modified file 'src/common/event.cpp' ---- src/common/event.cpp 2015-05-21 23:18:15.049469492 +0200 -+++ src/common/event.cpp 2015-05-21 23:18:23.566135812 +0200 -@@ -208,6 +208,7 @@ wxDEFINE_EVENT( wxEVT_AUX1_DCLICK, wxMou - wxDEFINE_EVENT( wxEVT_AUX2_DOWN, wxMouseEvent ); - wxDEFINE_EVENT( wxEVT_AUX2_UP, wxMouseEvent ); - wxDEFINE_EVENT( wxEVT_AUX2_DCLICK, wxMouseEvent ); -+wxDEFINE_EVENT( wxEVT_MAGNIFY, wxMouseEvent ); - - // Character input event type - wxDEFINE_EVENT( wxEVT_CHAR, wxKeyEvent ); -@@ -576,6 +577,8 @@ wxMouseEvent::wxMouseEvent(wxEventType c - m_wheelDelta = 0; - m_linesPerAction = 0; - m_columnsPerAction = 0; -+ -+ m_magnification = 0.0f; - } - - void wxMouseEvent::Assign(const wxMouseEvent& event) -@@ -600,6 +603,8 @@ void wxMouseEvent::Assign(const wxMouseE - m_linesPerAction = event.m_linesPerAction; - m_columnsPerAction = event.m_columnsPerAction; - m_wheelAxis = event.m_wheelAxis; -+ -+ m_magnification = event.m_magnification; - } - - // return true if was a button dclick event -=== modified file 'src/osx/cocoa/window.mm' ---- src/osx/cocoa/window.mm 2015-05-21 23:18:15.032802826 +0200 -+++ src/osx/cocoa/window.mm 2015-05-21 23:18:23.566135812 +0200 -@@ -741,6 +741,12 @@ void wxWidgetCocoaImpl::SetupMouseEvent( - case NSMouseMoved : - wxevent.SetEventType( wxEVT_MOTION ) ; - break; -+ -+ case NSEventTypeMagnify: -+ wxevent.SetEventType( wxEVT_MAGNIFY ); -+ wxevent.m_magnification = [nsEvent magnification]; -+ break; -+ - default : - break ; - } -@@ -1773,6 +1779,10 @@ void wxOSXCocoaClassAddWXMethods(Class c - wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" ) - wxOSX_CLASS_ADD_METHOD(c, @selector(mouseExited:), (IMP) wxOSX_mouseEvent, "v@:@" ) - -+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 -+ wxOSX_CLASS_ADD_METHOD(c, @selector(magnifyWithEvent:), (IMP)wxOSX_mouseEvent, "v@:@") -+#endif -+ - wxOSX_CLASS_ADD_METHOD(c, @selector(cursorUpdate:), (IMP) wxOSX_cursorUpdate, "v@:@" ) - - wxOSX_CLASS_ADD_METHOD(c, @selector(keyDown:), (IMP) wxOSX_keyEvent, "v@:@" ) diff --git a/patches/wxwidgets-3.0.2_macosx_quasimodal.patch b/patches/wxwidgets-3.0.2_macosx_quasimodal.patch deleted file mode 100644 index ad7747e043..0000000000 --- a/patches/wxwidgets-3.0.2_macosx_quasimodal.patch +++ /dev/null @@ -1,81 +0,0 @@ -From f725afdcbd4168fce3d1e8f952fe55b03cdf8a7e Mon Sep 17 00:00:00 2001 -From: Jeff Young -Date: Tue, 9 Jan 2018 12:04:20 +0000 -Subject: [PATCH 1/2] Backport OSX disabled-window fixes from master. - -Also adds ReparentQuasiModal() which is required for Kicad -quasi-modal dialogs. ---- - include/wx/osx/dialog.h | 3 +++ - src/osx/cocoa/dialog.mm | 12 ++++++++++++ - src/osx/cocoa/window.mm | 13 ++++++++++++- - 3 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h -index 3b0b724fb8..5beda35130 100644 ---- a/include/wx/osx/dialog.h -+++ b/include/wx/osx/dialog.h -@@ -59,6 +59,9 @@ public: - // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode); - -+ // hack to keep window behind quasi-modal dialog from being fronted -+ void ReparentQuasiModal(); -+ - static bool OSXHasModalDialogsOpen(); - static void OSXBeginModalDialog(); - static void OSXEndModalDialog(); -diff --git a/src/osx/cocoa/dialog.mm b/src/osx/cocoa/dialog.mm -index 8b1e48f1b4..c6b508013e 100644 ---- a/src/osx/cocoa/dialog.mm -+++ b/src/osx/cocoa/dialog.mm -@@ -44,3 +44,15 @@ - [NSApp endSheet: GetWXWindow()]; - [GetWXWindow() orderOut:GetWXWindow()]; - } -+ -+void wxDialog::ReparentQuasiModal() -+{ -+ wxTopLevelWindow* parent = static_cast(wxGetTopLevelParent(GetParent())); -+ -+ wxASSERT_MSG(parent, "QuasiModal dialogs require a parent."); -+ -+ NSWindow* parentWindow = parent->GetWXWindow(); -+ NSWindow* theWindow = GetWXWindow(); -+ -+ [parentWindow addChildWindow:theWindow ordered:NSWindowAbove]; -+} -diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm -index ede8ebf778..2366d65d6b 100644 ---- a/src/osx/cocoa/window.mm -+++ b/src/osx/cocoa/window.mm -@@ -863,6 +863,15 @@ - (BOOL) canBecomeKeyView - return NO; - } - -+- (NSView *)hitTest:(NSPoint)aPoint; -+{ -+ wxWidgetCocoaImpl* viewimpl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self ); -+ if ( viewimpl && viewimpl->GetWXPeer() && !viewimpl->GetWXPeer()->IsEnabled() ) -+ return nil; -+ -+ return [super hitTest:aPoint]; -+} -+ - @end // wxNSView - - // We need to adopt NSTextInputClient protocol in order to interpretKeyEvents: to work. -@@ -985,7 +994,9 @@ void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event) - if (impl == NULL) - return; - -- impl->mouseEvent(event, self, _cmd); -+ // We shouldn't let disabled windows get mouse events. -+ if (impl->GetWXPeer()->IsEnabled()) -+ impl->mouseEvent(event, self, _cmd); - } - - void wxOSX_cursorUpdate(NSView* self, SEL _cmd, NSEvent *event) --- -2.14.3 (Apple Git-98) - diff --git a/patches/wxwidgets-3.0.2_macosx_retina_opengl.patch b/patches/wxwidgets-3.0.2_macosx_retina_opengl.patch deleted file mode 100644 index dd27bd5e8f..0000000000 --- a/patches/wxwidgets-3.0.2_macosx_retina_opengl.patch +++ /dev/null @@ -1,51 +0,0 @@ -=== modified file 'include/wx/glcanvas.h' ---- include/wx/glcanvas.h 2015-05-21 00:36:27.406145182 +0200 -+++ include/wx/glcanvas.h 2015-05-21 00:37:59.169474782 +0200 -@@ -19,6 +19,8 @@ - #include "wx/palette.h" - #include "wx/window.h" - -+#define RETINA_OPENGL_PATCH -+ - class WXDLLIMPEXP_FWD_GL wxGLCanvas; - class WXDLLIMPEXP_FWD_GL wxGLContext; - -=== modified file 'include/wx/osx/glcanvas.h' ---- include/wx/osx/glcanvas.h 2015-05-21 00:36:27.419478515 +0200 -+++ include/wx/osx/glcanvas.h 2015-05-21 00:36:37.319478112 +0200 -@@ -88,6 +88,9 @@ public: - // update the view port of the current context to match this window - void SetViewport(); - -+ void SetViewWantsBestResolution( bool aValue ); -+ bool GetViewWantsBestResolution(); -+ float GetBackingScaleFactor(); - - // deprecated methods - // ------------------ -=== modified file 'src/osx/cocoa/glcanvas.mm' ---- src/osx/cocoa/glcanvas.mm 2015-05-21 00:36:27.542811843 +0200 -+++ src/osx/cocoa/glcanvas.mm 2015-05-21 00:36:37.322811445 +0200 -@@ -313,6 +313,22 @@ bool wxGLCanvas::SwapBuffers() - return true; - } - -+void wxGLCanvas::SetViewWantsBestResolution( bool aValue ) -+{ -+ [GetHandle() setWantsBestResolutionOpenGLSurface:aValue]; -+} -+ -+bool wxGLCanvas::GetViewWantsBestResolution() -+{ -+ return [GetHandle() wantsBestResolutionOpenGLSurface]; -+} -+ -+float wxGLCanvas::GetBackingScaleFactor() -+{ -+ return [[GetHandle() window] backingScaleFactor]; -+} -+ -+ - bool wxGLContext::SetCurrent(const wxGLCanvas& win) const - { - if ( !m_glContext ) diff --git a/patches/wxwidgets-3.0.2_macosx_sierra.patch b/patches/wxwidgets-3.0.2_macosx_sierra.patch deleted file mode 100644 index be0ee7bb6e..0000000000 --- a/patches/wxwidgets-3.0.2_macosx_sierra.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git src/osx/carbon/dataobj.cpp src/osx/carbon/dataobj.cpp -index c03c6a1..c40c1ce 100644 ---- src/osx/carbon/dataobj.cpp -+++ src/osx/carbon/dataobj.cpp -@@ -30,8 +30,10 @@ - #include "wx/osx/private.h" - - #if wxOSX_USE_COCOA_OR_CARBON -+#ifndef __MAC_10_12 - #include - #endif -+#endif - - // ---------------------------------------------------------------------------- - // wxDataFormat -diff --git src/osx/core/bitmap.cpp src/osx/core/bitmap.cpp -index 3c61c17..32cbdb7 100644 ---- src/osx/core/bitmap.cpp -+++ src/osx/core/bitmap.cpp -@@ -36,8 +36,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject) - #endif - - #ifndef __WXOSX_IPHONE__ -+#ifndef __MAC_10_12 - #include - #endif -+#endif - - CGColorSpaceRef wxMacGetGenericRGBColorSpace(); - CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf ); diff --git a/patches/wxwidgets-3.0.2_macosx_unicode_pasteboard.patch b/patches/wxwidgets-3.0.2_macosx_unicode_pasteboard.patch deleted file mode 100644 index b65f3888e0..0000000000 --- a/patches/wxwidgets-3.0.2_macosx_unicode_pasteboard.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/osx/carbon/dataobj.cpp 2016-09-17 10:26:10.000000000 +1200 -+++ src/osx/carbon/dataobj.cpp 2016-09-17 10:26:23.000000000 +1200 -@@ -458,13 +458,11 @@ bool wxDataObject::GetFromPasteboard( vo - pastelocationset = true; - } - } --#if 0 // See https://groups.google.com/forum/#!topic/wx-dev/wFxevpvbhvQ/discussion - else if ( flavorFormat.GetType() != wxDF_PRIVATE ) - { - // indicate the expected format for the type, benefiting from native conversions eg utf8 -> utf16 - flavorType = (CFStringRef) wxDataFormat( flavorFormat.GetType()).GetFormatId(); - } --#endif - - err = PasteboardCopyItemFlavorData( pasteboard, itemID, flavorType , &flavorData ); - if ( err == noErr ) diff --git a/patches/wxwidgets-3.0.2_macosx_yosemite.patch b/patches/wxwidgets-3.0.2_macosx_yosemite.patch deleted file mode 100644 index a29050e2d2..0000000000 --- a/patches/wxwidgets-3.0.2_macosx_yosemite.patch +++ /dev/null @@ -1,11 +0,0 @@ -=== modified file 'src/osx/webview_webkit.mm' ---- src/osx/webview_webkit.mm 2014-09-16 07:27:52.000000000 -0600 -+++ src/osx/webview_webkit.mm 2014-09-16 07:28:12.000000000 -0600 -@@ -28,7 +28,7 @@ - #include "wx/hashmap.h" - #include "wx/filesys.h" - --#include -+#include - #include - #include