Date: Thursday, August 6, 2020 @ 13:58:04 Author: alucryd Revision: 670933
add lib32-wxgtk3 to replace lib32-wxgtk2 Added: lib32-wxgtk3/ lib32-wxgtk3/trunk/ lib32-wxgtk3/trunk/PKGBUILD lib32-wxgtk3/trunk/make-abicheck-non-fatal.patch -------------------------------+ PKGBUILD | 84 ++++++++++++++++++++++++++++++++++++++++ make-abicheck-non-fatal.patch | 16 +++++++ 2 files changed, 100 insertions(+) Added: lib32-wxgtk3/trunk/PKGBUILD =================================================================== --- lib32-wxgtk3/trunk/PKGBUILD (rev 0) +++ lib32-wxgtk3/trunk/PKGBUILD 2020-08-06 13:58:04 UTC (rev 670933) @@ -0,0 +1,84 @@ +# Maintainer: Maxime Gauduin <[email protected]> +# Contributor: Eric Bélanger <[email protected]> + +pkgname=lib32-wxgtk3 +pkgver=3.0.5.1 +pkgrel=1 +pkgdesc='GTK+ implementation of wxWidgets API for GUI' +arch=(x86_64) +url=https://wxwidgets.org +license=(custom:wxWindows) +depends=( + lib32-expat + lib32-gtk3 + lib32-libjpeg + lib32-libpng + lib32-libsm + lib32-libtiff + lib32-zlib + wxgtk3 +) +makedepends=( + git + lib32-glu +) +conflicts=(lib32-wxgtk) +provides=(lib32-wxgtk) +replaces=(lib32-wxgtk) +_tag=db9378c1d32e84cf7ca4453932df259471d67dc9 +source=( + git+https://github.com/wxWidgets/wxWidgets.git?signed#tag=${_tag} + make-abicheck-non-fatal.patch +) +validpgpkeys=(31FAF2D074EC22A10AA4C6DA06EA41DE4F6C1E86) # Vadim Zeitlin <[email protected]> +sha256sums=( + SKIP + d4c2d070a06eb63f0a018c8cf687589e5ffdec601225b4d16a268ffe390fb58b +) + +prepare() { + cd wxWidgets + + patch -Np1 -i ../make-abicheck-non-fatal.patch + + ./autogen.sh +} + +build() { + cd wxWidgets + + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH=/usr/lib32/pkgconfig + export CFLAGS="-I/usr/include/libtiff32 $CFLAGS" + export CXXFLAGS="-I/usr/include/libtiff32 $CXXFLAGS" + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib32 \ + --enable-graphics_ctx \ + --enable-unicode \ + --disable-mediactrl \ + --disable-precomp-headers \ + --disable-webview \ + --with-gtk=3 \ + --with-lib{jpeg,png,tiff}=sys \ + --with-opengl \ + --with-regex=builtin \ + --without-libnotify + make + make -C locale allmo +} + +package() { + make DESTDIR="${pkgdir}" -C wxWidgets install + rm -rf "${pkgdir}"/usr/{bin/{wx-config,wxrc},include,share} + mv "${pkgdir}"/usr/bin/wxrc{,32}-3.0 + ln -s /usr/bin/wxrc32-3.0 "${pkgdir}"/usr/bin/wxrc32 + ln -s /usr/lib32/wx/config/gtk3-unicode-3.0 "${pkgdir}"/usr/bin/wx-config32 + + install -dm 755 "${pkgdir}"/usr/share/licenses + ln -s wxgtk3 "${pkgdir}"/usr/share/licenses/lib32-wxgtk2 +} + +# vim: ts=2 sw=2 et: Added: lib32-wxgtk3/trunk/make-abicheck-non-fatal.patch =================================================================== --- lib32-wxgtk3/trunk/make-abicheck-non-fatal.patch (rev 0) +++ lib32-wxgtk3/trunk/make-abicheck-non-fatal.patch 2020-08-06 13:58:04 UTC (rev 670933) @@ -0,0 +1,16 @@ +diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp +--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100 ++++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100 +@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con + msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."), + lib.c_str(), progName.c_str(), prog.c_str()); + +- wxLogFatalError(msg.c_str()); +- +- // normally wxLogFatalError doesn't return +- return false; ++ wxLogWarning(msg.c_str()); + } + #undef wxCMP + +
