pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/wxGTK32 wxGTK32: updated to 3.2.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/203ce31fefbc
branches: trunk
changeset: 386365:203ce31fefbc
user: adam <adam%pkgsrc.org@localhost>
date: Thu Oct 06 19:35:04 2022 +0000
description:
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.
diffstat:
x11/wxGTK32/Makefile | 7 +-
x11/wxGTK32/PLIST | 34 ++--
x11/wxGTK32/PLIST.Darwin | 80 +++++-----
x11/wxGTK32/buildlink3.mk | 4 +-
x11/wxGTK32/distinfo | 18 +-
x11/wxGTK32/patches/patch-build_cmake_init.cmake | 29 ---
x11/wxGTK32/patches/patch-build_cmake_install.cmake | 16 +-
x11/wxGTK32/patches/patch-build_cmake_lib_base_CMakeLists.txt | 14 -
x11/wxGTK32/patches/patch-build_cmake_setup.cmake | 69 ---------
x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt | 31 +--
x11/wxGTK32/patches/patch-configure | 49 ------
x11/wxGTK32/patches/patch-configure.in | 33 ----
x11/wxGTK32/patches/patch-src_unix_dialup.cpp | 15 --
13 files changed, 84 insertions(+), 315 deletions(-)
diffs (truncated from 563 to 300 lines):
diff -r 81f7decd0a53 -r 203ce31fefbc x11/wxGTK32/Makefile
--- a/x11/wxGTK32/Makefile Thu Oct 06 14:31:14 2022 +0000
+++ b/x11/wxGTK32/Makefile Thu Oct 06 19:35:04 2022 +0000
@@ -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 @@
# 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:
diff -r 81f7decd0a53 -r 203ce31fefbc x11/wxGTK32/PLIST
--- a/x11/wxGTK32/PLIST Thu Oct 06 14:31:14 2022 +0000
+++ b/x11/wxGTK32/PLIST Thu Oct 06 19:35:04 2022 +0000
@@ -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/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
diff -r 81f7decd0a53 -r 203ce31fefbc x11/wxGTK32/PLIST.Darwin
--- a/x11/wxGTK32/PLIST.Darwin Thu Oct 06 14:31:14 2022 +0000
+++ b/x11/wxGTK32/PLIST.Darwin Thu Oct 06 19:35:04 2022 +0000
@@ -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/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
diff -r 81f7decd0a53 -r 203ce31fefbc x11/wxGTK32/buildlink3.mk
--- a/x11/wxGTK32/buildlink3.mk Thu Oct 06 14:31:14 2022 +0000
+++ b/x11/wxGTK32/buildlink3.mk Thu Oct 06 19:35:04 2022 +0000
@@ -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 @@
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
diff -r 81f7decd0a53 -r 203ce31fefbc x11/wxGTK32/distinfo
--- a/x11/wxGTK32/distinfo Thu Oct 06 14:31:14 2022 +0000
+++ b/x11/wxGTK32/distinfo Thu Oct 06 19:35:04 2022 +0000
@@ -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
diff -r 81f7decd0a53 -r 203ce31fefbc x11/wxGTK32/patches/patch-build_cmake_init.cmake
--- a/x11/wxGTK32/patches/patch-build_cmake_init.cmake Thu Oct 06 14:31:14 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-build_cmake_init.cmake,v 1.2 2022/07/29 18:36:06 wiz Exp $
-
-fix OpenGL detection
-https://github.com/wxWidgets/wxWidgets/issues/22649
-Patch from
-https://github.com/wxWidgets/wxWidgets/pull/22677/
-
---- build/cmake/init.cmake.orig 2022-07-29 18:21:12.340086310 +0000
-+++ build/cmake/init.cmake
-@@ -409,8 +409,18 @@ if(wxUSE_GUI)
- set(OPENGL_LIBRARIES "-framework OpenGLES" "-framework QuartzCore" "-framework GLKit")
- else()
- find_package(OpenGL)
-+ if(OPENGL_FOUND)
-+ foreach(gltarget OpenGL::GL OpenGL::GLU OpenGL::OpenGL)
-+ if(TARGET ${gltarget})
-+ set(OPENGL_LIBRARIES ${gltarget} ${OPENGL_LIBRARIES})
-+ endif()
-+ endforeach()
-+ endif()
- if(WXGTK3 AND OpenGL_EGL_FOUND AND wxUSE_GLCANVAS_EGL)
-- set(OPENGL_LIBRARIES OpenGL::OpenGL OpenGL::GLU OpenGL::EGL)
-+ if(TARGET OpenGL::EGL)
-+ set(OPENGL_LIBRARIES OpenGL::EGL ${OPENGL_LIBRARIES})
-+ endif()
-+ set(OPENGL_INCLUDE_DIR ${OPENGL_INCLUDE_DIR} ${OPENGL_EGL_INCLUDE_DIRS})
- find_package(WAYLANDEGL)
- if(WAYLANDEGL_FOUND AND wxHAVE_GDK_WAYLAND)
- list(APPEND OPENGL_LIBRARIES ${WAYLANDEGL_LIBRARIES})
diff -r 81f7decd0a53 -r 203ce31fefbc x11/wxGTK32/patches/patch-build_cmake_install.cmake
--- a/x11/wxGTK32/patches/patch-build_cmake_install.cmake Thu Oct 06 14:31:14 2022 +0000
+++ b/x11/wxGTK32/patches/patch-build_cmake_install.cmake Thu Oct 06 19:35:04 2022 +0000
@@ -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\" \
Home |
Main Index |
Thread Index |
Old Index