CVS commit: pkgsrc/x11/wxGTK32

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Dec 26 18:10:23 UTC 2024

Modified Files:
        pkgsrc/x11/wxGTK32: PLIST.Darwin distinfo
Added Files:
        pkgsrc/x11/wxGTK32/patches: patch-src_osx_carbon_dcscreen.cpp

Log Message:
wxGTK32: fix build on macOS 15; fix PLIST for macOS/Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/wxGTK32/PLIST.Darwin
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/wxGTK32/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/wxGTK32/patches/patch-src_osx_carbon_dcscreen.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/wxGTK32/PLIST.Darwin
diff -u pkgsrc/x11/wxGTK32/PLIST.Darwin:1.6 pkgsrc/x11/wxGTK32/PLIST.Darwin:1.7
--- pkgsrc/x11/wxGTK32/PLIST.Darwin:1.6 Mon May 20 10:44:44 2024
+++ pkgsrc/x11/wxGTK32/PLIST.Darwin     Thu Dec 26 18:10:23 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.6 2024/05/20 10:44:44 wiz Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.7 2024/12/26 18:10:23 adam Exp $
 include/wx-3.2/wx/generic/clrpickerg.h
 include/wx-3.2/wx/generic/collpaneg.h
 include/wx-3.2/wx/generic/colrdlgg.h
@@ -113,43 +113,43 @@ include/wx-3.2/wx/osx/uma.h
 include/wx-3.2/wx/osx/webview_webkit.h
 include/wx-3.2/wx/osx/webviewhistoryitem_webkit.h
 include/wx-3.2/wx/osx/window.h
-lib/libwx_osx_cocoau_adv-3.2.0.2.3.so
+lib/libwx_osx_cocoau_adv-3.2.0.3.0.so
 lib/libwx_osx_cocoau_adv-3.2.0.so
 lib/libwx_osx_cocoau_adv-3.2.so
-lib/libwx_osx_cocoau_aui-3.2.0.2.3.so
+lib/libwx_osx_cocoau_aui-3.2.0.3.0.so
 lib/libwx_osx_cocoau_aui-3.2.0.so
 lib/libwx_osx_cocoau_aui-3.2.so
-lib/libwx_osx_cocoau_core-3.2.0.2.3.so
+lib/libwx_osx_cocoau_core-3.2.0.3.0.so
 lib/libwx_osx_cocoau_core-3.2.0.so
 lib/libwx_osx_cocoau_core-3.2.so
-lib/libwx_osx_cocoau_gl-3.2.0.2.3.so
+lib/libwx_osx_cocoau_gl-3.2.0.3.0.so
 lib/libwx_osx_cocoau_gl-3.2.0.so
 lib/libwx_osx_cocoau_gl-3.2.so
-lib/libwx_osx_cocoau_html-3.2.0.2.3.so
+lib/libwx_osx_cocoau_html-3.2.0.3.0.so
 lib/libwx_osx_cocoau_html-3.2.0.so
 lib/libwx_osx_cocoau_html-3.2.so
-lib/libwx_osx_cocoau_media-3.2.0.2.3.so
+lib/libwx_osx_cocoau_media-3.2.0.3.0.so
 lib/libwx_osx_cocoau_media-3.2.0.so
 lib/libwx_osx_cocoau_media-3.2.so
-lib/libwx_osx_cocoau_propgrid-3.2.0.2.3.so
+lib/libwx_osx_cocoau_propgrid-3.2.0.3.0.so
 lib/libwx_osx_cocoau_propgrid-3.2.0.so
 lib/libwx_osx_cocoau_propgrid-3.2.so
-lib/libwx_osx_cocoau_qa-3.2.0.2.3.so
+lib/libwx_osx_cocoau_qa-3.2.0.3.0.so
 lib/libwx_osx_cocoau_qa-3.2.0.so
 lib/libwx_osx_cocoau_qa-3.2.so
-lib/libwx_osx_cocoau_ribbon-3.2.0.2.3.so
+lib/libwx_osx_cocoau_ribbon-3.2.0.3.0.so
 lib/libwx_osx_cocoau_ribbon-3.2.0.so
 lib/libwx_osx_cocoau_ribbon-3.2.so
-lib/libwx_osx_cocoau_richtext-3.2.0.2.3.so
+lib/libwx_osx_cocoau_richtext-3.2.0.3.0.so
 lib/libwx_osx_cocoau_richtext-3.2.0.so
 lib/libwx_osx_cocoau_richtext-3.2.so
-lib/libwx_osx_cocoau_stc-3.2.0.2.3.so
+lib/libwx_osx_cocoau_stc-3.2.0.3.0.so
 lib/libwx_osx_cocoau_stc-3.2.0.so
 lib/libwx_osx_cocoau_stc-3.2.so
-lib/libwx_osx_cocoau_webview-3.2.0.2.3.so
+lib/libwx_osx_cocoau_webview-3.2.0.3.0.so
 lib/libwx_osx_cocoau_webview-3.2.0.so
 lib/libwx_osx_cocoau_webview-3.2.so
