From: fsLeg Date: Sun, 9 Jun 2019 11:25:15 +0000 (+0300) Subject: Updated wxWidgets to 3.0.4 X-Git-Url: https://git.t-rg.ws/?a=commitdiff_plain;h=d3403464bea0326595f8871f4461ddd058c913ce;p=slackbuilds.git Updated wxWidgets to 3.0.4 --- diff --git a/wxWidgets3/collision.patch b/wxWidgets3/collision.patch index fde16c8..cccbffa 100644 --- a/wxWidgets3/collision.patch +++ b/wxWidgets3/collision.patch @@ -9,23 +9,22 @@ ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk zh zh_CN zh_TW ---- a/Makefile.in 2014-06-15 01:48:48.000000000 +0400 -+++ b/Makefile.in 2014-09-16 03:00:03.000000000 +0400 -@@ -15252,10 +15252,10 @@ - all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) +--- a/Makefile.in.orig 2018-03-07 19:55:38.000000000 +0300 ++++ b/Makefile.in 2019-06-09 13:48:10.717287660 +0300 +@@ -15282,10 +15282,9 @@ + all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__webkit2_ext___depname) $(__wxrc___depname) $(__cocoa_res___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_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___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 $(__cocoa_res_install___depname) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal - (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) $(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 \ -@@ -16140,7 +16140,7 @@ +@@ -16182,7 +16181,7 @@ $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config @@ -34,7 +33,7 @@ locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -@@ -16148,7 +16148,7 @@ +@@ -16190,7 +16189,7 @@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ if test -f $(srcdir)/locale/$$l.mo ; then \ @@ -43,7 +42,7 @@ fi ; \ done -@@ -16165,7 +16165,7 @@ +@@ -16207,7 +16206,7 @@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ if test -f $(srcdir)/locale/msw/$$l.mo ; then \ @@ -54,7 +53,7 @@ --- a/src/common/translation.cpp 2014-06-15 01:48:48.000000000 +0400 +++ b/src/common/translation.cpp 2014-09-16 03:00:03.000000000 +0400 -@@ -1458,7 +1458,7 @@ +@@ -1471,7 +1471,7 @@ bool wxTranslations::AddStdCatalog() { @@ -63,8 +62,8 @@ return false; // there may be a catalog with toolkit specific overrides, it is not ---- a/utils/wxrc/Makefile.in 2014-06-15 01:48:48.000000000 +0400 -+++ b/utils/wxrc/Makefile.in 2014-09-16 03:00:03.000000000 +0400 +--- a/utils/wxrc/Makefile.in.orig 2019-06-09 14:08:39.141052994 +0300 ++++ b/utils/wxrc/Makefile.in 2019-06-09 14:11:11.963439836 +0300 @@ -125,7 +125,6 @@ @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) diff --git a/wxWidgets3/wxWidgets3.SlackBuild b/wxWidgets3/wxWidgets3.SlackBuild index 40f4ad9..cb6a94a 100755 --- a/wxWidgets3/wxWidgets3.SlackBuild +++ b/wxWidgets3/wxWidgets3.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wxWidgets3 -VERSION=${VERSION:-3.0.2} +VERSION=${VERSION:-3.0.4} BUILD=${BUILD:-1} TAG=${TAG:-fsleg} diff --git a/wxWidgets3/wxWidgets3.info b/wxWidgets3/wxWidgets3.info index 7db8d24..4657d6a 100644 --- a/wxWidgets3/wxWidgets3.info +++ b/wxWidgets3/wxWidgets3.info @@ -1,8 +1,8 @@ PRGNAM="wxWidgets3" -VERSION="3.0.2" +VERSION="3.0.4" HOMEPAGE="http://wxwidgets.org/" DOWNLOAD="https://github.com/wxWidgets/wxWidgets/releases/download/v${VERSION}/wxWidgets-${VERSION}.tar.bz2" -MD5SUM="ba4cd1f3853d0cd49134c5ae028ad080" +MD5SUM="b0035731777acc5597cea8982da10317" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES=""