Date: Thursday, October 27, 2022 @ 19:39:39 Author: freswa Revision: 1338235
upgpkg: filezilla 3.62.0-1 Modified: filezilla/trunk/PKGBUILD filezilla/trunk/wxwidgets-3.2.patch ---------------------+ PKGBUILD | 12 ++++++------ wxwidgets-3.2.patch | 26 ++++++++------------------ 2 files changed, 14 insertions(+), 24 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-27 19:39:39 UTC (rev 1338234) +++ PKGBUILD 2022-10-27 19:39:39 UTC (rev 1338235) @@ -3,8 +3,8 @@ # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=filezilla -pkgver=3.61.0 -pkgrel=2 +pkgver=3.62.0 +pkgrel=1 pkgdesc='Fast and reliable FTP, FTPS and SFTP client' url='https://filezilla-project.org/' arch=('x86_64') @@ -16,10 +16,10 @@ ) source=(https://download.filezilla-project.org/client/FileZilla_${pkgver}_src.tar.bz2 wxwidgets-3.2.patch) -sha256sums=('0afef0e4da25202687b32ed6b1ffcd8442d5b35bdcd16df4f02bb2ea92e299f7' - 'e77564b7c21a443f52dd7cb4fa4b8d1519396b241414fe6ee95feca6e143d748') -sha512sums=('97469bc038eab32f526859ae5db58eeef6f1a8128f67bc653b6b3707b1aa7c9771ef5caa780daa4d11d20d4e7ed8e5df24ef8bd70ee2353f80d77d5410cfa722' - 'd31eb0da71cbc740e6210435f97920caac6c26be98717b656c785df6be248fa27925495fa90b118dcbc582ac32af957472cbbe16fdb4fef0bbc6257d15d06931') +sha256sums=('ab16663f320e831c2b06ed839a9f56aa8412f1b323dc65e65efb93f6a4596f0d' + 'd1b55c763222b625b24e97e2982a0eed5fa16a18909a7a3f86f06b246c2bf3d8') +sha512sums=('4852f81cdaed5fc7bf3acf850ad22c34052099477de09e07115db5f1bd440fd4ec2c04c22c484048e5cd82e4ee3474350a81d91905d0459a98cbedddbe5b6a47' + '0f92bd0180830fdb54cfb2eff2b6ebb3413aaace2b901300ca2f192b5abffea28f511eb26dea4eb8fb2ff8b951d15b4c39bef77cad59542b9f3632bbddd79183') prepare() { cd ${pkgname}-${pkgver} Modified: wxwidgets-3.2.patch =================================================================== --- wxwidgets-3.2.patch 2022-10-27 19:39:39 UTC (rev 1338234) +++ wxwidgets-3.2.patch 2022-10-27 19:39:39 UTC (rev 1338235) @@ -1,7 +1,7 @@ -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 @@ +diff -aur aaa/configure.ac bbb/configure.ac +--- aaa/configure.ac 2022-10-27 15:25:10.000000000 +0200 ++++ bbb/configure.ac 2022-10-27 21:33:52.976284207 +0200 +@@ -178,13 +178,6 @@ equivalent variable and wxWidgets version is $MIN_WX_VERSION or above. ]) fi @@ -8,20 +8,10 @@ - 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.]) +- if ! echo "$WX_CPPFLAGS" | grep __WXMAC__ > /dev/null; then +- AC_MSG_ERROR([You must use wxWidgets 3.0.x, wxWidgets 3.2 or higher is not yet supported.]) +- fi - 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:
