diff options
author | sL1pKn07 | 2022-04-11 18:57:08 +0200 |
---|---|---|
committer | sL1pKn07 | 2022-04-11 18:57:08 +0200 |
commit | bb6435abd5b7727e2ede595972abc968b2aeba18 (patch) | |
tree | e54f7c142a3e2dc5de5c4cdedb91c79f7380070c | |
parent | 1dd7ca880be13023c26d4c4072665b7915bb16a3 (diff) | |
download | aur-bb6435abd5b7727e2ede595972abc968b2aeba18.tar.gz |
Update to 3.1.6
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 21 | ||||
-rw-r--r-- | wxGTK-collision.patch | 10 | ||||
-rw-r--r-- | wxgtk-abicheck.patch | 47 |
5 files changed, 78 insertions, 17 deletions
@@ -1,7 +1,7 @@ pkgbase = wxwidgets-dev-light pkgdesc = wxWidgets suite for Base, GTK2 and GTK3 toolkits . Development branch (GNOME/GStreamer free!) - pkgver = 3.1.5 - pkgrel = 2 + pkgver = 3.1.6 + pkgrel = 1 url = http://wxwidgets.org arch = x86_64 license = custom:wxWindows @@ -16,14 +16,18 @@ pkgbase = wxwidgets-dev-light makedepends = libsecret makedepends = libxtst options = debug - source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.1.5 - source = https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/wxgtk/trunk/wxgtk-abicheck.patch + source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.1.6 + source = wxgtk-abicheck.patch source = git+https://github.com/wxWidgets/Catch.git + source = git+https://github.com/wxWidgets/pcre.git + source = git+https://github.com/wxWidgets/nanosvg.git source = wxGTK-collision.patch sha256sums = SKIP - sha256sums = 53501db871290b71967af08b60aedb738c920a307ef9bd32dd19c30498732cf8 + sha256sums = 81d596168253b05a36758235b054542f53e00e488a20da60f458126d46992ce3 sha256sums = SKIP - sha256sums = 48b528acbbbbb0bc409c1efed04a0a055a5c81393ae3133c6339aee6821acfe5 + sha256sums = SKIP + sha256sums = SKIP + sha256sums = 605df102a0f1610ab37c5294166644de0d17592d806147b0fb283cb5c3ce172e pkgname = wxgtk2-dev-light pkgdesc = wxWidgets GTK2 Toolkit. Development branch (GNOME/GStreamer free!) diff --git a/.gitignore b/.gitignore index 3ecbaee32917..1038c8ed3357 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ !.SRCINFO !PKGBUILD !wxGTK-collision.patch +!wxgtk-abicheck.patch @@ -5,8 +5,8 @@ pkgname=('wxgtk2-dev-light' 'wxgtk3-dev-light' 'wxcommon-dev-light' ) -pkgver=3.1.5 -pkgrel=2 +pkgver=3.1.6 +pkgrel=1 pkgdesc="wxWidgets suite for Base, GTK2 and GTK3 toolkits . Development branch (GNOME/GStreamer free!)" arch=('x86_64') url='http://wxwidgets.org' @@ -23,14 +23,18 @@ makedepends=('git' 'libxtst' ) source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}" - 'https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/wxgtk/trunk/wxgtk-abicheck.patch' + 'wxgtk-abicheck.patch' 'git+https://github.com/wxWidgets/Catch.git' + 'git+https://github.com/wxWidgets/pcre.git' + 'git+https://github.com/wxWidgets/nanosvg.git' 'wxGTK-collision.patch' ) sha256sums=('SKIP' - '53501db871290b71967af08b60aedb738c920a307ef9bd32dd19c30498732cf8' + '81d596168253b05a36758235b054542f53e00e488a20da60f458126d46992ce3' 'SKIP' - '48b528acbbbbb0bc409c1efed04a0a055a5c81393ae3133c6339aee6821acfe5' + 'SKIP' + 'SKIP' + '605df102a0f1610ab37c5294166644de0d17592d806147b0fb283cb5c3ce172e' ) options=('debug') @@ -40,7 +44,12 @@ prepare() { cd wxwidgets git config submodule.3rdparty/catch.url "${srcdir}/Catch" - git submodule update --init 3rdparty/catch + git config submodule.3rdparty/pcre.url "${srcdir}/pcre" + git config submodule.3rdparty/nanosvg.url "${srcdir}/nanosvg" + git submodule update --init \ + 3rdparty/catch \ + 3rdparty/pcre \ + 3rdparty/nanosvg patch -Np1 -i "${srcdir}/wxGTK-collision.patch" diff --git a/wxGTK-collision.patch b/wxGTK-collision.patch index a1006cd9d3c7..2c823ec5cbdd 100644 --- a/wxGTK-collision.patch +++ b/wxGTK-collision.patch @@ -24,14 +24,14 @@ locale_install: $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale diff --git a/utils/wxrc/Makefile.in b/utils/wxrc/Makefile.in -index 9b24d92a79..a189dcb454 100644 +index 25a00a7ac2..0e76683b09 100644 --- a/utils/wxrc/Makefile.in +++ b/utils/wxrc/Makefile.in @@ -126,6 +126,7 @@ distclean: clean - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) + + @COND_USE_XML_1@uninstall_wxrc: + @COND_USE_XML_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) +@COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)$(WX_FLAVOUR)$(EXEEXT) - + wxrc_wxrc.o: $(srcdir)/wxrc.cpp $(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp diff --git a/wxgtk-abicheck.patch b/wxgtk-abicheck.patch new file mode 100644 index 000000000000..eea4f7f6e53c --- /dev/null +++ b/wxgtk-abicheck.patch @@ -0,0 +1,47 @@ +Description: Suppress error about mismatching C++ ABI version + In practice, the differences between recent ABI versions don't seem to be + incompatible since they apparently only affect obscure corner cases. So + suppress this error so we don't have to rebuild the entire wx world in one + go. +Original Author: Olly Betts <olly@survex.com> +Forwarded: no +Last-Update: 2017-07-26 + +MOD for 3.1.6 by sL1pKn07 (2022-04-11) + +diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp +index b450b33582..eecef3ac36 100644 +--- a/src/common/appbase.cpp ++++ b/src/common/appbase.cpp +@@ -842,9 +842,30 @@ bool wxAppConsoleBase::CheckBuildOptions(const char *optionsSignature, + wxString lib = wxString::FromAscii(WX_BUILD_OPTIONS_SIGNATURE); + wxString prog = wxString::FromAscii(optionsSignature); + wxString progName = wxString::FromAscii(componentName); ++ wxString msg; + +- wxLogFatalError(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), ++ msg.Printf(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib, progName, prog); ++ int l_off = lib.Find("compiler with C++ ABI "); ++ int p_off = prog.Find("compiler with C++ ABI "); ++ if (l_off != wxNOT_FOUND && p_off != wxNOT_FOUND) { ++ int space; ++ space = lib.find(',', l_off + 22); ++ lib.erase(l_off, space - l_off); ++ space = prog.find(',', p_off + 22); ++ prog.erase(p_off, space - p_off); ++ if (lib == prog) { ++ // The only difference is the ABI version, which apparently only ++ // affect obscure cases. We used to warn here, so at least ++ // there was an indication of what's up if there is a problem ++ // due to ABI incompatibilities, but wxLogWarning() can result ++ // in a pop up dialog with some applications, which is just too ++ // intrusive, so just quietly ignore instead. ++ //wxLogWarning(msg); ++ return false; ++ } ++ } ++ wxLogFatalError(msg); + + // normally wxLogFatalError doesn't return + return false; |