CVS commit: pkgsrc/x11/wxGTK31

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jun  7 18:48:34 UTC 2022

Modified Files:
        pkgsrc/x11/wxGTK31: Makefile PLIST PLIST.Darwin PLIST.gtk3 distinfo
        pkgsrc/x11/wxGTK31/patches: patch-configure patch-configure.in

Log Message:
wxGTK31: updated to 3.1.7

3.1.7

CMake build system improvements (better precompiled headers support).
New wxFileDialog customization API working with IFileDialog in wxMSW.
Many updated translations and new wxTRANSLATE_IN_CONTEXT().
Fixes for bad interactions with new macOS 12 features in wxOSX.
Several previously missing attributes added to multiple XRC handlers.
Row reordering by dragging and UI enhancements in wxGrid.
Ability to suppress selected (or all) GTK warning messages in wxGTK.
And many, many bugs fixes, including for the regressions in 3.1.6.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/wxGTK31/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/wxGTK31/PLIST \
    pkgsrc/x11/wxGTK31/PLIST.gtk3
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/wxGTK31/PLIST.Darwin
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/wxGTK31/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/wxGTK31/patches/patch-configure \
    pkgsrc/x11/wxGTK31/patches/patch-configure.in

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

Modified files:

Index: pkgsrc/x11/wxGTK31/Makefile
diff -u pkgsrc/x11/wxGTK31/Makefile:1.7 pkgsrc/x11/wxGTK31/Makefile:1.8
--- pkgsrc/x11/wxGTK31/Makefile:1.7     Mon May 30 16:31:10 2022
+++ pkgsrc/x11/wxGTK31/Makefile Tue Jun  7 18:48:34 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/05/30 16:31:10 adam Exp $
+# $NetBSD: Makefile,v 1.8 2022/06/07 18:48:34 adam Exp $
 
-DISTNAME=      wxWidgets-3.1.6
+DISTNAME=      wxWidgets-3.1.7
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK31/}
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wxWidgets/}

Index: pkgsrc/x11/wxGTK31/PLIST
diff -u pkgsrc/x11/wxGTK31/PLIST:1.2 pkgsrc/x11/wxGTK31/PLIST:1.3
--- pkgsrc/x11/wxGTK31/PLIST:1.2        Mon May 30 16:31:10 2022
+++ pkgsrc/x11/wxGTK31/PLIST    Tue Jun  7 18:48:34 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2022/05/30 16:31:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/06/07 18:48:34 adam Exp $
 bin/wx-config-3.1
 bin/wxrc-3.1
 include/wx-3.1/wx/aboutdlg.h
@@ -637,14 +637,14 @@ include/wx-3.1/wx/xtixml.h
 include/wx-3.1/wx/zipstrm.h
 include/wx-3.1/wx/zstream.h
 lib/libwx_baseu-3.1.so
-lib/libwx_baseu-3.1.so.6
-lib/libwx_baseu-3.1.so.6.0.0
+lib/libwx_baseu-3.1.so.7
+lib/libwx_baseu-3.1.so.7.0.0
 lib/libwx_baseu_net-3.1.so
-lib/libwx_baseu_net-3.1.so.6
-lib/libwx_baseu_net-3.1.so.6.0.0
+lib/libwx_baseu_net-3.1.so.7
+lib/libwx_baseu_net-3.1.so.7.0.0
 lib/libwx_baseu_xml-3.1.so
-lib/libwx_baseu_xml-3.1.so.6
-lib/libwx_baseu_xml-3.1.so.6.0.0
+lib/libwx_baseu_xml-3.1.so.7
+lib/libwx_baseu_xml-3.1.so.7.0.0
 libexec/wx-3.1/wx-config
 libexec/wx-3.1/wxrc
 libexec/wx-3.1/wxrc-3.1
Index: pkgsrc/x11/wxGTK31/PLIST.gtk3
diff -u pkgsrc/x11/wxGTK31/PLIST.gtk3:1.2 pkgsrc/x11/wxGTK31/PLIST.gtk3:1.3
--- pkgsrc/x11/wxGTK31/PLIST.gtk3:1.2   Mon May 30 16:31:10 2022
+++ pkgsrc/x11/wxGTK31/PLIST.gtk3       Tue Jun  7 18:48:34 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gtk3,v 1.2 2022/05/30 16:31:10 adam Exp $
+@comment $NetBSD: PLIST.gtk3,v 1.3 2022/06/07 18:48:34 adam Exp $
 include/wx-3.1/wx/generic/activityindicator.h
 include/wx-3.1/wx/generic/paletteg.h
 include/wx-3.1/wx/gtk/accel.h
@@ -95,40 +95,40 @@ include/wx-3.1/wx/unix/stdpaths.h
 include/wx-3.1/wx/unix/taskbarx11.h
 include/wx-3.1/wx/unix/utilsx11.h
 lib/libwx_gtk3u_adv-3.1.so
-lib/libwx_gtk3u_adv-3.1.so.6
-lib/libwx_gtk3u_adv-3.1.so.6.0.0
+lib/libwx_gtk3u_adv-3.1.so.7
+lib/libwx_gtk3u_adv-3.1.so.7.0.0
 lib/libwx_gtk3u_aui-3.1.so
-lib/libwx_gtk3u_aui-3.1.so.6
-lib/libwx_gtk3u_aui-3.1.so.6.0.0
+lib/libwx_gtk3u_aui-3.1.so.7
+lib/libwx_gtk3u_aui-3.1.so.7.0.0
 lib/libwx_gtk3u_core-3.1.so
-lib/libwx_gtk3u_core-3.1.so.6
-lib/libwx_gtk3u_core-3.1.so.6.0.0
+lib/libwx_gtk3u_core-3.1.so.7
+lib/libwx_gtk3u_core-3.1.so.7.0.0
 lib/libwx_gtk3u_gl-3.1.so
-lib/libwx_gtk3u_gl-3.1.so.6
-lib/libwx_gtk3u_gl-3.1.so.6.0.0
+lib/libwx_gtk3u_gl-3.1.so.7
+lib/libwx_gtk3u_gl-3.1.so.7.0.0
 lib/libwx_gtk3u_html-3.1.so
-lib/libwx_gtk3u_html-3.1.so.6
-lib/libwx_gtk3u_html-3.1.so.6.0.0
+lib/libwx_gtk3u_html-3.1.so.7
+lib/libwx_gtk3u_html-3.1.so.7.0.0
 lib/libwx_gtk3u_media-3.1.so
-lib/libwx_gtk3u_media-3.1.so.6
-lib/libwx_gtk3u_media-3.1.so.6.0.0
+lib/libwx_gtk3u_media-3.1.so.7
+lib/libwx_gtk3u_media-3.1.so.7.0.0
 lib/libwx_gtk3u_propgrid-3.1.so
-lib/libwx_gtk3u_propgrid-3.1.so.6
-lib/libwx_gtk3u_propgrid-3.1.so.6.0.0
+lib/libwx_gtk3u_propgrid-3.1.so.7
+lib/libwx_gtk3u_propgrid-3.1.so.7.0.0
 lib/libwx_gtk3u_qa-3.1.so
-lib/libwx_gtk3u_qa-3.1.so.6
-lib/libwx_gtk3u_qa-3.1.so.6.0.0
+lib/libwx_gtk3u_qa-3.1.so.7
+lib/libwx_gtk3u_qa-3.1.so.7.0.0
 lib/libwx_gtk3u_ribbon-3.1.so
-lib/libwx_gtk3u_ribbon-3.1.so.6
-lib/libwx_gtk3u_ribbon-3.1.so.6.0.0
+lib/libwx_gtk3u_ribbon-3.1.so.7
+lib/libwx_gtk3u_ribbon-3.1.so.7.0.0
 lib/libwx_gtk3u_richtext-3.1.so
-lib/libwx_gtk3u_richtext-3.1.so.6
-lib/libwx_gtk3u_richtext-3.1.so.6.0.0
+lib/libwx_gtk3u_richtext-3.1.so.7
+lib/libwx_gtk3u_richtext-3.1.so.7.0.0
 lib/libwx_gtk3u_stc-3.1.so
-lib/libwx_gtk3u_stc-3.1.so.6
-lib/libwx_gtk3u_stc-3.1.so.6.0.0
+lib/libwx_gtk3u_stc-3.1.so.7
+lib/libwx_gtk3u_stc-3.1.so.7.0.0
 lib/libwx_gtk3u_xrc-3.1.so
-lib/libwx_gtk3u_xrc-3.1.so.6
-lib/libwx_gtk3u_xrc-3.1.so.6.0.0
+lib/libwx_gtk3u_xrc-3.1.so.7
+lib/libwx_gtk3u_xrc-3.1.so.7.0.0
 lib/wx/config/gtk3-unicode-3.1
 lib/wx/include/gtk3-unicode-3.1/wx/setup.h

Index: pkgsrc/x11/wxGTK31/PLIST.Darwin
diff -u pkgsrc/x11/wxGTK31/PLIST.Darwin:1.1 pkgsrc/x11/wxGTK31/PLIST.Darwin:1.2
--- pkgsrc/x11/wxGTK31/PLIST.Darwin:1.1 Mon May 30 16:31:10 2022
+++ pkgsrc/x11/wxGTK31/PLIST.Darwin     Tue Jun  7 18:48:34 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2022/05/30 16:31:10 adam Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.2 2022/06/07 18:48:34 adam Exp $
 include/wx-3.1/wx/generic/clrpickerg.h
 include/wx-3.1/wx/generic/collpaneg.h
 include/wx-3.1/wx/generic/colrdlgg.h
@@ -114,43 +114,43 @@ include/wx-3.1/wx/osx/webview_webkit.h
 include/wx-3.1/wx/osx/webviewhistoryitem_webkit.h
 include/wx-3.1/wx/osx/window.h
 lib/libwx_osx_cocoau_adv-3.1.so
-lib/libwx_osx_cocoau_adv-3.1.so.6
-lib/libwx_osx_cocoau_adv-3.1.so.6.0.0
+lib/libwx_osx_cocoau_adv-3.1.so.7
+lib/libwx_osx_cocoau_adv-3.1.so.7.0.0
 lib/libwx_osx_cocoau_aui-3.1.so
-lib/libwx_osx_cocoau_aui-3.1.so.6
-lib/libwx_osx_cocoau_aui-3.1.so.6.0.0
+lib/libwx_osx_cocoau_aui-3.1.so.7
+lib/libwx_osx_cocoau_aui-3.1.so.7.0.0
 lib/libwx_osx_cocoau_core-3.1.so
-lib/libwx_osx_cocoau_core-3.1.so.6
-lib/libwx_osx_cocoau_core-3.1.so.6.0.0
+lib/libwx_osx_cocoau_core-3.1.so.7
+lib/libwx_osx_cocoau_core-3.1.so.7.0.0
 lib/libwx_osx_cocoau_gl-3.1.so
-lib/libwx_osx_cocoau_gl-3.1.so.6
-lib/libwx_osx_cocoau_gl-3.1.so.6.0.0
+lib/libwx_osx_cocoau_gl-3.1.so.7
+lib/libwx_osx_cocoau_gl-3.1.so.7.0.0
 lib/libwx_osx_cocoau_html-3.1.so
-lib/libwx_osx_cocoau_html-3.1.so.6
-lib/libwx_osx_cocoau_html-3.1.so.6.0.0
+lib/libwx_osx_cocoau_html-3.1.so.7
+lib/libwx_osx_cocoau_html-3.1.so.7.0.0
 lib/libwx_osx_cocoau_media-3.1.so
-lib/libwx_osx_cocoau_media-3.1.so.6
-lib/libwx_osx_cocoau_media-3.1.so.6.0.0
+lib/libwx_osx_cocoau_media-3.1.so.7
+lib/libwx_osx_cocoau_media-3.1.so.7.0.0
 lib/libwx_osx_cocoau_propgrid-3.1.so
-lib/libwx_osx_cocoau_propgrid-3.1.so.6
-lib/libwx_osx_cocoau_propgrid-3.1.so.6.0.0
+lib/libwx_osx_cocoau_propgrid-3.1.so.7
+lib/libwx_osx_cocoau_propgrid-3.1.so.7.0.0
 lib/libwx_osx_cocoau_qa-3.1.so
