From e89646e5c12935a43f41d12e17af2cb32fc2cb0d Mon Sep 17 00:00:00 2001 From: fsLeg Date: Sun, 6 Feb 2022 20:00:41 +0300 Subject: [PATCH] wxWidgets3: updated to 3.0.5 --- wxWidgets3/collision.patch | 28 ++++++++++++++-------------- wxWidgets3/wxWidgets3.SlackBuild | 4 ++-- wxWidgets3/wxWidgets3.info | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/wxWidgets3/collision.patch b/wxWidgets3/collision.patch index cccbffa..7fea35d 100644 --- a/wxWidgets3/collision.patch +++ b/wxWidgets3/collision.patch @@ -9,12 +9,12 @@ 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.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_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) +--- a/Makefile.in 2020-04-22 16:09:28.000000000 +0300 ++++ b/Makefile.in 2022-02-06 18:17:03.873918027 +0300 +@@ -15278,10 +15278,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) + + 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_DIR) $(DESTDIR)$(datadir)/aclocal - (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets @@ -24,16 +24,16 @@ $(DYLIB_RPATH_INSTALL) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx for f in setup.h $(RCDEFS_H); do \ -@@ -16182,7 +16181,7 @@ +@@ -16177,7 +16176,7 @@ $(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) + (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) - - locale_install: + + locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -@@ -16190,7 +16189,7 @@ +@@ -16185,7 +16184,7 @@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ if test -f $(srcdir)/locale/$$l.mo ; then \ @@ -41,8 +41,8 @@ + $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ fi ; \ done - -@@ -16207,7 +16206,7 @@ + +@@ -16202,7 +16201,7 @@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ if test -f $(srcdir)/locale/msw/$$l.mo ; then \ @@ -50,7 +50,7 @@ + $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ fi ; \ done - + --- 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 @@ -1471,7 +1471,7 @@ diff --git a/wxWidgets3/wxWidgets3.SlackBuild b/wxWidgets3/wxWidgets3.SlackBuild index cb6a94a..da51a96 100755 --- a/wxWidgets3/wxWidgets3.SlackBuild +++ b/wxWidgets3/wxWidgets3.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wxWidgets 3.0 -# Copyright 2013-2014 Vladislav Borisov Moscow, Russia +# Copyright 2013-2022 Vladislav Borisov Moscow, Russia # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wxWidgets3 -VERSION=${VERSION:-3.0.4} +VERSION=${VERSION:-3.0.5} BUILD=${BUILD:-1} TAG=${TAG:-fsleg} diff --git a/wxWidgets3/wxWidgets3.info b/wxWidgets3/wxWidgets3.info index 4657d6a..6b390ea 100644 --- a/wxWidgets3/wxWidgets3.info +++ b/wxWidgets3/wxWidgets3.info @@ -1,8 +1,8 @@ PRGNAM="wxWidgets3" -VERSION="3.0.4" +VERSION="3.0.5" HOMEPAGE="http://wxwidgets.org/" DOWNLOAD="https://github.com/wxWidgets/wxWidgets/releases/download/v${VERSION}/wxWidgets-${VERSION}.tar.bz2" -MD5SUM="b0035731777acc5597cea8982da10317" +MD5SUM="b4304777652acee8358066cdce5f6f27" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -- 2.46.3