Update to 3.2.2.1

2 files changed, 60 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82278dcaa743..1ceeabeef456 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
 pkgbase = wxwidgets-light
 	pkgdesc = wxWidgets suite for Base, Qt5 and GTK3 toolkits (GNOME/GStreamer free!)
-	pkgver = 3.2.1
+	pkgver = 3.2.2.1
 	pkgrel = 1
 	url = http://wxwidgets.org
 	arch = x86_64
 	license = custom:wxWindows
 	makedepends = git
+	makedepends = cmake
 	makedepends = glu
-	makedepends = sh
+	makedepends = webkit2gtk
 	makedepends = libnotify
-	makedepends = libsecret
+	makedepends = qt5-base
+	makedepends = sdl2
 	makedepends = libmspack
-	makedepends = webkit2gtk
+	makedepends = libsecret
+	makedepends = sh
 	makedepends = gspell
-	makedepends = qt5-base
-	makedepends = cmake
 	options = debug
-	source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.2.1
+	source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.2.2.1
 	source = git+https://github.com/wxWidgets/nanosvg.git
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -24,9 +25,9 @@ pkgbase = wxwidgets-light
 pkgname = wxwidgets-common-light
 	pkgdesc = wxWidgets common & base (GNOME/GStreamer free!)
 	depends = sh
-	depends = expat
-	depends = zlib
+	depends = libexpat.so
 	depends = libsecret-1.so
+	depends = libpcre2-32.so
 	provides = wxbase
 	provides = wxbase-light
 	provides = wxgtk-common
@@ -42,9 +43,12 @@ pkgname = wxwidgets-gtk3-light
 	pkgdesc = wxWidgets GTK3 Toolkit (GNOME/GStreamer free!)
 	depends = wxwidgets-common-light
 	depends = sdl2
-	depends = libmspack
-	depends = gspell
-	depends = webkit2gtk
+	depends = libgspell-1.so
+	depends = libgtk-3.so
+	depends = libmspack.so
+	depends = libnotify.so
+	depends = libtiff.so
+	optdepends = webkit2gtk: for webview support
 	provides = wxwidgets
 	provides = wxwidgets-gtk3
 	provides = wxgtk3
@@ -58,8 +62,7 @@ pkgname = wxwidgets-qt5-light
 	depends = wxwidgets-common-light
 	depends = qt5-base
 	depends = sdl2
-	depends = libnotify
-	depends = libmspack
+	depends = libmspack.so
 	provides = wxwidgets-qt5
 	provides = wxwidgets
 	conflicts = wxwidgets-qt5
diff --git a/PKGBUILD b/PKGBUILD
index 9ab69fc74918..5ae96d2d3206 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,22 +5,23 @@ pkgname=('wxwidgets-common-light'
          'wxwidgets-gtk3-light'
          'wxwidgets-qt5-light'
          )
-pkgver=3.2.1
+pkgver=3.2.2.1
 pkgrel=1
 pkgdesc="wxWidgets suite for Base, Qt5 and GTK3 toolkits (GNOME/GStreamer free!)"
 arch=('x86_64')
 url='http://wxwidgets.org'
 license=('custom:wxWindows')
 makedepends=('git'
+             'cmake'
              'glu'
-             'sh'
+             'webkit2gtk'
              'libnotify'
-             'libsecret'
+             'qt5-base'
+             'sdl2'
              'libmspack'
-             'webkit2gtk'
+             'libsecret'
+             'sh'
              'gspell'
-             'qt5-base'
-             'cmake'
              )
 source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}"
         'git+https://github.com/wxWidgets/nanosvg.git'
