summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2020-07-18 13:02:53 +0000
committeradam <adam@pkgsrc.org>2020-07-18 13:02:53 +0000
commitda3a895691da05602015749fab9b6e437f72555e (patch)
treec283b3c44b8e678c577fe113dd79d26493b68b6a /x11
parent2e0232bd97cb4fb5f4eba83923e524d86dff659b (diff)
downloadpkgsrc-da3a895691da05602015749fab9b6e437f72555e.tar.gz
wxGTK30: updated to 3.0.5.1
3.0.5.1 This is a patch release updating the soname of the shared libraries for Unix/ELF systems which was forgotten in 3.0.5. Because of this, please use the source archives from this release if you're building wxWidgets shared libraries from source under these systems, but please refer to 3.0.5 files for all the rest, i.e. MSW binaries and the documentation. For completeness, the only other changes compared to 3.0.5 are: - Workaround for the problem with overflowing maximum command line length in MinGW builds not using configure. - Fix for a problem with wxSpinCtrl in wxGTK 3.0.5 All: - Support nullptr in wxPrintf() and other pseudo-vararg functions. - Fix problem with wx-config installation and use under NetBSD (wiz). - Avoid spurious errors on thread creation under NetBSD. All (GUI): - Improve stock items consistency and aesthetics (dhowland). - Implement wxTextCtrl::HitTest() for single line controls. - Improve wxSVGFileDC to support more of wxDC API (Maarten Bent). wxMSW: - Fix handling of AUX2 mouse button events (Trylz). - Honour alignment flags for multiline buttons using custom colours too. - Fix crash when using wxCHMHelpController() in 64 bit builds (Xlord2). wxGTK: - Fix position of popup menus shown in wxListCtrl. - Fix not showing wxInfoBar with GTK+ 3 < 3.22.29. - Potentially incompatible change: wxDataViewModel::Cleared() now works as documented cross-platform. Previously on wxGTK it just emptied the model rather than triggering a reload of the model. If you are working around the broken behaviour with wxGTK-specific code in your application you should check that your application works correctly with this change. - Return appropriate values for some previously hard-coded system colours.
Diffstat (limited to 'x11')
-rw-r--r--x11/wxGTK30/Makefile13
-rw-r--r--x11/wxGTK30/PLIST.Darwin35
-rw-r--r--x11/wxGTK30/PLIST.gtk232
-rw-r--r--x11/wxGTK30/PLIST.gtk332
-rw-r--r--x11/wxGTK30/distinfo19
-rw-r--r--x11/wxGTK30/patches/patch-Makefile.in24
-rw-r--r--x11/wxGTK30/patches/patch-build_aclocal_bakefile.m416
-rw-r--r--x11/wxGTK30/patches/patch-configure44
-rw-r--r--x11/wxGTK30/patches/patch-configure.in27
-rw-r--r--x11/wxGTK30/patches/patch-src_tiff_configure15
-rw-r--r--x11/wxGTK30/patches/patch-src_tiff_configure.ac16
-rw-r--r--x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp39
12 files changed, 81 insertions, 231 deletions
diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile
index 2a2ba5f5dec..c580c3e3fc2 100644
--- a/x11/wxGTK30/Makefile
+++ b/x11/wxGTK30/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2020/05/20 06:09:09 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2020/07/18 13:02:53 adam Exp $
-DISTNAME= wxWidgets-3.0.4
+DISTNAME= wxWidgets-3.0.5.1
PKGNAME= ${DISTNAME:S/wxWidgets/wxGTK30/}
-PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_GITHUB:=wxWidgets/}
GITHUB_PROJECT= wxWidgets
@@ -26,6 +25,7 @@ CONFIGURE_ARGS+= --with-opengl
CONFIGURE_ARGS+= --with-expat=sys
CONFIGURE_ARGS+= --with-zlib=sys
CONFIGURE_ARGS+= --with-regex=builtin
+CONFIGURE_ARGS+= --disable-webview
CONFIGURE_ARGS+= --enable-mediactrl
# wxregexu symbols are not exported properly as of 3.0.1
# http://trac.wxwidgets.org/ticket/16571
@@ -33,13 +33,6 @@ CONFIGURE_ARGS+= --disable-visibility
CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec/wx-3.0
CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/wx-3.0
-# ./src/stc/scintilla/src/Editor.cxx: In member function 'void Editor::LayoutLine(int, Surface*, ViewStyle&, LineLayout*, int)':
-# ./src/stc/scintilla/src/Editor.cxx:2200:47: error: array subscript has type 'char' [-Werror=char-subscripts]
-# if (ctrlCharWidth[ll->chars[charInLine]] == 0) {
-# ^
-# Maybe fix this later.
-BUILDLINK_TRANSFORM+= rm:-Werror=char-subscripts
-
DOCDIR= share/wx-3.0/doc/wxWidgets
INSTALL_MAKE_FLAGS+= LN_S="ln -fs"
diff --git a/x11/wxGTK30/PLIST.Darwin b/x11/wxGTK30/PLIST.Darwin
index 125efaa6b62..30ddc914014 100644
--- a/x11/wxGTK30/PLIST.Darwin
+++ b/x11/wxGTK30/PLIST.Darwin
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Darwin,v 1.2 2018/04/29 05:39:33 wiz Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.3 2020/07/18 13:02:53 adam Exp $
include/wx-3.0/wx/generic/animate.h
include/wx-3.0/wx/generic/clrpickerg.h
include/wx-3.0/wx/generic/collpaneg.h
@@ -118,52 +118,49 @@ include/wx-3.0/wx/osx/uma.h
include/wx-3.0/wx/osx/webview_webkit.h
include/wx-3.0/wx/osx/webviewhistoryitem_webkit.h
include/wx-3.0/wx/osx/window.h
-lib/libwx_baseu-3.0.0.4.0.dylib
+lib/libwx_baseu-3.0.0.5.0.dylib
lib/libwx_baseu-3.0.0.dylib
lib/libwx_baseu-3.0.dylib
-lib/libwx_baseu_net-3.0.0.4.0.dylib
+lib/libwx_baseu_net-3.0.0.5.0.dylib
lib/libwx_baseu_net-3.0.0.dylib
lib/libwx_baseu_net-3.0.dylib
-lib/libwx_baseu_xml-3.0.0.4.0.dylib
+lib/libwx_baseu_xml-3.0.0.5.0.dylib
lib/libwx_baseu_xml-3.0.0.dylib
lib/libwx_baseu_xml-3.0.dylib
-lib/libwx_osx_cocoau_adv-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_adv-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_adv-3.0.0.dylib
lib/libwx_osx_cocoau_adv-3.0.dylib
-lib/libwx_osx_cocoau_aui-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_aui-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_aui-3.0.0.dylib
lib/libwx_osx_cocoau_aui-3.0.dylib
-lib/libwx_osx_cocoau_core-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_core-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_core-3.0.0.dylib
lib/libwx_osx_cocoau_core-3.0.dylib
-lib/libwx_osx_cocoau_gl-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_gl-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_gl-3.0.0.dylib
lib/libwx_osx_cocoau_gl-3.0.dylib
-lib/libwx_osx_cocoau_html-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_html-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_html-3.0.0.dylib
lib/libwx_osx_cocoau_html-3.0.dylib
-lib/libwx_osx_cocoau_media-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_media-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_media-3.0.0.dylib
lib/libwx_osx_cocoau_media-3.0.dylib
-lib/libwx_osx_cocoau_propgrid-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_propgrid-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_propgrid-3.0.0.dylib
lib/libwx_osx_cocoau_propgrid-3.0.dylib
-lib/libwx_osx_cocoau_qa-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_qa-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_qa-3.0.0.dylib
lib/libwx_osx_cocoau_qa-3.0.dylib
-lib/libwx_osx_cocoau_ribbon-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_ribbon-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_ribbon-3.0.0.dylib
lib/libwx_osx_cocoau_ribbon-3.0.dylib
-lib/libwx_osx_cocoau_richtext-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_richtext-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_richtext-3.0.0.dylib
lib/libwx_osx_cocoau_richtext-3.0.dylib
-lib/libwx_osx_cocoau_stc-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_stc-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_stc-3.0.0.dylib
lib/libwx_osx_cocoau_stc-3.0.dylib
-lib/libwx_osx_cocoau_webview-3.0.0.4.0.dylib
-lib/libwx_osx_cocoau_webview-3.0.0.dylib
-lib/libwx_osx_cocoau_webview-3.0.dylib
-lib/libwx_osx_cocoau_xrc-3.0.0.4.0.dylib
+lib/libwx_osx_cocoau_xrc-3.0.0.5.0.dylib
lib/libwx_osx_cocoau_xrc-3.0.0.dylib
lib/libwx_osx_cocoau_xrc-3.0.dylib
lib/wx/config/osx_cocoa-unicode-3.0
diff --git a/x11/wxGTK30/PLIST.gtk2 b/x11/wxGTK30/PLIST.gtk2
index f9fda7f7390..4121e1c9cc1 100644
--- a/x11/wxGTK30/PLIST.gtk2
+++ b/x11/wxGTK30/PLIST.gtk2
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gtk2,v 1.5 2018/12/08 10:47:17 bouyer Exp $
+@comment $NetBSD: PLIST.gtk2,v 1.6 2020/07/18 13:02:53 adam Exp $
include/wx-3.0/wx/aui/tabartgtk.h
include/wx-3.0/wx/generic/fontdlgg.h
include/wx-3.0/wx/generic/icon.h
@@ -100,48 +100,48 @@ include/wx-3.0/wx/unix/taskbarx11.h
include/wx-3.0/wx/unix/utilsx11.h
lib/libwx_baseu-3.0.so
lib/libwx_baseu-3.0.so.0
-lib/libwx_baseu-3.0.so.0.4.0
+lib/libwx_baseu-3.0.so.0.5.0
lib/libwx_baseu_net-3.0.so
lib/libwx_baseu_net-3.0.so.0
-lib/libwx_baseu_net-3.0.so.0.4.0
+lib/libwx_baseu_net-3.0.so.0.5.0
lib/libwx_baseu_xml-3.0.so
lib/libwx_baseu_xml-3.0.so.0
-lib/libwx_baseu_xml-3.0.so.0.4.0
+lib/libwx_baseu_xml-3.0.so.0.5.0
lib/libwx_gtk2u_adv-3.0.so
lib/libwx_gtk2u_adv-3.0.so.0
-lib/libwx_gtk2u_adv-3.0.so.0.4.0
+lib/libwx_gtk2u_adv-3.0.so.0.5.0
lib/libwx_gtk2u_aui-3.0.so
lib/libwx_gtk2u_aui-3.0.so.0
-lib/libwx_gtk2u_aui-3.0.so.0.4.0
+lib/libwx_gtk2u_aui-3.0.so.0.5.0
lib/libwx_gtk2u_core-3.0.so
lib/libwx_gtk2u_core-3.0.so.0
-lib/libwx_gtk2u_core-3.0.so.0.4.0
+lib/libwx_gtk2u_core-3.0.so.0.5.0
lib/libwx_gtk2u_gl-3.0.so
lib/libwx_gtk2u_gl-3.0.so.0
-lib/libwx_gtk2u_gl-3.0.so.0.4.0
+lib/libwx_gtk2u_gl-3.0.so.0.5.0
lib/libwx_gtk2u_html-3.0.so
lib/libwx_gtk2u_html-3.0.so.0
-lib/libwx_gtk2u_html-3.0.so.0.4.0
+lib/libwx_gtk2u_html-3.0.so.0.5.0
lib/libwx_gtk2u_media-3.0.so
lib/libwx_gtk2u_media-3.0.so.0
-lib/libwx_gtk2u_media-3.0.so.0.4.0
+lib/libwx_gtk2u_media-3.0.so.0.5.0
lib/libwx_gtk2u_propgrid-3.0.so
lib/libwx_gtk2u_propgrid-3.0.so.0
-lib/libwx_gtk2u_propgrid-3.0.so.0.4.0
+lib/libwx_gtk2u_propgrid-3.0.so.0.5.0
lib/libwx_gtk2u_qa-3.0.so
lib/libwx_gtk2u_qa-3.0.so.0
-lib/libwx_gtk2u_qa-3.0.so.0.4.0
+lib/libwx_gtk2u_qa-3.0.so.0.5.0
lib/libwx_gtk2u_ribbon-3.0.so
lib/libwx_gtk2u_ribbon-3.0.so.0
-lib/libwx_gtk2u_ribbon-3.0.so.0.4.0
+lib/libwx_gtk2u_ribbon-3.0.so.0.5.0
lib/libwx_gtk2u_richtext-3.0.so
lib/libwx_gtk2u_richtext-3.0.so.0
-lib/libwx_gtk2u_richtext-3.0.so.0.4.0
+lib/libwx_gtk2u_richtext-3.0.so.0.5.0
lib/libwx_gtk2u_stc-3.0.so
lib/libwx_gtk2u_stc-3.0.so.0
-lib/libwx_gtk2u_stc-3.0.so.0.4.0
+lib/libwx_gtk2u_stc-3.0.so.0.5.0
lib/libwx_gtk2u_xrc-3.0.so
lib/libwx_gtk2u_xrc-3.0.so.0
-lib/libwx_gtk2u_xrc-3.0.so.0.4.0
+lib/libwx_gtk2u_xrc-3.0.so.0.5.0
lib/wx/config/gtk2-unicode-3.0
lib/wx/include/gtk2-unicode-3.0/wx/setup.h
diff --git a/x11/wxGTK30/PLIST.gtk3 b/x11/wxGTK30/PLIST.gtk3
index fb81ae562c1..5cbb7adcdd8 100644
--- a/x11/wxGTK30/PLIST.gtk3
+++ b/x11/wxGTK30/PLIST.gtk3
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.gtk3,v 1.1 2018/04/29 05:40:09 wiz Exp $
+@comment $NetBSD: PLIST.gtk3,v 1.2 2020/07/18 13:02:53 adam Exp $
include/wx-3.0/wx/generic/icon.h
include/wx-3.0/wx/generic/imaglist.h
include/wx-3.0/wx/generic/paletteg.h
@@ -97,48 +97,48 @@ include/wx-3.0/wx/unix/taskbarx11.h
include/wx-3.0/wx/unix/utilsx11.h
lib/libwx_baseu-3.0.so
lib/libwx_baseu-3.0.so.0
-lib/libwx_baseu-3.0.so.0.4.0
+lib/libwx_baseu-3.0.so.0.5.0
lib/libwx_baseu_net-3.0.so
lib/libwx_baseu_net-3.0.so.0
-lib/libwx_baseu_net-3.0.so.0.4.0
+lib/libwx_baseu_net-3.0.so.0.5.0
lib/libwx_baseu_xml-3.0.so
lib/libwx_baseu_xml-3.0.so.0
-lib/libwx_baseu_xml-3.0.so.0.4.0
+lib/libwx_baseu_xml-3.0.so.0.5.0
lib/libwx_gtk3u_adv-3.0.so
lib/libwx_gtk3u_adv-3.0.so.0
-lib/libwx_gtk3u_adv-3.0.so.0.4.0
+lib/libwx_gtk3u_adv-3.0.so.0.5.0
lib/libwx_gtk3u_aui-3.0.so
lib/libwx_gtk3u_aui-3.0.so.0
-lib/libwx_gtk3u_aui-3.0.so.0.4.0
+lib/libwx_gtk3u_aui-3.0.so.0.5.0
lib/libwx_gtk3u_core-3.0.so
lib/libwx_gtk3u_core-3.0.so.0
-lib/libwx_gtk3u_core-3.0.so.0.4.0
+lib/libwx_gtk3u_core-3.0.so.0.5.0
lib/libwx_gtk3u_gl-3.0.so
lib/libwx_gtk3u_gl-3.0.so.0
-lib/libwx_gtk3u_gl-3.0.so.0.4.0
+lib/libwx_gtk3u_gl-3.0.so.0.5.0
lib/libwx_gtk3u_html-3.0.so
lib/libwx_gtk3u_html-3.0.so.0
-lib/libwx_gtk3u_html-3.0.so.0.4.0
+lib/libwx_gtk3u_html-3.0.so.0.5.0
lib/libwx_gtk3u_media-3.0.so
lib/libwx_gtk3u_media-3.0.so.0
-lib/libwx_gtk3u_media-3.0.so.0.4.0
+lib/libwx_gtk3u_media-3.0.so.0.5.0
lib/libwx_gtk3u_propgrid-3.0.so
lib/libwx_gtk3u_propgrid-3.0.so.0
-lib/libwx_gtk3u_propgrid-3.0.so.0.4.0
+lib/libwx_gtk3u_propgrid-3.0.so.0.5.0
lib/libwx_gtk3u_qa-3.0.so
lib/libwx_gtk3u_qa-3.0.so.0
-lib/libwx_gtk3u_qa-3.0.so.0.4.0
+lib/libwx_gtk3u_qa-3.0.so.0.5.0
lib/libwx_gtk3u_ribbon-3.0.so
lib/libwx_gtk3u_ribbon-3.0.so.0
-lib/libwx_gtk3u_ribbon-3.0.so.0.4.0
+lib/libwx_gtk3u_ribbon-3.0.so.0.5.0
lib/libwx_gtk3u_richtext-3.0.so
lib/libwx_gtk3u_richtext-3.0.so.0
-lib/libwx_gtk3u_richtext-3.0.so.0.4.0
+lib/libwx_gtk3u_richtext-3.0.so.0.5.0
lib/libwx_gtk3u_stc-3.0.so
lib/libwx_gtk3u_stc-3.0.so.0
-lib/libwx_gtk3u_stc-3.0.so.0.4.0
+lib/libwx_gtk3u_stc-3.0.so.0.5.0
lib/libwx_gtk3u_xrc-3.0.so
lib/libwx_gtk3u_xrc-3.0.so.0
-lib/libwx_gtk3u_xrc-3.0.so.0.4.0
+lib/libwx_gtk3u_xrc-3.0.so.0.5.0
lib/wx/config/gtk3-unicode-3.0
lib/wx/include/gtk3-unicode-3.0/wx/setup.h
diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo
index fe8dbe26ea5..5839de86779 100644
--- a/x11/wxGTK30/distinfo
+++ b/x11/wxGTK30/distinfo
@@ -1,14 +1,9 @@
-$NetBSD: distinfo,v 1.20 2020/03/18 14:11:37 gdt Exp $
+$NetBSD: distinfo,v 1.21 2020/07/18 13:02:53 adam Exp $
-SHA1 (wxWidgets-3.0.4.tar.bz2) = 246561a73ec5b9a5a7aaaaed46b64515dc9039ab
-RMD160 (wxWidgets-3.0.4.tar.bz2) = 179bcd489aec0a56a7a2890be68ee718b87a1c7a
-SHA512 (wxWidgets-3.0.4.tar.bz2) = c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158
-Size (wxWidgets-3.0.4.tar.bz2) = 20204622 bytes
-SHA1 (patch-Makefile.in) = 27546d03ba497f485fed323192c09f6f9ae67554
-SHA1 (patch-build_aclocal_bakefile.m4) = b74cb570e95eb5443756490b3be50eb33d3acc34
-SHA1 (patch-configure) = c63471b4f1b24ab0d97846f452c3c186e2d207b5
-SHA1 (patch-configure.in) = 420105dca608dcdcc6ee6a1e9b6da14049681a4e
+SHA1 (wxWidgets-3.0.5.1.tar.bz2) = 406ac736f61d88a3a866aa501e01e408a642c6e7
+RMD160 (wxWidgets-3.0.5.1.tar.bz2) = 931ddabfbc54e20ced14c81c74e451be8073dee5
+SHA512 (wxWidgets-3.0.5.1.tar.bz2) = 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d
+Size (wxWidgets-3.0.5.1.tar.bz2) = 19739206 bytes
+SHA1 (patch-configure) = 8e5a8c489cf4fcd2b638c45ca084febce398722f
SHA1 (patch-misc_scripts_makeosxtags.sh) = a18e1c44f1cbc0e81cb75ae9df1eedd3643446c4
-SHA1 (patch-src_tiff_configure) = 4bdb7b96231b4db0da3a0a1f7d8350ad4222080e
-SHA1 (patch-src_tiff_configure.ac) = de55f861e64fd0bbecc10086213dd98bd3b4f3ca
-SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 6a8924975690854e9c162fed906b6ecca77874b5
+SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = fe34102b241f84f8add08ed69d8c9c1c9c2df771
diff --git a/x11/wxGTK30/patches/patch-Makefile.in b/x11/wxGTK30/patches/patch-Makefile.in
deleted file mode 100644
index 0b7fc97ba69..00000000000
--- a/x11/wxGTK30/patches/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.4 2018/08/16 11:38:53 wiz Exp $
-
-Install wx-config as a script, not program.
-https://trac.wxwidgets.org/ticket/18197
-
---- Makefile.in.orig 2018-05-02 11:03:21.000000000 +0000
-+++ Makefile.in
-@@ -27,6 +27,7 @@ STRIP = @STRIP@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_DIR = @INSTALL_DIR@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
- BK_DEPS = @BK_DEPS@
- BK_MAKE_PCH = @BK_MAKE_PCH@
-@@ -16181,7 +16182,7 @@ samples:
- install-wxconfig:
- $(INSTALL_DIR) $(DESTDIR)$(bindir)
- $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
-- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-
- locale_install:
diff --git a/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4 b/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4
deleted file mode 100644
index 639c5fb537a..00000000000
--- a/x11/wxGTK30/patches/patch-build_aclocal_bakefile.m4
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-build_aclocal_bakefile.m4,v 1.3 2018/08/16 11:38:53 wiz Exp $
-
-Fix shell script portability
-https://trac.wxwidgets.org/ticket/18198
-
---- build/aclocal/bakefile.m4.orig 2014-06-14 21:48:48.000000000 +0000
-+++ build/aclocal/bakefile.m4
-@@ -371,7 +371,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
- SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
- fi
-
-- if test "x$GCC" == "xyes"; then
-+ if test "x$GCC" = "xyes"; then
- PIC_FLAG="-dynamic -fPIC"
- fi
- if test "x$XLCC" = "xyes"; then
diff --git a/x11/wxGTK30/patches/patch-configure b/x11/wxGTK30/patches/patch-configure
index a41ee22ece1..738a8d3a5a5 100644
--- a/x11/wxGTK30/patches/patch-configure
+++ b/x11/wxGTK30/patches/patch-configure
@@ -1,20 +1,11 @@
-$NetBSD: patch-configure,v 1.6 2020/03/18 14:11:37 gdt Exp $
+$NetBSD: patch-configure,v 1.7 2020/07/18 13:02:54 adam Exp $
-Fix shell script portability
-tweak SEARCH_LIB
+Tweak SEARCH_LIB.
+Avoid -Werror.
---- configure.orig 2014-06-14 21:48:48.000000000 +0000
+--- configure.orig 2020-05-02 14:03:18.000000000 +0000
+++ configure
-@@ -19447,7 +19447,7 @@ $as_echo_n "checking SDK deployment vers
- MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
-
- # If that failed, try again with the new key
-- if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
-+ if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
-
- MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
-
-@@ -22015,7 +22015,7 @@ fi
+@@ -21778,7 +21778,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_std_libfullpath" >&5
$as_echo "$wx_cv_std_libfullpath" >&6; }
@@ -23,22 +14,13 @@ tweak SEARCH_LIB
if test "$build" != "$host" -a "$GCC" = yes; then
if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
-@@ -38819,7 +38822,7 @@ $as_echo "$bakefile_cv_gcc31" >&6; }
- SHARED_LD_CXX="\${CXX} -dynamiclib -single_module -headerpad_max_install_names -o"
- fi
+@@ -35158,9 +35158,6 @@ if ac_fn_cxx_try_compile "$LINENO"; then
+ else
-- if test "x$GCC" == "xyes"; then
-+ if test "x$GCC" = "xyes"; then
- PIC_FLAG="-dynamic -fPIC"
- fi
- if test "x$XLCC" = "xyes"; then
-@@ -40007,7 +40011,8 @@ EOF
- *-*-solaris2* )
- SONAME_FLAG="-h "
- USE_SOVERSION=1
-- USE_SOVERSOLARIS=1
-+ USE_SOVERLINUX=1
-+ USE_SOTWOSYMLINKS=1
- ;;
+ CFLAGS_OLD="$CFLAGS"
+- if test "$GCC" = yes ; then
+- CFLAGS="-Werror $CFLAGS"
+- fi
- *-*-darwin* )
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
diff --git a/x11/wxGTK30/patches/patch-configure.in b/x11/wxGTK30/patches/patch-configure.in
deleted file mode 100644
index 94a8ea9ea96..00000000000
--- a/x11/wxGTK30/patches/patch-configure.in
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-configure.in,v 1.4 2018/08/16 12:26:49 wiz Exp $
-
-Fix shell script portability
-https://trac.wxwidgets.org/ticket/18198
-
-tweak SEARCH_LIB
-
---- configure.in.orig 2014-06-14 21:48:48.000000000 +0000
-+++ configure.in
-@@ -1238,7 +1238,7 @@ dnl We need to quote the next line where
- MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
- ]
- # If that failed, try again with the new key
-- if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then
-+ if test "x$MACOSX_SDK_PLIST_VERSION_MIN" = "x"; then
- [
- MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'`
- ]
-@@ -2245,7 +2245,7 @@ fi
-
- AC_MSG_RESULT($wx_cv_std_libfullpath)
-
--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"
-
- dnl Cross compiling with gcc?
- if test "$build" != "$host" -a "$GCC" = yes; then
diff --git a/x11/wxGTK30/patches/patch-src_tiff_configure b/x11/wxGTK30/patches/patch-src_tiff_configure
deleted file mode 100644
index 3ad10633fcc..00000000000
--- a/x11/wxGTK30/patches/patch-src_tiff_configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_tiff_configure,v 1.2 2018/05/02 11:33:44 adam Exp $
-
-Fix shell script portability
-
---- src/tiff/configure.orig 2014-06-14 21:48:48.000000000 +0000
-+++ src/tiff/configure
-@@ -18145,7 +18145,7 @@ if test "${with_jpeg12_lib+set}" = set;
- fi
-
-
--if test "x$enable_jpeg12" == "xyes" ; then
-+if test "x$enable_jpeg12" = "xyes" ; then
-
- if test "x$with_jpeg12_lib" != "x" ; then
- LIBS="$with_jpeg12_lib $LIBS"
diff --git a/x11/wxGTK30/patches/patch-src_tiff_configure.ac b/x11/wxGTK30/patches/patch-src_tiff_configure.ac
deleted file mode 100644
index 51e2cc1304e..00000000000
--- a/x11/wxGTK30/patches/patch-src_tiff_configure.ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_tiff_configure.ac,v 1.3 2018/08/16 11:38:53 wiz Exp $
-
-Fix shell script portability
-https://trac.wxwidgets.org/ticket/18198
-
---- src/tiff/configure.ac.orig 2014-06-14 21:48:48.000000000 +0000
-+++ src/tiff/configure.ac
-@@ -772,7 +772,7 @@ AC_ARG_WITH(jpeg12-lib,
- AS_HELP_STRING([--with-jpeg12-lib=LIBRARY],
- [path to libjpeg 12bit library]),,)
-
--if test "x$enable_jpeg12" == "xyes" ; then
-+if test "x$enable_jpeg12" = "xyes" ; then
-
- if test "x$with_jpeg12_lib" != "x" ; then
- LIBS="$with_jpeg12_lib $LIBS"
diff --git a/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp b/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp
index 45533dee906..af4275d3b26 100644
--- a/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp
+++ b/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_unix_fswatcher__kqueue.cpp,v 1.3 2019/10/16 20:43:14 wiz Exp $
+$NetBSD: patch-src_unix_fswatcher__kqueue.cpp,v 1.4 2020/07/18 13:02:54 adam Exp $
Fix compilation error on NetBSD
https://trac.wxwidgets.org/ticket/18199
---- src/unix/fswatcher_kqueue.cpp.orig 2018-03-07 16:55:38.000000000 +0000
+--- src/unix/fswatcher_kqueue.cpp.orig 2020-07-18 06:20:35.185180562 +0000
+++ src/unix/fswatcher_kqueue.cpp
@@ -14,6 +14,10 @@
#pragma hdrstop
@@ -16,31 +16,12 @@ https://trac.wxwidgets.org/ticket/18199
#if wxUSE_FSWATCHER
#include "wx/fswatcher.h"
-@@ -125,8 +129,13 @@ public:
- struct kevent event;
- int action = EV_ADD | EV_ENABLE | EV_CLEAR | EV_ERROR;
- int flags = Watcher2NativeFlags(watch->GetFlags());
-+#if defined(__NetBSD__) && (__NetBSD_Version__ <= 999001400)
-+ EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action,
-+ flags, 0, (intptr_t)watch.get() );
-+#else
- EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action,
- flags, 0, watch.get() );
-+#endif
-
- // TODO more error conditions according to man
- // TODO best deal with the error here
-@@ -281,10 +290,11 @@ protected:
+@@ -34,7 +38,7 @@ namespace
- wxLogTrace(wxTRACE_FSWATCHER, "Event: ident=%d, filter=%d, flags=%u, "
- "fflags=%u, data=%d, user_data=%p",
-- e.ident, e.filter, e.flags, e.fflags, e.data, e.udata);
-+ e.ident, e.filter, e.flags, e.fflags, e.data,
-+ (const void *)e.udata);
-
- // for ease of use
-- wxFSWatchEntryKq& w = *(static_cast<wxFSWatchEntry*>(e.udata));
-+ wxFSWatchEntryKq& w = *(reinterpret_cast<wxFSWatchEntry*>(e.udata));
- int nflags = e.fflags;
-
- // clear ignored flags
+ // NetBSD is different as it uses intptr_t as type of kevent struct udata field
+ // for some reason, instead of "void*" as all the other platforms using kqueue.
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) && (__NetBSD_Version__ <= 999001400)
+ inline intptr_t ToUdata(void* d) { return reinterpret_cast<intptr_t>(d); }
+ inline void* FromUdata(intptr_t d) { return reinterpret_cast<void*>(d); }
+ #else
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-27 16:01:20 +0000