-lib/libwx_osx_cocoau_xrc-3.2.0.2.3.so
+lib/libwx_osx_cocoau_xrc-3.2.0.3.0.so
 lib/libwx_osx_cocoau_xrc-3.2.0.so
 lib/libwx_osx_cocoau_xrc-3.2.so
 lib/wx/config/osx_cocoa-unicode-3.2

Index: pkgsrc/x11/wxGTK32/distinfo
diff -u pkgsrc/x11/wxGTK32/distinfo:1.14 pkgsrc/x11/wxGTK32/distinfo:1.15
--- pkgsrc/x11/wxGTK32/distinfo:1.14    Sun Sep 15 10:32:50 2024
+++ pkgsrc/x11/wxGTK32/distinfo Thu Dec 26 18:10:23 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2024/09/15 10:32:50 wiz Exp $
+$NetBSD: distinfo,v 1.15 2024/12/26 18:10:23 adam Exp $
 
 BLAKE2s (wxWidgets-3.2.6.tar.bz2) = d307c29cd44780ea26d0795009a4c09556eeced9afd414c6dd4bdc5f10f51ed2
 SHA512 (wxWidgets-3.2.6.tar.bz2) = 87830a73df096ab35d4ff7e131872131153da76f76c58d70e57558915c3faea280af193104163ce24e9e249a62b8e65d19ebfa20046ce0d2c45b2368b108619f
@@ -7,5 +7,6 @@ SHA1 (patch-build_cmake_config.cmake) = 
 SHA1 (patch-build_cmake_install.cmake) = b14a0e4ddd52fd5d73c4453fa35e1db67c1c0806
 SHA1 (patch-build_cmake_utils_CMakeLists.txt) = dcf6165e260ed56a9908e9e3095c02d0537a4364
 SHA1 (patch-configure) = eff4bd9d747e7c36b410a129504d5eba7732d5a5
+SHA1 (patch-src_osx_carbon_dcscreen.cpp) = a9d4747bdd13e7b294fc6cb5c606be1fdd7507c6
 SHA1 (patch-src_unix_glegl.cpp) = 1610bc04a0f8155138b169eb68f4b03e60ccecd9
 SHA1 (patch-src_unix_utilsunx.cpp) = be61cc3931e8aa8cf790cfedf6f916a84970f074

Added files:

Index: pkgsrc/x11/wxGTK32/patches/patch-src_osx_carbon_dcscreen.cpp
diff -u /dev/null pkgsrc/x11/wxGTK32/patches/patch-src_osx_carbon_dcscreen.cpp:1.1
--- /dev/null   Thu Dec 26 18:10:23 2024
+++ pkgsrc/x11/wxGTK32/patches/patch-src_osx_carbon_dcscreen.cpp        Thu Dec 26 18:10:23 2024
@@ -0,0 +1,47 @@
+$NetBSD: patch-src_osx_carbon_dcscreen.cpp,v 1.1 2024/12/26 18:10:23 adam Exp $
+
+Fix wxOSX wxScreenDC compilation against SDK 15.0
+https://github.com/vadz/wxWidgets/commit/87617efbe1e840590db6040f0866d0ac9fdc6bcf
+
+--- src/osx/carbon/dcscreen.cpp.orig   2024-12-26 18:03:39.853800381 +0000
++++ src/osx/carbon/dcscreen.cpp
+@@ -14,6 +14,7 @@
+ #include "wx/osx/dcscreen.h"
+ 
+ #include "wx/osx/private.h"
++#include "wx/osx/private/available.h"
+ #include "wx/graphics.h"
+ 
+ wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
+@@ -69,14 +70,25 @@ wxBitmap wxScreenDCImpl::DoGetAsBitmap(c
+         srcRect = CGRectOffset( srcRect, -subrect->x, -subrect->y ) ;
+ 
+     CGImageRef image = NULL;
+-    
+-    image = CGDisplayCreateImage(kCGDirectMainDisplay);
+ 
+-    wxASSERT_MSG(image, wxT("wxScreenDC::GetAsBitmap - unable to get screenshot."));
+-
+-    CGContextDrawImage(context, srcRect, image);
++#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 140000
++    if ( WX_IS_MACOS_AVAILABLE(14, 4) ) // errors on lower versions of macOS 14
++    {
++        // TODO add ScreenKit implementation
++    }
++    else
++#endif // macOS 10.14+
++    {
++#if __MAC_OS_X_VERSION_MAX_ALLOWED < 150000
++        image = CGDisplayCreateImage(kCGDirectMainDisplay);
++#endif
++    }
+ 
+-    CGImageRelease(image);
++    if ( image != NULL )
++    {
++        CGContextDrawImage(context, srcRect, image);
++        CGImageRelease(image);
++    }
+ 
+     CGContextRestoreGState(context);
+ #else