Merge pull request #10555 from Rmys/master

filezilla ver. bump
2022-07-27 17:03:43 +03:00
parent 48d1e9a9b2 c6c1880a8e
commit 2b0b95258d
4 changed files with 39 additions and 3 deletions
@@ -10,10 +10,11 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import get

 def setup():
-    shelltools.system("sed -i '/^#define/a #include <list>' src/interface/Mainfrm.h")
+    #shelltools.system("sed -i '/^#define/a #include <list>' src/interface/Mainfrm.h")
    #shelltools.export("WXRC", "/usr/bin/wxrc")
    #shelltools.export("LDFLAGS", "%s -lpthread" % get.LDFLAGS())
    #pisitools.dosed("data/filezilla.desktop", "Icon=filezilla", "Icon=/usr/share/pixmaps/filezilla.png")
+    autotools.autoreconf("-fiv")
    autotools.configure("--disable-static \
                         --disable-manualupdatecheck \
                         --disable-autoupdatecheck \
@@ -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:
@@ -13,7 +13,7 @@
        <IsA>app:gui</IsA>
        <Summary>Simple FTP Client</Summary>
        <Description>Easy-to-use FTP Client which also supports SFTP.</Description>
-        <Archive sha1sum="8e71aa7864097ab9e2eb45efd6fb2ac938f7b496" type="tarbz2">https://download.filezilla-project.org/client/FileZilla_3.51.0_src.tar.bz2</Archive>
+        <Archive sha1sum="ced5ec9257a4142046c73350db5ae215eebd5f4c" type="tarbz2">https://download.filezilla-project.org/client/FileZilla_3.60.2_src.tar.bz2</Archive>
        <BuildDependencies>
            <Dependency>wxGTK3</Dependency>
            <Dependency>wxGTK-common</Dependency>
@@ -29,7 +29,7 @@
            <Dependency>libfilezilla-devel</Dependency>
        </BuildDependencies>
        <Patches>
-<!--             <Patch>i18n-filezilla.desktop.patch</Patch> -->
+            <Patch>wxwidgets-3.2.patch</Patch>
        </Patches>
    </Source>

@@ -64,6 +64,13 @@
    </Package>

    <History>
+        <Update release="9">
+            <Date>2022-07-27</Date>
+            <Version>3.60.2</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
        <Update release="8">
            <Date>2020-12-17</Date>
            <Version>3.51.0</Version>
@@ -25,6 +25,7 @@ functionality to build high-performing, platform-independent programs.</Descript
    <Package>
        <Name>libfilezilla</Name>
        <RuntimeDependencies>
+            <Dependency>gmp</Dependency>
            <Dependency>libgcc</Dependency>
            <Dependency>gnutls</Dependency>
            <Dependency>nettle</Dependency>