diff --git a/wxgtk-common/.signature b/wxgtk-common/.signature index 5203280d0..8e93a895c 100644 --- a/wxgtk-common/.signature +++ b/wxgtk-common/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF34z1VhfJyBXbwSJ/KCZC4ly3HAJZNrIV+6AGiBTUAUXfafZpxSGzOmQRVndR8haD1jj8uPOuvgpdxXFM81YdKg0= -SHA256 (Pkgfile) = f810679e36d43df2f0d5be1417e55fb69ea934ea77c16ada0d2e42ac795cfe33 +RWSagIOpLGJF38xcvUClOC4/qFotc1NBNrldlgTLuaFy62NUfAOqFUEOue2pQ5jI++Gzamy6kFGuWto4+fsrp+z+5Ysa3Y7wVAU= +SHA256 (Pkgfile) = 0145942ea5b2f57403622f594ec9eff57e8e770010e6326d95b490c21332a78e SHA256 (.footprint) = 63ab29d461defdfecca724d4faeac4f14514d46345cb9f2576f84fed69244cf2 SHA256 (wxWidgets-3.2.2.1.tar.bz2) = dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02 diff --git a/wxgtk-common/Pkgfile b/wxgtk-common/Pkgfile index ecfc03c28..3fcc3ece5 100644 --- a/wxgtk-common/Pkgfile +++ b/wxgtk-common/Pkgfile @@ -1,7 +1,7 @@ # Description: Common libraries and headers for wxgtk2 and wxgtk3 # URL: http://www.wxwidgets.org/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: gtk3 glu gst-plugins-base +# Maintainer: unmaintained +# Depends on: gst-plugins-base gtk3 name=wxgtk-common version=3.2.2.1 @@ -9,27 +9,27 @@ 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 \ - -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 \ + -Wno-dev - cmake --build build - DESTDIR=$PKG cmake --install build + cmake --build build + DESTDIR=$PKG cmake --install build - rm -r $PKG/usr/{bin/wx-config,lib/{wx,libwx_gtk*}} + rm -r $PKG/usr/{bin/wx-config,lib/{wx,libwx_gtk*}} } diff --git a/wxgtk-common/make-abicheck-non-fatal.patch b/wxgtk-common/make-abicheck-non-fatal.patch deleted file mode 100644 index 97055ba46..000000000 --- a/wxgtk-common/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 -