head	1.4;
access;
symbols
	pkgsrc-2025Q4:1.3.0.26
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.24
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.22
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.20
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.18
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.16
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.14
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.12
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.10
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.8
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.6
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.4
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.2
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.2.0.2
	pkgsrc-2022Q3-base:1.2;
locks; strict;
comment	@# @;


1.4
date	2025.12.21.21.41.24;	author adam;	state dead;
branches;
next	1.3;
commitid	dFynm7b5czzB5knG;

1.3
date	2022.10.06.19.35.04;	author adam;	state Exp;
branches;
next	1.2;
commitid	YorvtDTOolkO3HWD;

1.2
date	2022.08.10.05.19.57;	author dbj;	state Exp;
branches;
next	1.1;
commitid	cOVzUBUFKNObaiPD;

1.1
date	2022.07.28.05.25.22;	author dbj;	state Exp;
branches;
next	;
commitid	MSO81nERaliXBCND;


desc
@@


1.4
log
@wxGTK32: removed unused patches
@
text
@$NetBSD: patch-build_cmake_utils_CMakeLists.txt,v 1.3 2022/10/06 19:35:04 adam Exp $

Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin

--- build/cmake/utils/CMakeLists.txt.orig	2022-09-29 16:26:19.000000000 +0000
+++ build/cmake/utils/CMakeLists.txt
@@@@ -25,9 +25,10 @@@@ if(wxUSE_XRC)
 
     set_target_properties(wxrc PROPERTIES FOLDER "Utilities")
 
+    include(GNUInstallDirs)
     wx_install(TARGETS wxrc
-        RUNTIME DESTINATION "bin"
-        BUNDLE DESTINATION "bin"
+        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+        BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}"
         )
 
     if(NOT WIN32_MSVC_NAMING AND wxBUILD_INSTALL)
@@@@ -40,8 +41,8 @@@@ if(wxUSE_XRC)
         # Don't use wx_install() here to preserve escaping.
         install(CODE "execute_process( \
             COMMAND ${CMAKE_COMMAND} -E create_symlink \
-            \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \
-            \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \
+            \"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/${wxrc_output_name}${EXE_SUFFIX}\" \
+            \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wxrc${EXE_SUFFIX}\" \
             )"
         )
     endif()
@


1.3
log
@wxGTK32: updated to 3.2.1

3.2.1

Coming soon after 3.2.0, this is mostly a bug fix release, with just one noteworthy new feature: the addition of wxFileDialog::AddShortcut() function. However it fixes some important regressions and other problems:

Fix crash in applications calling g_log_set_writer_func() with recent glib.
Several fixes to alpha channel handling in wxMSW bitmaps.
Generate key and focus events for wxSearchCtrl in wxOSX.
Fix creating wxRadioBox without any items in wxOSX.
Fix regression with AUI floating pane positioning.
Avoid new warnings given by gcc 12.
Fix building with MSVS 2022 standard-conforming preprocessor.
Work around MSVS 2022 optimizer bug that broke wxImage resizing.
NetBSD build fixes.
@
text
@d1 1
a1 1
$NetBSD: patch-build_cmake_utils_CMakeLists.txt,v 1.2 2022/08/10 05:19:57 dbj Exp $
@


1.2
log
@x11/wxGTK: have cmake include(GNUInstallDirs) when using ${CMAKE_INSTALL_BINDIR}
@
text
@d1 1
a1 4
$NetBSD: patch-build_cmake_utils_CMakeLists.txt,v 1.1 2022/07/28 05:25:22 dbj Exp $

Fix use of DESTDIR
https://github.com/wxWidgets/wxWidgets/issues/22610
d5 1
a5 1
--- build/cmake/utils/CMakeLists.txt.orig	2022-07-06 14:19:50.000000000 +0000
d7 1
a7 1
@@@@ -25,22 +25,25 @@@@ if(wxUSE_XRC)
a11 1
+
d19 4
a22 11
-    if(NOT WIN32_MSVC_NAMING)
+    if(NOT WIN32_MSVC_NAMING AND wxBUILD_INSTALL)
         if(IPHONE)
             set(EXE_SUFFIX ".app")
         else()
             set(EXE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX})
         endif()
 
-        wx_install(CODE "execute_process( \
+        # Don't use wx_install() here to preserve escaping.
+        install(CODE "execute_process( \
d24 3
a26 3
-            ${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \
-            ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
+            ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/${wxrc_output_name}${EXE_SUFFIX} \
@


1.1
log
@x11/wxGTK32: for cmake builds, install binaries into libexec/wx-3.2

this avoids conflicts with wxGTK28 and wxGTK30
take upstream patches for DESTDIR support
also respect CMAKE_INSTALL_BINDIR instead of assuming "bin"
@
text
@d1 1
a1 1
$NetBSD$
d8 1
a8 1
--- build/cmake/utils/CMakeLists.txt.orig	2022-07-28 04:31:27.000000000 +0000
d10 2
a11 1
@@@@ -26,21 +26,22 @@@@ if(wxUSE_XRC)
d14 2
@