wxWidgets-3.2: update patch

This commit is contained in:
Mohamed Akram
2026-05-18 22:09:39 +04:00
parent 5b32c1b368
commit 30e84e793f
2 changed files with 17 additions and 18 deletions
+1 -3
View File
@@ -65,7 +65,7 @@ depends_run port:wxWidgets-common \
configure.env-append \
GREP=/usr/bin/grep
patchfiles patch-osx-carbon-utilscocoa.diff
patchfiles patch-wx-osx-core-private.diff
post-patch {
file mkdir ${selectdir}
@@ -110,8 +110,6 @@ configure.args --prefix=${wxWidgets.prefix} \
# minimum SDK version per configure script is 10.11
if { ${os.platform} eq "darwin" && ${os.major} < 15 } {
configure.sdk_version 10.11
# ../src/osx/cocoa/taskbar.mm:398:67: error: use of undeclared identifier 'NSCompositingOperationSourceOver'
configure.objcxxflags-append -DNSCompositingOperationSourceOver=NSCompositeSourceOver
}
post-destroot {
@@ -1,20 +1,21 @@
From 1a60a910d885464269518b2403f221afacd42fec Mon Sep 17 00:00:00 2001
From 12a782d54e0e9bc0356c5112e639e7adbb648e89 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sun, 17 May 2026 23:03:07 +0200
Date: Mon, 18 May 2026 19:56:46 +0200
Subject: [PATCH] Add defines for macOS < 10.12
---
src/osx/carbon/utilscocoa.mm | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
include/wx/osx/core/private.h | 18 ++++++++++++++++++
src/osx/carbon/utilscocoa.mm | 18 ------------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/osx/carbon/utilscocoa.mm b/src/osx/carbon/utilscocoa.mm
index f40c3592369e..fd4a4c0abfd4 100644
--- src/osx/carbon/utilscocoa.mm
+++ src/osx/carbon/utilscocoa.mm
@@ -296,6 +296,24 @@ CGContextRef WXDLLIMPEXP_CORE wxOSXCreateBitmapContextFromImage( WXImage nsimage
namespace
{
#if wxOSX_USE_COCOA
diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index eed822f6233d..20a25bf9391f 100644
--- include/wx/osx/core/private.h
+++ include/wx/osx/core/private.h
@@ -70,6 +70,24 @@ WXDLLIMPEXP_BASE CFURLRef wxOSXCreateURLFromFileSystemPath( const wxString& path
#if !defined(__WXOSX_IPHONE__)
#include <ApplicationServices/ApplicationServices.h>
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
+ #define NSCompositingOperationClear NSCompositeClear
@@ -33,6 +34,6 @@ index f40c3592369e..fd4a4c0abfd4 100644
+ #define NSCompositingOperationSourceOver NSCompositeSourceOver
+#endif
+
NSCompositingOperation wxOSXNSCompositionFromWXComposition( wxCompositionMode composition )
{
NSCompositingOperation mode = NSCompositingOperationSourceOver;
#endif
#include "wx/bmpbndl.h"