wxGTK32: simplify, add some upstream bug report URLs

diff --git a/wxGTK32/Makefile b/wxGTK32/Makefile
index e5dfbfb87454024cdb3168470f7ccb7be265db90..716b84ab4805c74094861f6a267686ec4992c9b3 100644 (file)
--- a/wxGTK32/Makefile
+++ b/wxGTK32/Makefile
@@ -17,15 +17,15 @@ LICENSE=    gnu-lgpl-v2
 USE_TOOLS+=            pkg-config msgfmt
 USE_CMAKE=             yes
 USE_LANGUAGES=         c c++
+CMAKE_ARGS+=           -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
 
 # didn't find all places hardcoding libdl, so force them away
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}
 
-#TO_UNWRAP=    ${DESTDIR}${PREFIX}/lib/wx/config/gtk3-unicode-3.2
-#TO_UNWRAP=    ${WRKSRC}/CMakeFiles/gtk3-unicode-3.2
 TO_UNWRAP=     ${WRKSRC}/lib/wx/config/gtk3-unicode-3.2
 
 # Installation rules in cmake are not using DESTDIR properly, do it manually
+# https://github.com/wxWidgets/wxWidgets/issues/22647
 # CMake Error: failed to create symbolic link '/usr/pkg/bin/wx-config': Permission denied
 # CMake Error: failed to create symbolic link '/usr/pkg/bin/wxrc': Permission denied
 post-install:
@@ -42,6 +42,7 @@ post-build:
 
 .include "../../mk/bsd.prefs.mk"
 
+# https://github.com/wxWidgets/wxWidgets/issues/22646
 .if ${OPSYS} != "Linux"
 CMAKE_ARGS+=           -DwxUSE_JOYSTICK:BOOL=OFF
 .endif

diff --git a/wxGTK32/distinfo b/wxGTK32/distinfo
index 4a81938ebb684a6552288db6acd68584ec33ada4..1272f1de022607d0acc00e4efba229dae6e8dd46 100644 (file)
--- a/wxGTK32/distinfo
+++ b/wxGTK32/distinfo
@@ -3,8 +3,6 @@ $NetBSD: distinfo,v 1.5 2022/06/07 18:48:34 adam Exp $
 BLAKE2s (wxWidgets-3.2.0.tar.bz2) = 4029147a8e77a22e0379eeda11bc26f8fee998862aaa52819adf16a8ed4860ea
 SHA512 (wxWidgets-3.2.0.tar.bz2) = e55e7c5ac7abcacf2ecff7c22e367db17ff5a077d3d5d2aa7589e8ba7cc6695cfa48c0f00bcfdffeda8dc4f974f97a857fb61b4b300a724f7687d710fbb23967
 Size (wxWidgets-3.2.0.tar.bz2) = 25296814 bytes
-SHA1 (patch-build_cmake_functions.cmake) = 86b2c62913b8db5bc1436cea5479f7e4bbbcf408
 SHA1 (patch-build_cmake_init.cmake) = e692fa357e9bbdfa2c5a81b38ddea9c799b462e9
-SHA1 (patch-build_cmake_lib_stc_CMakeLists.txt) = 696b656323a090ad8a59a7bc37eaf817efe3853a
-SHA1 (patch-build_cmake_setup.cmake) = 193d75fa45090f3a8803b74e21eb464c3eca42de
-SHA1 (patch-src_unix_dialup.cpp) = 63f4e5dc4cbb256067afaad8e44121d98af7ddd7
+SHA1 (patch-build_cmake_setup.cmake) = a3d99b0363a17ac80083126e1ccb1b8a9d29d679
+SHA1 (patch-src_unix_dialup.cpp) = 1c62d37508e45a0095ef062f7d450529e9b557e7