@@ -31,19 +32,19 @@ sha256sums=('SKIP'
 options=('debug')
 
 prepare() {
-  mkdir -p build-{base,gtk3,qt5}
-
   cd wxwidgets
 
   git config submodule.3rdparty/nanosvg.url "${srcdir}/nanosvg"
-  git submodule update --init 3rdparty/nanosvg
+  git -c protocol.file.allow=always submodule update --init \
+    3rdparty/nanosvg
 }
 
 build() {
   msg2 "Build WxBASE"
-  cmake -B build-base -S wxwidgets \
+  cmake -S wxwidgets -B build-base \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=None \
+    -DwxUSE_GUI=OFF \
     -DwxUSE_OPENGL=ON \
     -DwxUSE_REGEX=sys\
     -DwxUSE_ZLIB=sys \
@@ -51,16 +52,15 @@ build() {
     -DwxUSE_LIBJPEG=sys \
     -DwxUSE_LIBPNG=sys \
     -DwxUSE_LIBTIFF=sys \
-    -DwxUSE_LIBLZMA=sys \
+    -DwxUSE_LIBLZMA=ON \
     -DwxUSE_LIBMSPACK=ON \
     -DwxUSE_STL=ON \
-    -DwxUSE_PRIVATE_FONTS=ON \
-    -DwxUSE_GUI=OFF
+    -DwxUSE_PRIVATE_FONTS=ON
 
   cmake --build build-base
 
   msg2 "Build WxGTK3"
-    cmake -B build-gtk3 -S wxwidgets \
+    cmake -S wxwidgets -B build-gtk3 \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=None \
     -DwxBUILD_TOOLKIT=gtk3 \
@@ -71,17 +71,19 @@ build() {
     -DwxUSE_LIBJPEG=sys \
     -DwxUSE_LIBPNG=sys \
     -DwxUSE_LIBTIFF=sys \
-    -DwxUSE_LIBLZMA=sys \
+    -DwxUSE_LIBLZMA=ON \
     -DwxUSE_LIBMSPACK=ON \
     -DwxUSE_STL=ON \
     -DwxUSE_MEDIACTRL=OFF \
     -DwxUSE_PRIVATE_FONTS=ON \
-    -DwxUSE_GTKPRINT=ON -DCMAKE_CXX_FLAGS="$CXXFLAGS -I/usr/include/gtk-3.0/unix-print/"
+    -DwxUSE_GTKPRINT=ON \
+    -DwxUSE_DETECT_SM=ON \
+    -DwxUSE_AUTOID_MANAGEMENT=ON
 
   cmake --build build-gtk3
 
   msg2 "Build WxQT5"
-  cmake -B build-qt5 -S wxwidgets \
+  cmake -S wxwidgets -B build-qt5 \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=None \
     -DwxBUILD_TOOLKIT=qt \
@@ -92,17 +94,20 @@ build() {
     -DwxUSE_LIBJPEG=sys \
     -DwxUSE_LIBPNG=sys \
     -DwxUSE_LIBTIFF=sys \
-    -DwxUSE_LIBLZMA=sys \
+    -DwxUSE_LIBLZMA=ON \
     -DwxUSE_LIBMSPACK=ON \
     -DwxUSE_STL=ON \
     -DwxUSE_MEDIACTRL=OFF \
-    -DwxUSE_PRIVATE_FONTS=ON
+    -DwxUSE_PRIVATE_FONTS=ON \
+    -DwxUSE_DETECT_SM=ON \
+    -DwxUSE_AUTOID_MANAGEMENT=ON
 
   cmake --build build-qt5
 
   # Run configure to generate the Makefile, cmake doesn't install translations
   cd wxwidgets
-  ./configure --prefix=/usr --disable-tests
+  ./configure --prefix=/usr \
+    --disable-tests
 }
 
 package_wxwidgets-qt5-light() {
@@ -110,8 +115,7 @@ pkgdesc="wxWidgets Qt5 Toolkit (GNOME/GStreamer free!)"
   depends=('wxwidgets-common-light'
            'qt5-base'
            'sdl2'
-           'libnotify'
-           'libmspack'
+           'libmspack.so'
            )
   provides=('wxwidgets-qt5'
             'wxwidgets'
@@ -128,6 +132,9 @@ pkgdesc="wxWidgets Qt5 Toolkit (GNOME/GStreamer free!)"
   rm -fr "${pkgdir}/usr/share/bakefile"
   rm -fr "${pkgdir}/usr/share/"{aclocal,locale}
 
+  # post fix https://github.com/wxWidgets/wxWidgets/issues/22750
+  sed '/HAVE_LARGEFILE_SUPPORT/c#define HAVE_LARGEFILE_SUPPORT 1' -i "${pkgdir}/usr/lib/wx/include/qt-unicode-3.2/wx/setup.h"
+
   install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxwidgets-qt5-light/LICENSE"
 }
 
@@ -135,10 +142,13 @@ package_wxwidgets-gtk3-light() {
   pkgdesc="wxWidgets GTK3 Toolkit (GNOME/GStreamer free!)"
   depends=('wxwidgets-common-light'
            'sdl2'
-           'libmspack'
-           'gspell'
-           'webkit2gtk'
+           'libgspell-1.so'
+           'libgtk-3.so'
+           'libmspack.so'
+           'libnotify.so'
+           'libtiff.so'
            )
+  optdepends=('webkit2gtk: for webview support')
   provides=('wxwidgets'
             'wxwidgets-gtk3'
             'wxgtk3'
@@ -160,15 +170,18 @@ package_wxwidgets-gtk3-light() {
   rm -fr "${pkgdir}/usr/share/bakefile"
   rm -fr "${pkgdir}/usr/share/"{aclocal,locale}
 
+  # post fix https://github.com/wxWidgets/wxWidgets/issues/22750
+  sed '/HAVE_LARGEFILE_SUPPORT/c#define HAVE_LARGEFILE_SUPPORT 1' -i "${pkgdir}/usr/lib/wx/include/gtk3-unicode-3.2/wx/setup.h"
+
   install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxwidgets-gtk3-light/LICENSE"
 }
 
 package_wxwidgets-common-light() {
   pkgdesc="wxWidgets common & base (GNOME/GStreamer free!)"
   depends=('sh'
-           'expat'
-           'zlib'
+           'libexpat.so'
            'libsecret-1.so'
+           'libpcre2-32.so'
            )
   provides=('wxbase'
             'wxbase-light'
@@ -194,6 +207,9 @@ package_wxwidgets-common-light() {
   rm -fr "${pkgdir}/usr/lib/wx/"{config,include}/{gtk,qt}*
   rm -fr "${pkgdir}/usr/lib/wx/"3*
 
+  # post fix https://github.com/wxWidgets/wxWidgets/issues/22750
+  sed '/HAVE_LARGEFILE_SUPPORT/c#define HAVE_LARGEFILE_SUPPORT 1' -i "${pkgdir}/usr/lib/wx/include/base-unicode-3.2/wx/setup.h"
+
   install -Dm644 wxwidgets/wxwin.m4 -t "${pkgdir}/usr/share/aclocal"
   # Install translations
   make DESTDIR="${pkgdir}" -C wxwidgets locale_install