-lib/libwx_osx_cocoau_qa-3.1.so.6
-lib/libwx_osx_cocoau_qa-3.1.so.6.0.0
+lib/libwx_osx_cocoau_qa-3.1.so.7
+lib/libwx_osx_cocoau_qa-3.1.so.7.0.0
 lib/libwx_osx_cocoau_ribbon-3.1.so
-lib/libwx_osx_cocoau_ribbon-3.1.so.6
-lib/libwx_osx_cocoau_ribbon-3.1.so.6.0.0
+lib/libwx_osx_cocoau_ribbon-3.1.so.7
+lib/libwx_osx_cocoau_ribbon-3.1.so.7.0.0
 lib/libwx_osx_cocoau_richtext-3.1.so
-lib/libwx_osx_cocoau_richtext-3.1.so.6
-lib/libwx_osx_cocoau_richtext-3.1.so.6.0.0
+lib/libwx_osx_cocoau_richtext-3.1.so.7
+lib/libwx_osx_cocoau_richtext-3.1.so.7.0.0
 lib/libwx_osx_cocoau_stc-3.1.so
-lib/libwx_osx_cocoau_stc-3.1.so.6
-lib/libwx_osx_cocoau_stc-3.1.so.6.0.0
+lib/libwx_osx_cocoau_stc-3.1.so.7
+lib/libwx_osx_cocoau_stc-3.1.so.7.0.0
 lib/libwx_osx_cocoau_webview-3.1.so
-lib/libwx_osx_cocoau_webview-3.1.so.6
-lib/libwx_osx_cocoau_webview-3.1.so.6.0.0
+lib/libwx_osx_cocoau_webview-3.1.so.7
+lib/libwx_osx_cocoau_webview-3.1.so.7.0.0
 lib/libwx_osx_cocoau_xrc-3.1.so
-lib/libwx_osx_cocoau_xrc-3.1.so.6
-lib/libwx_osx_cocoau_xrc-3.1.so.6.0.0
+lib/libwx_osx_cocoau_xrc-3.1.so.7
+lib/libwx_osx_cocoau_xrc-3.1.so.7.0.0
 lib/wx/config/osx_cocoa-unicode-3.1
 lib/wx/include/osx_cocoa-unicode-3.1/wx/setup.h

Index: pkgsrc/x11/wxGTK31/distinfo
diff -u pkgsrc/x11/wxGTK31/distinfo:1.4 pkgsrc/x11/wxGTK31/distinfo:1.5
--- pkgsrc/x11/wxGTK31/distinfo:1.4     Mon May 30 16:31:10 2022
+++ pkgsrc/x11/wxGTK31/distinfo Tue Jun  7 18:48:34 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2022/05/30 16:31:10 adam Exp $
+$NetBSD: distinfo,v 1.5 2022/06/07 18:48:34 adam Exp $
 
-BLAKE2s (wxWidgets-3.1.6.tar.bz2) = 93c2be721610aa273a1b209e6b9426ef27cec1d5a0ad7763f3d48db5d4871939
-SHA512 (wxWidgets-3.1.6.tar.bz2) = c55f8ecb62bc47c053e24fa8c5cbb744afe4c4b00a3fae760035c539499b3875cabfb5c4542d721efec83464f48925fdd05b7d9ca624b430567c0b579afa7277
-Size (wxWidgets-3.1.6.tar.bz2) = 25194403 bytes
-SHA1 (patch-configure) = e6c3f2d03fd6cdc889d3c9fc701daf8d70f2b216
-SHA1 (patch-configure.in) = 88838768b965341a80468008f9fc5cc431a0e821
+BLAKE2s (wxWidgets-3.1.7.tar.bz2) = 02b93b7ffa856eb6bd5a57a81aff268085556f44445d6de4c5c9e9d8c72591a1
+SHA512 (wxWidgets-3.1.7.tar.bz2) = 1e81ac2ac9f762fb2820521b858ee5e8431003fa5a2ca5dab6b13fa60937aef2396cd9ddb6cb003d13c97183cb938185090adbe2fa76bed75cf4e4ade396fd6c
+Size (wxWidgets-3.1.7.tar.bz2) = 25380640 bytes
+SHA1 (patch-configure) = f8afa1926f3dc302272d83d026ae1dd15b586eae
+SHA1 (patch-configure.in) = 5c099baf9e14896514110467e40792dbc91338b6
 SHA1 (patch-src_unix_uilocale.cpp) = 48668890bcc90f77fdbb62ad50a15fc387275f6a

Index: pkgsrc/x11/wxGTK31/patches/patch-configure
diff -u pkgsrc/x11/wxGTK31/patches/patch-configure:1.2 pkgsrc/x11/wxGTK31/patches/patch-configure:1.3
--- pkgsrc/x11/wxGTK31/patches/patch-configure:1.2      Mon May 30 16:31:11 2022
+++ pkgsrc/x11/wxGTK31/patches/patch-configure  Tue Jun  7 18:48:34 2022
@@ -1,19 +1,28 @@
-$NetBSD: patch-configure,v 1.2 2022/05/30 16:31:11 adam Exp $
+$NetBSD: patch-configure,v 1.3 2022/06/07 18:48:34 adam Exp $
 
-Fix shell script portability
-tweak SEARCH_LIB
+Tweak SEARCH_LIB.
+On Darwin, do not run install_name_tool - libs should alredy have correct id.
 
---- configure.orig     2022-04-04 13:41:33.000000000 +0000
+--- configure.orig     2022-06-06 14:23:45.000000000 +0000
 +++ configure
-@@ -33861,7 +33861,6 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -25384,7 +25384,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_std_libfullpath" >&5
+ $as_echo "$wx_cv_std_libfullpath" >&6; }
+ 
+-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath"
++SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath @PREFIX@/lib"
+ 
+ if test "$build" != "$host" -a "$GCC" = yes; then
+                     if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+@@ -33927,7 +33927,6 @@ rm -f core conftest.err conftest.$ac_obj
        *-*-darwin* )
          install_name_tool=`which ${HOST_PREFIX}install_name_tool`
          if test "$install_name_tool" -a -x "$install_name_tool"; then
 -            DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
- libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
-@@ -44075,7 +44074,8 @@ fi
+ libnames=\`cd lib ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
+@@ -44041,7 +44040,8 @@ fi
        *-*-solaris2* )
          SONAME_FLAG="-h "
          USE_SOVERSION=1
Index: pkgsrc/x11/wxGTK31/patches/patch-configure.in
diff -u pkgsrc/x11/wxGTK31/patches/patch-configure.in:1.2 pkgsrc/x11/wxGTK31/patches/patch-configure.in:1.3
--- pkgsrc/x11/wxGTK31/patches/patch-configure.in:1.2   Mon May 30 16:31:11 2022
+++ pkgsrc/x11/wxGTK31/patches/patch-configure.in       Tue Jun  7 18:48:34 2022
@@ -1,13 +1,11 @@
-$NetBSD: patch-configure.in,v 1.2 2022/05/30 16:31:11 adam Exp $
+$NetBSD: patch-configure.in,v 1.3 2022/06/07 18:48:34 adam Exp $
 
-XXX
-https://trac.wxwidgets.org/ticket/18198
+Tweak SEARCH_LIB.
+On Darwin, do not run install_name_tool - libs should alredy have correct id.
 
-tweak SEARCH_LIB
-
---- configure.in.orig  2022-04-04 13:41:33.000000000 +0000
+--- configure.in.orig  2022-06-06 14:23:45.000000000 +0000
 +++ configure.in
-@@ -2270,7 +2270,7 @@ fi
+@@ -2273,7 +2273,7 @@ fi
  
  AC_MSG_RESULT($wx_cv_std_libfullpath)
  
@@ -16,11 +14,11 @@ tweak SEARCH_LIB
  
  dnl Cross compiling with gcc?
  if test "$build" != "$host" -a "$GCC" = yes; then
-@@ -4024,7 +4024,6 @@ if test "$wxUSE_SHARED" = "yes"; then
+@@ -4035,7 +4035,6 @@ if test "$wxUSE_SHARED" = "yes"; then
        *-*-darwin* )
          install_name_tool=`which ${HOST_PREFIX}install_name_tool`
          if test "$install_name_tool" -a -x "$install_name_tool"; then
 -            DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
- libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
+ libnames=\`cd lib ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`