diff --git a/wxgtk3/.signature b/wxgtk3/.signature index ed6e85c5b..c73695d84 100644 --- a/wxgtk3/.signature +++ b/wxgtk3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/LaTfGkrFfW0CQBw4yTJr5gPG3w94jehBRE3NMiEbSYakq0+HgAIV6hDNrZguxczd6m7Gw5bKRSTZ/Sx8Cl3AE= -SHA256 (Pkgfile) = ff65ffa479c0999fe15f8847838c3742669a6b8fcd2e767ee0f47cd95723e1ee +RWSagIOpLGJF38ejwnVsN9qipVd7o4EJdGZA9FaV0XTro+7IrIjx6aiyT2jzf2c7vBq/UoECWM83p7i3+qaXFYtgWvm1wTI1pg0= +SHA256 (Pkgfile) = 00fd24432b648106e472a9916b266e8eb8082ecc82e6faa512f32482dfc405f3 SHA256 (.footprint) = 73488b60d266f825ca38c647249d8351bd56a3fcc2e293f98b8c4b7837cba853 SHA256 (wxWidgets-3.2.2.1.tar.bz2) = dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02 diff --git a/wxgtk3/Pkgfile b/wxgtk3/Pkgfile index 1a3c94e6c..2efbce116 100644 --- a/wxgtk3/Pkgfile +++ b/wxgtk3/Pkgfile @@ -1,6 +1,6 @@ # Description: GTK+3 implementation of wxWidgets API for GUI # URL: http://www.wxwidgets.org/ -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: unmaintained # Depends on: wxgtk-common name=wxgtk3 @@ -9,29 +9,29 @@ release=1 source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$version/wxWidgets-$version.tar.bz2) build() { - cmake -S wxWidgets-$version -B build -G Ninja \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_INSTALL_LIBDIR=lib \ - -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ - -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ - -D wxBUILD_TOOLKIT=gtk3 \ - -D wxUSE_OPENGL=ON \ - -D wxUSE_REGEX=sys\ - -D wxUSE_ZLIB=sys \ - -D wxUSE_EXPAT=sys \ - -D wxUSE_LIBJPEG=sys \ - -D wxUSE_LIBPNG=sys \ - -D wxUSE_LIBTIFF=sys \ - -D wxUSE_LIBLZMA=sys \ - -D wxUSE_LIBMSPACK=ON \ - -D wxUSE_PRIVATE_FONTS=ON \ - -D wxUSE_GTKPRINT=ON \ - -Wno-dev + cmake -S wxWidgets-$version -B build -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -D wxBUILD_TOOLKIT=gtk3 \ + -D wxUSE_OPENGL=ON \ + -D wxUSE_REGEX=sys\ + -D wxUSE_ZLIB=sys \ + -D wxUSE_EXPAT=sys \ + -D wxUSE_LIBJPEG=sys \ + -D wxUSE_LIBPNG=sys \ + -D wxUSE_LIBTIFF=sys \ + -D wxUSE_LIBLZMA=sys \ + -D wxUSE_LIBMSPACK=ON \ + -D wxUSE_PRIVATE_FONTS=ON \ + -D wxUSE_GTKPRINT=ON \ + -Wno-dev - cmake --build build - DESTDIR=$PKG cmake --install build + cmake --build build + DESTDIR=$PKG cmake --install build - rm -r $PKG/usr/{include,lib/{libwx_base*,cmake},bin/wxrc*} - mv $PKG/usr/bin/wx-config{,-gtk3} + rm -r $PKG/usr/{include,lib/{libwx_base*,cmake},bin/wxrc*} + mv $PKG/usr/bin/wx-config{,-gtk3} } diff --git a/wxgtk3/make-abicheck-non-fatal.patch b/wxgtk3/make-abicheck-non-fatal.patch deleted file mode 100644 index 97055ba46..000000000 --- a/wxgtk3/make-abicheck-non-fatal.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 -