Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Conner Clere (3eaaf94b78baff7abdcc0541875fa35dd1ece08e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Conner Clere <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Conner Clere (3eaaf94b78baff7abdcc0541875fa35dd1ece08e)
  • Date: Wed, 3 Jan 2024 07:46:26 +0000

GIT changes to master grimoire by Conner Clere <xenanthropy AT sourcemage.org>:

ftp/filezilla/0001-remove-test-for-specific-version-of-wxwidgets.patch |
28 ----------
ftp/filezilla/DETAILS |
6 +-
ftp/filezilla/HISTORY |
5 +
ftp/filezilla/PRE_BUILD |
3 -
4 files changed, 8 insertions(+), 34 deletions(-)

New commits:
commit 3eaaf94b78baff7abdcc0541875fa35dd1ece08e
Author: Conner Clere <xenanthropy AT sourcemage.org>
Commit: Conner Clere <xenanthropy AT sourcemage.org>

ftp/filezilla: version 3.66.4

also removed patch that fixes compilation if you're using a version of
wxwidgets > 3, tested compiling with wxwidgets 3.2 and the error does
not occur with the patch - so it is no longer needed

diff --git
a/ftp/filezilla/0001-remove-test-for-specific-version-of-wxwidgets.patch
b/ftp/filezilla/0001-remove-test-for-specific-version-of-wxwidgets.patch
deleted file mode 100644
index fa66b30..0000000
--- a/ftp/filezilla/0001-remove-test-for-specific-version-of-wxwidgets.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e73ca9e3189667897678a900425055f111f580ec Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sat, 18 Feb 2017 12:28:35 +0100
-Subject: [PATCH] remove test for specific version of wxwidgets
-
----
- configure.ac | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6aacb20..83476ea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -177,11 +177,6 @@ if test "$buildmain" = "yes"; then
- 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
-
- # --universal=no doesn't work correctly, it still accepts universal
builds. Reject it manually here.
- if echo "$WX_CPPFLAGS" | grep __WXUNIVERSAL__ > /dev/null; then
---
-2.11.1
-
diff --git a/ftp/filezilla/DETAILS b/ftp/filezilla/DETAILS
index 1fe1565..e5f59c6 100755
--- a/ftp/filezilla/DETAILS
+++ b/ftp/filezilla/DETAILS
@@ -1,8 +1,8 @@
SPELL=filezilla
- VERSION=3.54.1
- SOURCE="FileZilla_${VERSION}_src.tar.bz2"
+ VERSION=3.66.4
+ SOURCE="FileZilla_${VERSION}_src.tar.xz"

SOURCE_URL[0]=https://downloads.sourceforge.net/project/portableapps/Source/FileZilla/$SOURCE
-
SOURCE_HASH=sha512:d41b9fb303c11c81ceb0577fa5d40d6f5d9d1dc70a6a6bb6dac5c4cb7f8fc22cf06c2cf2e7415d922d11d5d4262832db89647acc34fa9a6cd92105b7700901df
+
SOURCE_HASH=sha512:17c0655988229bcfb056fe86bf8d6a21ea961420cc0073b3c4416c7fda999edd8dff7c6fe6b2121afad12acc4e6e525474a24a253c2e5312b74539de4232ef6b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://filezilla-project.org/";
LICENSE[0]=GPL
diff --git a/ftp/filezilla/HISTORY b/ftp/filezilla/HISTORY
index a78d46d..928bc4d 100644
--- a/ftp/filezilla/HISTORY
+++ b/ftp/filezilla/HISTORY
@@ -1,3 +1,8 @@
+2024-01-03 Conner Clere <xenanthropy AT sourcemage.org>
+ * DETAILS: version 3.66.4, update source archive (bz2 -> xz)
+ * 0001-remove-test-for-specific-version-of-wxwidgets.patch: removed
+ * PRE_BUILD: remove patch line
+
2021-06-27 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 3.54.1

diff --git a/ftp/filezilla/PRE_BUILD b/ftp/filezilla/PRE_BUILD
index f3190bb..ae7292a 100755
--- a/ftp/filezilla/PRE_BUILD
+++ b/ftp/filezilla/PRE_BUILD
@@ -1,6 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 <
"$SPELL_DIRECTORY/0001-remove-test-for-specific-version-of-wxwidgets.patch" &&
-
autoreconf -fi



  • [SM-Commit] GIT changes to master grimoire by Conner Clere (3eaaf94b78baff7abdcc0541875fa35dd1ece08e), Conner Clere, 01/03/2024

Archive powered by MHonArc 2.6.24.

Top of Page