diff --git a/wxGTK32/patches/patch-build_cmake_functions.cmake b/wxGTK32/patches/patch-build_cmake_functions.cmake
deleted file mode 100644 (file)
index 7bb31a3..0000000
--- a/wxGTK32/patches/patch-build_cmake_functions.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Disable pre-compiled headers, don't generally work.
-
---- build/cmake/functions.cmake.orig   2022-07-06 14:19:50.000000000 +0000
-+++ build/cmake/functions.cmake
-@@ -436,7 +436,6 @@ macro(wx_add_library name)
-             RUNTIME DESTINATION "${runtime_dir}${GEN_EXPR_DIR}${wxPLATFORM_LIB_DIR}"
-             BUNDLE DESTINATION Applications/wxWidgets
-             )
--        wx_target_enable_precomp(${name} "${wxSOURCE_DIR}/include/wx/wxprec.h")
-     endif()
- endmacro()
- 
-@@ -865,7 +864,6 @@ function(wx_add name group)
-         set(APP_FOLDER ${group})
-     endif()
-     wx_set_common_target_properties(${target_name})
--    wx_target_enable_precomp(${target_name} "${wxSOURCE_DIR}/include/wx/wxprec.h")
-     set_target_properties(${target_name} PROPERTIES
-         FOLDER ${APP_FOLDER}
-         )

diff --git a/wxGTK32/patches/patch-build_cmake_lib_stc_CMakeLists.txt b/wxGTK32/patches/patch-build_cmake_lib_stc_CMakeLists.txt
deleted file mode 100644 (file)
index ad513e2..0000000
--- a/wxGTK32/patches/patch-build_cmake_lib_stc_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Disable pre-compiled headers, don't generally work.
-
---- build/cmake/lib/stc/CMakeLists.txt.orig    2022-07-06 14:19:50.000000000 +0000
-+++ build/cmake/lib/stc/CMakeLists.txt
-@@ -169,7 +169,6 @@ target_compile_definitions(wxscintilla P
-     LINK_LEXERS
- )
- 
--wx_target_enable_precomp(wxscintilla "${wxSOURCE_DIR}/src/stc/scintilla/include/Scintilla.h")
- wx_add_library(wxstc ${STC_FILES})
- wx_lib_include_directories(wxstc
-     ${wxSOURCE_DIR}/src/stc/scintilla/include

diff --git a/wxGTK32/patches/patch-build_cmake_setup.cmake b/wxGTK32/patches/patch-build_cmake_setup.cmake
index e69afdd353b8b78fee2db19a8275d85dce2d87ee..25b8a9a607aa6c56480a4fc9d0b9e0c283fbb210 100644 (file)
--- a/wxGTK32/patches/patch-build_cmake_setup.cmake
+++ b/wxGTK32/patches/patch-build_cmake_setup.cmake
@@ -1,7 +1,10 @@
 $NetBSD$
 
 Add statvfs() checks.
+https://github.com/wxWidgets/wxWidgets/pull/22643
+
 Use proper variable for dlopen() library.
+https://github.com/wxWidgets/wxWidgets/pull/22644
 
 --- build/cmake/setup.cmake.orig       2022-07-06 14:19:50.000000000 +0000
 +++ build/cmake/setup.cmake

diff --git a/wxGTK32/patches/patch-src_unix_dialup.cpp b/wxGTK32/patches/patch-src_unix_dialup.cpp
index 4561570ca145e3ec55dda830d988403bffd2dab5..e2481ca91580f9e3729d38fd298783218a7bec2b 100644 (file)
--- a/wxGTK32/patches/patch-src_unix_dialup.cpp
+++ b/wxGTK32/patches/patch-src_unix_dialup.cpp
@@ -1,6 +1,7 @@
 $NetBSD$
 
 Add NetBSD support.
+https://github.com/wxWidgets/wxWidgets/pull/22645
 
 --- src/unix/dialup.cpp.orig   2022-07-06 14:19:50.000000000 +0000
 +++ src/unix/dialup.cpp