aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/wxgtk31/files
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2021-04-16 07:52:45 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2021-04-16 07:52:45 +0000
commit925e342a409be50202c5150888762b66b96377f4 (patch)
treebd10ee3fbd444d5ca96d96af64c5f14867e6dae6 /x11-toolkits/wxgtk31/files
parentff6ac45c49dfd2e26dc468385c7c492b509732ba (diff)
downloadports-925e342a409be50202c5150888762b66b96377f4.tar.gz
ports-925e342a409be50202c5150888762b66b96377f4.zip
x11-toolkits/wxgtk31: Update 3.1.4 -> 3.1.5
Bump 43 ports that either depend on wxgtk31 or potentially depend on it. Reported by: portscout
Diffstat (limited to 'x11-toolkits/wxgtk31/files')
-rw-r--r--x11-toolkits/wxgtk31/files/patch-Makefile.in21
-rw-r--r--x11-toolkits/wxgtk31/files/patch-configure19
-rw-r--r--x11-toolkits/wxgtk31/files/patch-setup.h.in4
-rw-r--r--x11-toolkits/wxgtk31/files/patch-src-common-translation.cpp11
-rw-r--r--x11-toolkits/wxgtk31/files/patch-utils-wxrc-Makefile.in19
5 files changed, 22 insertions, 52 deletions
diff --git a/x11-toolkits/wxgtk31/files/patch-Makefile.in b/x11-toolkits/wxgtk31/files/patch-Makefile.in
index 6abda89d6356..dd5f1ad574da 100644
--- a/x11-toolkits/wxgtk31/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk31/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2013-11-11 14:10:39.000000000 +0100
-+++ Makefile.in 2014-01-22 10:14:26.000000000 +0100
-@@ -56,6 +56,7 @@
+--- 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@
@@ -8,9 +8,9 @@
TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_XML = @EXTRALIBS_XML@
-@@ -13815,9 +13816,9 @@
+@@ -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 locale_msw_install
+ 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)
@@ -20,7 +20,7 @@
$(DYLIB_RPATH_INSTALL)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
for f in setup.h $(RCDEFS_H); do \
-@@ -14711,9 +14712,7 @@
+@@ -14775,9 +14776,7 @@ samples:
install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir)
@@ -31,12 +31,3 @@
locale_install:
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-@@ -14721,7 +14720,7 @@
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- if test -f $(srcdir)/locale/$$l.mo ; then \
-- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- fi ; \
- done
-
diff --git a/x11-toolkits/wxgtk31/files/patch-configure b/x11-toolkits/wxgtk31/files/patch-configure
index 551deb917f48..735735b8afc4 100644
--- a/x11-toolkits/wxgtk31/files/patch-configure
+++ b/x11-toolkits/wxgtk31/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2018-12-11 18:11:57 UTC
+--- configure.orig 2021-04-12 22:23:58 UTC
+++ configure
-@@ -3897,7 +3897,7 @@ case "${host}" in
+@@ -3969,7 +3969,7 @@ case "${host}" in
DEFAULT_DEFAULT_wxUSE_GTK=1
;;
@@ -9,7 +9,7 @@
USE_BSD=1
USE_FREEBSD=1
$as_echo "#define __FREEBSD__ 1" >>confdefs.h
-@@ -22306,6 +22306,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -20997,6 +20997,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
SEARCH_INCLUDE="\
@@ -17,7 +17,7 @@
/usr/local/include \
/usr/local/X11/include \
/usr/local/include/X11 \
-@@ -32469,9 +32470,6 @@ $as_echo "$as_me: WARNING: BeOS threads
+@@ -32061,9 +32062,6 @@ $as_echo "$as_me: WARNING: BeOS threads are not yet su
THREAD_OPTS="-pthreads $THREAD_OPTS"
fi
;;
@@ -27,16 +27,19 @@
*-*-darwin* | *-*-cygwin* )
THREAD_OPTS=""
;;
-@@ -33247,7 +33245,7 @@ if test "x$ac_cv_func_gmtime_r" = xyes;
+@@ -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=
-@@ -40172,6 +40170,7 @@ fi
+-
+ 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* | \
@@ -44,7 +47,7 @@
*-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
*-*-mirbsd* | \
*-*-sunos4* | \
-@@ -40213,6 +40212,7 @@ fi
+@@ -39679,6 +39678,7 @@ fi
case "${BAKEFILE_HOST}" in
*-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-haiku* | *-*-netbsd* | \
diff --git a/x11-toolkits/wxgtk31/files/patch-setup.h.in b/x11-toolkits/wxgtk31/files/patch-setup.h.in
index 3571a20c807e..26870469d52f 100644
--- a/x11-toolkits/wxgtk31/files/patch-setup.h.in
+++ b/x11-toolkits/wxgtk31/files/patch-setup.h.in
@@ -1,6 +1,6 @@
---- setup.h.in.orig 2014-10-06 21:33:44 UTC
+--- setup.h.in.orig 2021-04-12 22:23:58 UTC
+++ setup.h.in
-@@ -757,17 +757,14 @@
+@@ -801,17 +801,14 @@
/*
* Define if your compiler has std::tr1::unordered_map
*/
diff --git a/x11-toolkits/wxgtk31/files/patch-src-common-translation.cpp b/x11-toolkits/wxgtk31/files/patch-src-common-translation.cpp
deleted file mode 100644
index 5002755f8545..000000000000
--- a/x11-toolkits/wxgtk31/files/patch-src-common-translation.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/translation.cpp.orig 2011-02-18 15:12:53.000000000 +0600
-+++ src/common/translation.cpp 2011-02-18 15:15:10.000000000 +0600
-@@ -1302,7 +1302,7 @@
-
- bool wxTranslations::AddStdCatalog()
- {
-- if ( !AddCatalog(wxS("wxstd")) )
-+ if ( !AddCatalog(wxS("wxstd") wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)) )
- return false;
-
- // there may be a catalog with toolkit specific overrides, it is not
diff --git a/x11-toolkits/wxgtk31/files/patch-utils-wxrc-Makefile.in b/x11-toolkits/wxgtk31/files/patch-utils-wxrc-Makefile.in
index 1ae8e5792c84..8e1067c0c602 100644
--- a/x11-toolkits/wxgtk31/files/patch-utils-wxrc-Makefile.in
+++ b/x11-toolkits/wxgtk31/files/patch-utils-wxrc-Makefile.in
@@ -1,6 +1,6 @@
---- utils/wxrc/Makefile.in.orig Thu Nov 30 23:00:32 2006
-+++ utils/wxrc/Makefile.in Thu Nov 30 23:01:25 2006
-@@ -29,6 +29,7 @@
+--- 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@
@@ -8,16 +8,3 @@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_XML = @EXTRALIBS_XML@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
-@@ -114,11 +115,7 @@
-
- @COND_USE_XRC_1@install_wxrc:
- @COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
--@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
--@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
--@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
-+@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)$(EXEEXT)
-
- @COND_USE_XRC_1@uninstall_wxrc:
- @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)