CVS commit: pkgsrc/x11/wxGTK32

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/wxGTK32
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 6 Oct 2022 19:35:04 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Oct  6 19:35:04 UTC 2022

Modified Files:
        pkgsrc/x11/wxGTK32: Makefile PLIST PLIST.Darwin buildlink3.mk distinfo
        pkgsrc/x11/wxGTK32/patches: patch-build_cmake_install.cmake
            patch-build_cmake_utils_CMakeLists.txt
Removed Files:
        pkgsrc/x11/wxGTK32/patches: patch-build_cmake_init.cmake
            patch-build_cmake_lib_base_CMakeLists.txt
            patch-build_cmake_setup.cmake patch-configure patch-configure.in
            patch-src_unix_dialup.cpp

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/wxGTK32/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/wxGTK32/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/wxGTK32/PLIST.Darwin \
    pkgsrc/x11/wxGTK32/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/wxGTK32/distinfo
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/x11/wxGTK32/patches/patch-build_cmake_init.cmake \
    pkgsrc/x11/wxGTK32/patches/patch-configure \
    pkgsrc/x11/wxGTK32/patches/patch-configure.in
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake \
    pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/wxGTK32/patches/patch-build_cmake_lib_base_CMakeLists.txt \
    pkgsrc/x11/wxGTK32/patches/patch-build_cmake_setup.cmake \
    pkgsrc/x11/wxGTK32/patches/patch-src_unix_dialup.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/Makefile
diff -u pkgsrc/x11/wxGTK32/Makefile:1.17 pkgsrc/x11/wxGTK32/Makefile:1.18
--- pkgsrc/x11/wxGTK32/Makefile:1.17    Sun Oct  2 11:33:43 2022
+++ pkgsrc/x11/wxGTK32/Makefile Thu Oct  6 19:35:04 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2022/10/02 11:33:43 rhialto Exp $
+# $NetBSD: Makefile,v 1.18 2022/10/06 19:35:04 adam Exp $
 
-DISTNAME=      wxWidgets-3.2.0
+DISTNAME=      wxWidgets-3.2.1
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK32/}
-PKGREVISION=   7
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wxWidgets/}
 GITHUB_PROJECT=        wxWidgets
