Fixing HAVE_LARGEFILE_SUPPORT bug(?)

1 files changed, 75 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5ae96d2d3206..7b0f26ae802d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,11 @@
 pkgbase=wxwidgets-light
 pkgname=('wxwidgets-common-light'
          'wxwidgets-gtk3-light'
+#          'wxwidgets-gtk4-light'
          'wxwidgets-qt5-light'
          )
 pkgver=3.2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="wxWidgets suite for Base, Qt5 and GTK3 toolkits (GNOME/GStreamer free!)"
 arch=('x86_64')
 url='http://wxwidgets.org'
@@ -15,6 +16,8 @@ makedepends=('git'
              'cmake'
              'glu'
              'webkit2gtk'
+             'gtk3'
+#              'gtk4'
              'libnotify'
              'qt5-base'
              'sdl2'
@@ -34,6 +37,9 @@ options=('debug')
 prepare() {
   cd wxwidgets
 
+  # fix https://github.com/wxWidgets/wxWidgets/issues/22750
+  git cherry-pick 19100f63ca0e19234010230bcd854b53d4989f7b -m 1
+
   git config submodule.3rdparty/nanosvg.url "${srcdir}/nanosvg"
   git -c protocol.file.allow=always submodule update --init \
     3rdparty/nanosvg
@@ -46,7 +52,7 @@ build() {
     -DCMAKE_BUILD_TYPE=None \
     -DwxUSE_GUI=OFF \
     -DwxUSE_OPENGL=ON \
-    -DwxUSE_REGEX=sys\
+    -DwxUSE_REGEX=sys \
     -DwxUSE_ZLIB=sys \
     -DwxUSE_EXPAT=sys \
     -DwxUSE_LIBJPEG=sys \
@@ -54,6 +60,7 @@ build() {
     -DwxUSE_LIBTIFF=sys \
     -DwxUSE_LIBLZMA=ON \
     -DwxUSE_LIBMSPACK=ON \
+    -DwxUSE_LIBSDL=ON \
     -DwxUSE_STL=ON \
     -DwxUSE_PRIVATE_FONTS=ON
 
@@ -65,7 +72,7 @@ build() {
     -DCMAKE_BUILD_TYPE=None \
     -DwxBUILD_TOOLKIT=gtk3 \
     -DwxUSE_OPENGL=ON \
-    -DwxUSE_REGEX=sys\
+    -DwxUSE_REGEX=sys \
     -DwxUSE_ZLIB=sys \
     -DwxUSE_EXPAT=sys \
     -DwxUSE_LIBJPEG=sys \
@@ -73,6 +80,7 @@ build() {
     -DwxUSE_LIBTIFF=sys \
     -DwxUSE_LIBLZMA=ON \
     -DwxUSE_LIBMSPACK=ON \
+    -DwxUSE_LIBSDL=ON \
     -DwxUSE_STL=ON \
     -DwxUSE_MEDIACTRL=OFF \
     -DwxUSE_PRIVATE_FONTS=ON \
@@ -82,6 +90,30 @@ build() {
 
   cmake --build build-gtk3
 
+#   msg2 "Build WxGTK4"
+#     cmake -S wxwidgets -B build-gtk4 \
+#     -DCMAKE_INSTALL_PREFIX=/usr \
+#     -DCMAKE_BUILD_TYPE=None \
+#     -DwxBUILD_TOOLKIT=gtk4 \
+#     -DwxUSE_OPENGL=ON \
+#     -DwxUSE_REGEX=sys \
+#     -DwxUSE_ZLIB=sys \
+#     -DwxUSE_EXPAT=sys \
+#     -DwxUSE_LIBJPEG=sys \
+#     -DwxUSE_LIBPNG=sys \
+#     -DwxUSE_LIBTIFF=sys \
+#     -DwxUSE_LIBLZMA=ON \
+#     -DwxUSE_LIBMSPACK=ON \
+#     -DwxUSE_LIBSDL=ON \
+#     -DwxUSE_STL=ON \
+#     -DwxUSE_MEDIACTRL=OFF \
+#     -DwxUSE_PRIVATE_FONTS=ON \
+#     -DwxUSE_GTKPRINT=ON \
+#     -DwxUSE_DETECT_SM=ON \
+#     -DwxUSE_AUTOID_MANAGEMENT=ON
+
+#   cmake --build build-gtk4
+
   msg2 "Build WxQT5"
   cmake -S wxwidgets -B build-qt5 \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -96,6 +128,7 @@ build() {
     -DwxUSE_LIBTIFF=sys \
     -DwxUSE_LIBLZMA=ON \
     -DwxUSE_LIBMSPACK=ON \
+    -DwxUSE_LIBSDL=ON \
     -DwxUSE_STL=ON \
     -DwxUSE_MEDIACTRL=OFF \
     -DwxUSE_PRIVATE_FONTS=ON \
@@ -106,7 +139,8 @@ build() {
 
   # Run configure to generate the Makefile, cmake doesn't install translations
   cd wxwidgets
-  ./configure --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --disable-tests
 }
 
@@ -132,9 +166,6 @@ 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"
 }
 
@@ -170,12 +201,46 @@ 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-gtk4-light() {
+  pkgdesc="wxWidgets GTK4 Toolkit (GNOME/GStreamer free!)"
+  depends=('wxwidgets-common-light'
+           'sdl2'
+           'libgspell-1.so'
+           'libgtk-4.so'
+           'libmspack.so'
+           'libnotify.so'
+           'libtiff.so'
+           )
+  optdepends=('webkit2gtk: for webview support')
+  provides=('wxwidgets'
+            'wxwidgets-gtk4'
+            'wxgtk4'
+            )
+  conflicts=('wxwidgets-gtk4'
+             'wxgtk4'
+             )
+  replaces=('wxgtk4-light'
+            'wxgtk4'
+            )
+
+  make -C build-gtk3 DESTDIR="${pkgdir}" install
+
+  ln -s wx-config "${pkgdir}/usr/bin/wx-config-gtk4"
+  rm -fr "${pkgdir}/usr/bin/"wxrc{,-3*}
+  rm -fr "${pkgdir}/usr/include"
+  rm -fr "${pkgdir}/usr/lib/"*base*
+  rm -fr "${pkgdir}/usr/lib/cmake"
+  rm -fr "${pkgdir}/usr/share/bakefile"
+  rm -fr "${pkgdir}/usr/share/"{aclocal,locale}
+
+
+  install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/wxwidgets-gtk4-light/LICENSE"
+}
+
 package_wxwidgets-common-light() {
   pkgdesc="wxWidgets common & base (GNOME/GStreamer free!)"
   depends=('sh'
@@ -199,6 +264,7 @@ package_wxwidgets-common-light() {
 
   make -C build-qt5 DESTDIR="${pkgdir}" install
   make -C build-gtk3 DESTDIR="${pkgdir}" install
+#   make -C build-gtk4 DESTDIR="${pkgdir}" install
   make -C build-base DESTDIR="${pkgdir}" install
 
   mv "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config-base"
@@ -207,9 +273,6 @@ 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