[arch-commits] Commit in filezilla/trunk (PKGBUILD wxwidgets-3.2.patch)

[Antonio Rojas]

    Date: Monday, July 11, 2022 @ 17:04:30
  Author: arojas
Revision: 1249595

wxwidgets 3.2 rebuild

Added:
  filezilla/trunk/wxwidgets-3.2.patch
Modified:
  filezilla/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   22 +++++++++++++++-------
 wxwidgets-3.2.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-11 16:40:37 UTC (rev 1249594)
+++ PKGBUILD	2022-07-11 17:04:30 UTC (rev 1249595)
@@ -4,20 +4,29 @@
 
 pkgname=filezilla
 pkgver=3.60.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Fast and reliable FTP, FTPS and SFTP client'
 url='https://filezilla-project.org/'
 arch=('x86_64')
 license=('GPL')
 depends=(
-  'dbus' 'xdg-utils' 'wxgtk3' 'libidn' 'hicolor-icon-theme' 'sqlite'
+  'dbus' 'xdg-utils' 'wxwidgets-gtk3' 'libidn' 'hicolor-icon-theme' 'sqlite'
   'gnutls' 'libfilezilla'
   libfilezilla.so libdbus-1.so libgtk-3.so libgdk-3.so libnettle.so
 )
-source=(https://download.filezilla-project.org/client/FileZilla_${pkgver}_src.tar.bz2)
-sha256sums=('81f96c63638caf1838e0c63e5874f60192120965d825294a894a22b7d42066af')
-sha512sums=('417b97afd8e9434c625392c4025ab7d977d58fad2dfe17c8ff856233c70b5d77df22c4e1b76120d9d5dba3bce1c61453808deb26314dbde7ec425d643c4f83d9')
+source=(https://download.filezilla-project.org/client/FileZilla_${pkgver}_src.tar.bz2
+        wxwidgets-3.2.patch)
+sha256sums=('81f96c63638caf1838e0c63e5874f60192120965d825294a894a22b7d42066af'
+            'e77564b7c21a443f52dd7cb4fa4b8d1519396b241414fe6ee95feca6e143d748')
+sha512sums=('417b97afd8e9434c625392c4025ab7d977d58fad2dfe17c8ff856233c70b5d77df22c4e1b76120d9d5dba3bce1c61453808deb26314dbde7ec425d643c4f83d9'
+            'd31eb0da71cbc740e6210435f97920caac6c26be98717b656c785df6be248fa27925495fa90b118dcbc582ac32af957472cbbe16fdb4fef0bbc6257d15d06931')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < ../wxwidgets-3.2.patch # Allow building with wxWidgets 3.2
+  autoreconf -vif
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   ./configure \
@@ -24,8 +33,7 @@
     --prefix=/usr \
     --disable-manualupdatecheck \
     --disable-autoupdatecheck \
-    --with-pugixml=builtin \
-    --with-wx-config=/usr/bin/wx-config-gtk3
+    --with-pugixml=builtin
   make
 }
 

Added: wxwidgets-3.2.patch
===================================================================
--- wxwidgets-3.2.patch	                        (rev 0)
+++ wxwidgets-3.2.patch	2022-07-11 17:04:30 UTC (rev 1249595)
@@ -0,0 +1,27 @@
+diff -ru filezilla-3.60.1.orig/configure.ac filezilla-3.60.1/configure.ac
+--- filezilla-3.60.1.orig/configure.ac	2022-07-07 23:16:56.929350754 +0200
++++ filezilla-3.60.1/configure.ac	2022-07-11 19:02:07.212006501 +0200
+@@ -185,11 +185,6 @@
+         equivalent variable and wxWidgets version is $MIN_WX_VERSION or above.
+     ])
+   fi
+-  if test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" = "3.1"; then
+-    AC_MSG_ERROR([You must use wxWidgets 3.0.x, development versions of wxWidgets are not supported.])
+-  elif test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" != "3.0"; then
+-    AC_MSG_ERROR([You must use wxWidgets 3.0.x, wxWidgets 3.2 or higher is not yet supported.])
+-  fi
+   
+   if test "${WX_VERSION_MAJOR}.${WX_VERSION_MINOR}" = "3.0"; then
+     MAC_REQUIRES_AQUA="YES"
+diff -ru filezilla-3.60.1.orig/src/interface/search.h filezilla-3.60.1/src/interface/search.h
+--- filezilla-3.60.1.orig/src/interface/search.h	2022-07-07 23:16:56.962684362 +0200
++++ filezilla-3.60.1/src/interface/search.h	2022-07-11 19:01:24.584985318 +0200
+@@ -13,7 +13,7 @@
+ class CSearchDialogFileList;
+ class CWindowStateManager;
+ 
+-class CSearchDialog final : protected CFilterConditionsDialog, public CStateEventHandler
++class CSearchDialog final : public CFilterConditionsDialog, public CStateEventHandler
+ {
+ 	friend class CSearchDialogFileList;
+ public: