x11-toolkits/wxgtk32: GUI toolkit (wxWidgets) with GTK+ bindings

3.2 is new stable branch after 3.0, 3.1 was develop/unstable branch,
so in future 3.2 have to replace 3.1 for all consumers in ports.

PR:		265093
Reported by:	VVD <vvd@unislabs.com>
Reviewed by:	rhurlin

5 files changed, 133 insertions, 0 deletions

diff --git a/x11-toolkits/wxgtk32/files/patch-Makefile.in b/x11-toolkits/wxgtk32/files/patch-Makefile.in
new file mode 100644
index 000000000000..dd5f1ad574da
--- /dev/null
+++ b/x11-toolkits/wxgtk32/files/patch-Makefile.in
@@ -0,0 +1,33 @@
+--- Makefile.in.orig	2021-04-12 22:23:58 UTC
++++ Makefile.in
+@@ -56,6 +56,7 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
+ TOOLKIT = @TOOLKIT@
+ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+ TOOLKIT_VERSION = @TOOLKIT_VERSION@
++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+ TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
+ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+@@ -13879,9 +13880,9 @@ all: $(__wxregex___depname) $(__wxzlib___depname) $(__
+ 
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+-	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
++	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+-	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done)
+ 	$(DYLIB_RPATH_INSTALL)
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ 	for f in setup.h $(RCDEFS_H); do \
+@@ -14775,9 +14776,7 @@ samples: 
+ 
+ install-wxconfig: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+-	$(INSTALL_DIR) $(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)
++	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
+ 
+ locale_install: 
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
diff --git a/x11-toolkits/wxgtk32/files/patch-configure b/x11-toolkits/wxgtk32/files/patch-configure
new file mode 100644
index 000000000000..735735b8afc4
--- /dev/null
+++ b/x11-toolkits/wxgtk32/files/patch-configure
@@ -0,0 +1,57 @@
+--- configure.orig	2021-04-12 22:23:58 UTC
++++ configure
+@@ -3969,7 +3969,7 @@ case "${host}" in
+ 
+     DEFAULT_DEFAULT_wxUSE_GTK=1
+   ;;
+-  *-*-freebsd*)
++  *-*-dragonfly*|*-*-freebsd*)
+     USE_BSD=1
+     USE_FREEBSD=1
+     $as_echo "#define __FREEBSD__ 1" >>confdefs.h
+@@ -20997,6 +20997,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ SEARCH_INCLUDE="\
++    $X11BASE/include          \
+     /usr/local/include        \
+     /usr/local/X11/include    \
+     /usr/local/include/X11    \
+@@ -32061,9 +32062,6 @@ $as_echo "$as_me: WARNING: BeOS threads are not yet su
+                                         THREAD_OPTS="-pthreads $THREAD_OPTS"
+                 fi
+                 ;;
+-          *-*-freebsd*)
+-                                                THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
+-                ;;
+           *-*-darwin* | *-*-cygwin* )
+                                                 THREAD_OPTS=""
+                 ;;
+@@ -32839,10 +32837,10 @@ if test "x$ac_cv_func_gmtime_r" = xyes; then :
+    $as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h
+ 
+ fi
++OPTIMISE_CFLAGS=
+ 
+ 
+ 
+-
+     ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -39638,6 +39636,7 @@ fi
+       ;;
+ 
+       powerpc-apple-macos* | \
++      *-*-dragonfly* | \
+       *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
+       *-*-mirbsd* | \
+       *-*-sunos4* | \
+@@ -39679,6 +39678,7 @@ fi
+ 
+     case "${BAKEFILE_HOST}" in
+       *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | \
++      *-*-dragonfly* | \
+       *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
+         if test "x$SUNCXX" = "xyes"; then
+             SONAME_FLAG="-h "
diff --git a/x11-toolkits/wxgtk32/files/patch-include_wx_propgrid_editors.h b/x11-toolkits/wxgtk32/files/patch-include_wx_propgrid_editors.h
new file mode 100644
index 000000000000..07e063335055
--- /dev/null
+++ b/x11-toolkits/wxgtk32/files/patch-include_wx_propgrid_editors.h
@@ -0,0 +1,13 @@
+--- include/wx/propgrid/editors.h.orig	2022-10-15 19:03:21 UTC
++++ include/wx/propgrid/editors.h
+@@ -13,6 +13,10 @@
+ 
+ #include "wx/defs.h"
+ 
++#if wxUSE_BMPBUTTON
++#include "wx/bmpbndl.h"
++#endif
++
+ #if wxUSE_PROPGRID
+ 
+ #include "wx/window.h"
diff --git a/x11-toolkits/wxgtk32/files/patch-setup.h.in b/x11-toolkits/wxgtk32/files/patch-setup.h.in
new file mode 100644
index 000000000000..26870469d52f
--- /dev/null
+++ b/x11-toolkits/wxgtk32/files/patch-setup.h.in
@@ -0,0 +1,20 @@
+--- setup.h.in.orig	2021-04-12 22:23:58 UTC
++++ setup.h.in
+@@ -801,17 +801,14 @@
+ /*
+  * Define if your compiler has std::tr1::unordered_map
+  */
+-#undef HAVE_TR1_UNORDERED_MAP
+ 
+ /*
+  * Define if your compiler has std::tr1::unordered_set
+  */
+-#undef HAVE_TR1_UNORDERED_SET
+ 
+ /*
+  * Define if your compiler has <tr1/type_traits>
+  */
+-#undef HAVE_TR1_TYPE_TRAITS
+ 
+ /*
+  * Define if your compiler has <type_traits>
diff --git a/x11-toolkits/wxgtk32/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk32/files/patch-utils-wxrc-Makefile.in
new file mode 100644
index 000000000000..8e1067c0c602
--- /dev/null
+++ b/x11-toolkits/wxgtk32/files/patch-utils-wxrc-Makefile.in
@@ -0,0 +1,10 @@
+--- utils/wxrc/Makefile.in.orig	2021-04-12 22:23:58 UTC
++++ utils/wxrc/Makefile.in
+@@ -30,6 +30,7 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
+ TOOLKIT = @TOOLKIT@
+ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+ TOOLKIT_VERSION = @TOOLKIT_VERSION@
++TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
+ EXTRALIBS = @EXTRALIBS@
+ EXTRALIBS_XML = @EXTRALIBS_XML@
+ EXTRALIBS_GUI = @EXTRALIBS_GUI@