@@ -115,7 +114,7 @@ post-build:
        # So instead, we do:
        for f in ${WRKSRC}/locale/*.po; do \
          lang=`basename $${f} .po`; \
-         ${TOOLS_PATH.msgfmt:Q} -c -o "${WRKSRC}/locale/$${lang}.mo" "$${f}"; \
+         ${TOOLS_PATH.msgfmt} -c -o "${WRKSRC}/locale/$${lang}.mo" "$${f}"; \
        done
 
 post-install:

Index: pkgsrc/x11/wxGTK32/PLIST
diff -u pkgsrc/x11/wxGTK32/PLIST:1.5 pkgsrc/x11/wxGTK32/PLIST:1.6
--- pkgsrc/x11/wxGTK32/PLIST:1.5        Mon Aug  8 10:39:46 2022
+++ pkgsrc/x11/wxGTK32/PLIST    Thu Oct  6 19:35:04 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2022/08/08 10:39:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/10/06 19:35:04 adam Exp $
 bin/wx-config-3.2
 bin/wxrc-3.2
 include/wx-3.2/wx/aboutdlg.h
@@ -639,52 +639,52 @@ include/wx-3.2/wx/zipstrm.h
 include/wx-3.2/wx/zstream.h
 lib/libwx_baseu-3.2.so
 lib/libwx_baseu-3.2.so.0
-lib/libwx_baseu-3.2.so.0.0.0
+lib/libwx_baseu-3.2.so.0.1.0
 lib/libwx_baseu_net-3.2.so
 lib/libwx_baseu_net-3.2.so.0
-lib/libwx_baseu_net-3.2.so.0.0.0
+lib/libwx_baseu_net-3.2.so.0.1.0
 lib/libwx_baseu_xml-3.2.so
 lib/libwx_baseu_xml-3.2.so.0
-lib/libwx_baseu_xml-3.2.so.0.0.0
+lib/libwx_baseu_xml-3.2.so.0.1.0
 lib/libwx_gtk3u_adv-3.2.so
 lib/libwx_gtk3u_adv-3.2.so.0
-lib/libwx_gtk3u_adv-3.2.so.0.0.0
+lib/libwx_gtk3u_adv-3.2.so.0.1.0
 lib/libwx_gtk3u_aui-3.2.so
 lib/libwx_gtk3u_aui-3.2.so.0
-lib/libwx_gtk3u_aui-3.2.so.0.0.0
+lib/libwx_gtk3u_aui-3.2.so.0.1.0
 lib/libwx_gtk3u_core-3.2.so
 lib/libwx_gtk3u_core-3.2.so.0
-lib/libwx_gtk3u_core-3.2.so.0.0.0
+lib/libwx_gtk3u_core-3.2.so.0.1.0
 lib/libwx_gtk3u_gl-3.2.so
 lib/libwx_gtk3u_gl-3.2.so.0
-lib/libwx_gtk3u_gl-3.2.so.0.0.0
+lib/libwx_gtk3u_gl-3.2.so.0.1.0
 lib/libwx_gtk3u_html-3.2.so
 lib/libwx_gtk3u_html-3.2.so.0
-lib/libwx_gtk3u_html-3.2.so.0.0.0
+lib/libwx_gtk3u_html-3.2.so.0.1.0
 lib/libwx_gtk3u_media-3.2.so
 lib/libwx_gtk3u_media-3.2.so.0
-lib/libwx_gtk3u_media-3.2.so.0.0.0
+lib/libwx_gtk3u_media-3.2.so.0.1.0
 lib/libwx_gtk3u_propgrid-3.2.so
 lib/libwx_gtk3u_propgrid-3.2.so.0
-lib/libwx_gtk3u_propgrid-3.2.so.0.0.0
+lib/libwx_gtk3u_propgrid-3.2.so.0.1.0
 lib/libwx_gtk3u_qa-3.2.so
 lib/libwx_gtk3u_qa-3.2.so.0
-lib/libwx_gtk3u_qa-3.2.so.0.0.0
+lib/libwx_gtk3u_qa-3.2.so.0.1.0
 lib/libwx_gtk3u_ribbon-3.2.so
 lib/libwx_gtk3u_ribbon-3.2.so.0
-lib/libwx_gtk3u_ribbon-3.2.so.0.0.0
+lib/libwx_gtk3u_ribbon-3.2.so.0.1.0
 lib/libwx_gtk3u_richtext-3.2.so
 lib/libwx_gtk3u_richtext-3.2.so.0
-lib/libwx_gtk3u_richtext-3.2.so.0.0.0
+lib/libwx_gtk3u_richtext-3.2.so.0.1.0
 lib/libwx_gtk3u_stc-3.2.so
 lib/libwx_gtk3u_stc-3.2.so.0
-lib/libwx_gtk3u_stc-3.2.so.0.0.0
+lib/libwx_gtk3u_stc-3.2.so.0.1.0
 lib/libwx_gtk3u_webview-3.2.so
 lib/libwx_gtk3u_webview-3.2.so.0
-lib/libwx_gtk3u_webview-3.2.so.0.0.0
+lib/libwx_gtk3u_webview-3.2.so.0.1.0
 lib/libwx_gtk3u_xrc-3.2.so
 lib/libwx_gtk3u_xrc-3.2.so.0
-lib/libwx_gtk3u_xrc-3.2.so.0.0.0
+lib/libwx_gtk3u_xrc-3.2.so.0.1.0
 libexec/wx-3.2/wx-config
 libexec/wx-3.2/wxrc
 libexec/wx-3.2/wxrc-3.2

Index: pkgsrc/x11/wxGTK32/PLIST.Darwin
diff -u pkgsrc/x11/wxGTK32/PLIST.Darwin:1.2 pkgsrc/x11/wxGTK32/PLIST.Darwin:1.3
--- pkgsrc/x11/wxGTK32/PLIST.Darwin:1.2 Mon Aug  8 10:39:46 2022
+++ pkgsrc/x11/wxGTK32/PLIST.Darwin     Thu Oct  6 19:35:04 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2022/08/08 10:39:46 wiz Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.3 2022/10/06 19:35:04 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,44 +113,44 @@ 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.0.0.dylib
-lib/libwx_osx_cocoau_adv-3.2.0.dylib
-lib/libwx_osx_cocoau_adv-3.2.dylib
-lib/libwx_osx_cocoau_aui-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_aui-3.2.0.dylib
-lib/libwx_osx_cocoau_aui-3.2.dylib
-lib/libwx_osx_cocoau_core-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_core-3.2.0.dylib
-lib/libwx_osx_cocoau_core-3.2.dylib
-lib/libwx_osx_cocoau_gl-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_gl-3.2.0.dylib
-lib/libwx_osx_cocoau_gl-3.2.dylib
-lib/libwx_osx_cocoau_html-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_html-3.2.0.dylib
-lib/libwx_osx_cocoau_html-3.2.dylib
-lib/libwx_osx_cocoau_media-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_media-3.2.0.dylib
-lib/libwx_osx_cocoau_media-3.2.dylib
-lib/libwx_osx_cocoau_propgrid-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_propgrid-3.2.0.dylib
-lib/libwx_osx_cocoau_propgrid-3.2.dylib
-lib/libwx_osx_cocoau_qa-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_qa-3.2.0.dylib
-lib/libwx_osx_cocoau_qa-3.2.dylib
-lib/libwx_osx_cocoau_ribbon-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_ribbon-3.2.0.dylib
-lib/libwx_osx_cocoau_ribbon-3.2.dylib
-lib/libwx_osx_cocoau_richtext-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_richtext-3.2.0.dylib
-lib/libwx_osx_cocoau_richtext-3.2.dylib
-lib/libwx_osx_cocoau_stc-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_stc-3.2.0.dylib
-lib/libwx_osx_cocoau_stc-3.2.dylib
-lib/libwx_osx_cocoau_webview-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_webview-3.2.0.dylib
-lib/libwx_osx_cocoau_webview-3.2.dylib
-lib/libwx_osx_cocoau_xrc-3.2.0.0.0.dylib
-lib/libwx_osx_cocoau_xrc-3.2.0.dylib
-lib/libwx_osx_cocoau_xrc-3.2.dylib
+lib/libwx_osx_cocoau_adv-3.2.so
+lib/libwx_osx_cocoau_adv-3.2.so.0
+lib/libwx_osx_cocoau_adv-3.2.so.0.1.0
+lib/libwx_osx_cocoau_aui-3.2.so
+lib/libwx_osx_cocoau_aui-3.2.so.0
+lib/libwx_osx_cocoau_aui-3.2.so.0.1.0
+lib/libwx_osx_cocoau_core-3.2.so
+lib/libwx_osx_cocoau_core-3.2.so.0
+lib/libwx_osx_cocoau_core-3.2.so.0.1.0
+lib/libwx_osx_cocoau_gl-3.2.so
+lib/libwx_osx_cocoau_gl-3.2.so.0
+lib/libwx_osx_cocoau_gl-3.2.so.0.1.0
+lib/libwx_osx_cocoau_html-3.2.so
+lib/libwx_osx_cocoau_html-3.2.so.0
+lib/libwx_osx_cocoau_html-3.2.so.0.1.0
+lib/libwx_osx_cocoau_media-3.2.so
+lib/libwx_osx_cocoau_media-3.2.so.0
+lib/libwx_osx_cocoau_media-3.2.so.0.1.0
+lib/libwx_osx_cocoau_propgrid-3.2.so
+lib/libwx_osx_cocoau_propgrid-3.2.so.0
+lib/libwx_osx_cocoau_propgrid-3.2.so.0.1.0
+lib/libwx_osx_cocoau_qa-3.2.so
+lib/libwx_osx_cocoau_qa-3.2.so.0
+lib/libwx_osx_cocoau_qa-3.2.so.0.1.0
+lib/libwx_osx_cocoau_ribbon-3.2.so
+lib/libwx_osx_cocoau_ribbon-3.2.so.0
+lib/libwx_osx_cocoau_ribbon-3.2.so.0.1.0
+lib/libwx_osx_cocoau_richtext-3.2.so
+lib/libwx_osx_cocoau_richtext-3.2.so.0
+lib/libwx_osx_cocoau_richtext-3.2.so.0.1.0
+lib/libwx_osx_cocoau_stc-3.2.so
+lib/libwx_osx_cocoau_stc-3.2.so.0
+lib/libwx_osx_cocoau_stc-3.2.so.0.1.0
+lib/libwx_osx_cocoau_webview-3.2.so
+lib/libwx_osx_cocoau_webview-3.2.so.0
+lib/libwx_osx_cocoau_webview-3.2.so.0.1.0
+lib/libwx_osx_cocoau_xrc-3.2.so
+lib/libwx_osx_cocoau_xrc-3.2.so.0
+lib/libwx_osx_cocoau_xrc-3.2.so.0.1.0
 lib/wx/config/osx_cocoa-unicode-3.2
 lib/wx/include/osx_cocoa-unicode-3.2/wx/setup.h
Index: pkgsrc/x11/wxGTK32/buildlink3.mk
diff -u pkgsrc/x11/wxGTK32/buildlink3.mk:1.2 pkgsrc/x11/wxGTK32/buildlink3.mk:1.3
--- pkgsrc/x11/wxGTK32/buildlink3.mk:1.2        Thu Aug 11 05:09:34 2022
+++ pkgsrc/x11/wxGTK32/buildlink3.mk    Thu Oct  6 19:35:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2022/08/11 05:09:34 gutteridge Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/10/06 19:35:04 adam Exp $
 
 BUILDLINK_TREE+=       wxGTK32
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        wxGTK32
 WXGTK32_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wxGTK32+=        wxGTK32>=3.2
-BUILDLINK_ABI_DEPENDS.wxGTK32?=        wxGTK32>=3.2.0nb5
+BUILDLINK_ABI_DEPENDS.wxGTK32+=        wxGTK32>=3.2.0nb5
 BUILDLINK_PKGSRCDIR.wxGTK32?=  ../../x11/wxGTK32
 
 BUILDLINK_INCDIRS.wxGTK32+=    include/wx-3.2

Index: pkgsrc/x11/wxGTK32/distinfo
diff -u pkgsrc/x11/wxGTK32/distinfo:1.6 pkgsrc/x11/wxGTK32/distinfo:1.7
--- pkgsrc/x11/wxGTK32/distinfo:1.6     Wed Aug 10 05:19:57 2022
+++ pkgsrc/x11/wxGTK32/distinfo Thu Oct  6 19:35:04 2022
@@ -1,15 +1,9 @@
-$NetBSD: distinfo,v 1.6 2022/08/10 05:19:57 dbj Exp $
+$NetBSD: distinfo,v 1.7 2022/10/06 19:35:04 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
+BLAKE2s (wxWidgets-3.2.1.tar.bz2) = 0e411f31a9d91a87187f32b56eeba70298d923f0b5de0ebd125c70b7bbd0e33c
+SHA512 (wxWidgets-3.2.1.tar.bz2) = d0294788891014672d8eb4501ae257598972407b53f38471e4f11dd20f517d0145d510c5bce006b09c5d63113fed844bdf6124b3c80453c1d37b402abc89202b
+Size (wxWidgets-3.2.1.tar.bz2) = 27266651 bytes
 SHA1 (patch-build_cmake_config.cmake) = 5d5b37a7a0811ac7732db5cc071813784ee3d3d6
-SHA1 (patch-build_cmake_init.cmake) = 341f632aa7062af4c5bc4ca2695f59d2b7254ede
-SHA1 (patch-build_cmake_install.cmake) = 4b228cbab621ef98d93ccd2c338b7e0e9d53a9ad
-SHA1 (patch-build_cmake_lib_base_CMakeLists.txt) = bec7be2f64bb4629a60d2b4f169e8feb215408e3
-SHA1 (patch-build_cmake_setup.cmake) = 277ae3c5bf4f04d057402f0b626d09d1e9749ca8
-SHA1 (patch-build_cmake_utils_CMakeLists.txt) = 44efa30750b2a6048c0c32bf16d4825c4cb9d790
-SHA1 (patch-configure) = 679580bee6373fd63968f0ee75934cdfc42bd3b8
-SHA1 (patch-configure.in) = 850221d02799cd875fe917f7e9c2994d0f89db29
-SHA1 (patch-src_unix_dialup.cpp) = 1c62d37508e45a0095ef062f7d450529e9b557e7
+SHA1 (patch-build_cmake_install.cmake) = b14a0e4ddd52fd5d73c4453fa35e1db67c1c0806
+SHA1 (patch-build_cmake_utils_CMakeLists.txt) = dcf6165e260ed56a9908e9e3095c02d0537a4364
 SHA1 (patch-src_unix_utilsunx.cpp) = be61cc3931e8aa8cf790cfedf6f916a84970f074

Index: pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake
diff -u pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake:1.2 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake:1.3
--- pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake:1.2      Wed Aug 10 05:19:57 2022
+++ pkgsrc/x11/wxGTK32/patches/patch-build_cmake_install.cmake  Thu Oct  6 19:35:04 2022
@@ -1,29 +1,25 @@
-$NetBSD: patch-build_cmake_install.cmake,v 1.2 2022/08/10 05:19:57 dbj Exp $
-
-Fix use of DESTDIR
-https://github.com/wxWidgets/wxWidgets/issues/22610
+$NetBSD: patch-build_cmake_install.cmake,v 1.3 2022/10/06 19:35:04 adam Exp $
 
 Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin
 
---- build/cmake/install.cmake.orig     2022-07-06 14:19:50.000000000 +0000
+--- build/cmake/install.cmake.orig     2022-09-05 18:36:11.000000000 +0000
 +++ build/cmake/install.cmake
-@@ -39,11 +39,13 @@ else()
+@@ -39,11 +39,12 @@ else()
                      WORLD_EXECUTE WORLD_READ
          )
  
 -    install(DIRECTORY DESTINATION "bin")
 +    include(GNUInstallDirs)
-+
 +    install(DIRECTORY DESTINATION "${CMAKE_INSTALL_BINDIR}")
      install(CODE "execute_process( \
          COMMAND ${CMAKE_COMMAND} -E create_symlink \
-         ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \
--        ${CMAKE_INSTALL_PREFIX}/bin/wx-config \
+         \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \
+-        \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \
 +        \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wx-config\" \
          )"
      )
  endif()
-@@ -96,8 +98,8 @@ if(NOT TARGET ${UNINST_NAME})
+@@ -96,8 +97,8 @@ if(NOT TARGET ${UNINST_NAME})
          endif()
  
          set(WX_EXTRA_UNINSTALL_FILES
Index: pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt
diff -u pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt:1.2 pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt:1.3
--- pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt:1.2       Wed Aug 10 05:19:57 2022
+++ pkgsrc/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt   Thu Oct  6 19:35:04 2022
@@ -1,18 +1,14 @@
-$NetBSD: patch-build_cmake_utils_CMakeLists.txt,v 1.2 2022/08/10 05:19:57 dbj Exp $
-
-Fix use of DESTDIR
-https://github.com/wxWidgets/wxWidgets/issues/22610
+$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-07-06 14:19:50.000000000 +0000
+--- build/cmake/utils/CMakeLists.txt.orig      2022-09-29 16:26:19.000000000 +0000
 +++ build/cmake/utils/CMakeLists.txt
-@@ -25,22 +25,25 @@ if(wxUSE_XRC)
+@@ -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"
@@ -20,21 +16,14 @@ Respect ${CMAKE_INSTALL_BINDIR} instead 
 +        BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}"
          )
  
--    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( \
+     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} \
--            ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \
-+            ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/${wxrc_output_name}${EXE_SUFFIX} \
+-            \"${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}\" \
              )"
          )

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/lang/py-mypy
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/lang/py-mypy
Indexes:

Home | Main Index | Thread Index | Old Index