* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/files/, net-ftp/filezilla/
@ 2016-02-11 9:37 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2016-02-11 9:37 UTC (permalink / raw
To: gentoo-commits
commit: fa71464587ebbe19b7293b8fc6a0d1dd2a40caad
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 11 09:37:10 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 09:37:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa714645
net-ftp/filezilla: Removed old.
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-ftp/filezilla/Manifest | 2 -
.../filezilla/files/filezilla-3.3.5.1-debug.patch | 13 ----
net-ftp/filezilla/filezilla-3.14.0.ebuild | 79 ----------------------
net-ftp/filezilla/filezilla-3.15.0.ebuild | 68 -------------------
4 files changed, 162 deletions(-)
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index c26779c..948859f 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,6 +1,4 @@
DIST FileZilla_3.12.0.2_src.tar.bz2 4440836 SHA256 7a296fc2cd94d00d3a14ad29b84ff081c60a791f4cddc07f0bd8022bd57e1d0d SHA512 163ab37d0b15ffd511c9237727b2a2879c2ff38f264853148633c87ec2d6e07cca1847104eb8c7190a0d27a6978ddb10b10dd8e1ef6e157051567b04d1ec5930 WHIRLPOOL 1b3c859f77ab1c10adcbbbdf6201adfd388d25af4ff91c4a96cba7ff57eadf66a181ddd421b01dc124b2a58ca96599d5cfd11e321dac76afc18a69698dd8d8e1
-DIST FileZilla_3.14.0_src.tar.bz2 4415005 SHA256 92385ab4f30bc7e5e457d6a3310645cc6c4bd0e83a78e12c33f2778b73d579fd SHA512 00d81aeef1d30d16884d34a5c15584204f55f72d9a7ab88cca4ff953c6beda5ef2a7883d095c60826ccadc1c4529c0e6e93c50f5ececc598c2200c32cec5d4c5 WHIRLPOOL fd994ad7f150506111642015bf9ff87481231843512b6b5eac3b2e64ff4e63e2cd2933deb72b466785a09700fd88b9f45302b28dfed71f509001dbeb8a001d99
DIST FileZilla_3.14.1_src.tar.bz2 4411187 SHA256 b10871b6ced5f52062b44deda037edb8a38090b226a018b9b64b1a1feb59d46c SHA512 c97767ed01f4538a2f4b8760601778ca7f9aa99b5b928cb86c9508eba0490bbc1f31921d098e0ccd30712ff06dc9f21d323201fb8bee80b9fb7a6528fbb03368 WHIRLPOOL 1fbccfbb0de5111fad14eb0b38ee190aefc4c80777c3611189c74412dfefdf2fd96d4a42c917791d3a3318b6ae22f01a7d24a4a0904386b22a98693151b5a822
DIST FileZilla_3.15.0.1_src.tar.bz2 4405885 SHA256 267d3e336a7ecc5277950f759a37016e9747e63d1fc315c6798f18d7fea38463 SHA512 f6e40452408dc9cdf4295d04ffc2e202dec6ba4b07eb12875cee6427cf5e930438af26c36e60d4b8e14b95750549ab822512ef39e89199064dd200561793ced9 WHIRLPOOL 62cfead9e69f9195412183b81faa63394b73423ff1396bc2eae09baee8e56ce13a0a00587e0d3f0a78aae339430fc292a8518201cd6bd4de74e661c01845d887
DIST FileZilla_3.15.0.2_src.tar.bz2 4404751 SHA256 333c46709506b2777047556aa9ee791b404e5f8b94236b3c8a789c1dc09f7c4f SHA512 f71cff0c32771de92d3d7140e160ad9474ce8c84b82e3170dbd7d5814d94cf91fbf40d1b4bc581f77dac2082eef662f6ef8100032bdee5a90c1b4658da69bcab WHIRLPOOL 5eef822dd16e0ea9b37097432e22e4b805ab13cfabd5e49e3fa8c0789e191563321c009d46ecf1804f220beab739140b654b188619dcd52895d5442d04f73ab2
-DIST FileZilla_3.15.0_src.tar.bz2 4406433 SHA256 ff852187e11ffe49237ae15c8ca8c920e9dc9019cc88743eeaa62afaeecf9277 SHA512 aa0d3505b36ef3efe9d7912b6236e09d55a9020f2d4a68fb304ea6aff828a50809c0a9b96446ac49514396378cf252f1bf02596a0cb7fa1d9945494816ec6802 WHIRLPOOL 8970ea461f51fd59668df92b5db199700bc935b494d443cafa48b72c92f5bcee0bae81a3f3df5a80c3532fc19be9afb59e023b72388a48f2f0de6db1804f5da7
diff --git a/net-ftp/filezilla/files/filezilla-3.3.5.1-debug.patch b/net-ftp/filezilla/files/filezilla-3.3.5.1-debug.patch
deleted file mode 100644
index 843ea2d..0000000
--- a/net-ftp/filezilla/files/filezilla-3.3.5.1-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.in 2011-02-28 20:47:05.746530082 +0100
-+++ configure.in 2011-02-28 20:48:14.889939315 +0100
-@@ -44,8 +44,8 @@
- if ! test "$localesonly" = "yes"; then
-
- if test "X$GCC" = Xyes; then
-- CFLAGS="$CFLAGS -Wall -g -fexceptions"
-- CXXFLAGS="$CXXFLAGS -Wall -g -fexceptions"
-+ CFLAGS="$CFLAGS -Wall -fexceptions"
-+ CXXFLAGS="$CXXFLAGS -Wall -fexceptions"
- fi
-
- # Add build information to config.h
diff --git a/net-ftp/filezilla/filezilla-3.14.0.ebuild b/net-ftp/filezilla/filezilla-3.14.0.ebuild
deleted file mode 100644
index 88d257b..0000000
--- a/net-ftp/filezilla/filezilla-3.14.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
- >=dev-db/sqlite-3.7
- net-dns/libidn
- >=net-libs/gnutls-3.1.12
- aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
- !aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
- dbus? ( sys-apps/dbus )"
-# >=dev-libs/pugixml-1.5
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
- eautoreconf
-}
-
-src_configure() {
- # system pugixml lacks long long ops support, use builtin for now
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-pugixml=builtin \
- --disable-autoupdatecheck
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- doicon src/interface/resources/48x48/${PN}.png
-
- dodoc AUTHORS ChangeLog NEWS
-
- if use aqua ; then
- cat > "${T}/${PN}" <<-EOF || die
- #!${EPREFIX}/bin/bash
- open "${EPREFIX}"/Applications/FileZilla.app
- EOF
- rm "${ED}/usr/bin/${PN}" || die
- dobin "${T}/${PN}"
- insinto /Applications
- doins -r "${S}"/FileZilla.app
- fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.15.0.ebuild b/net-ftp/filezilla/filezilla-3.15.0.ebuild
deleted file mode 100644
index 4749c32..0000000
--- a/net-ftp/filezilla/filezilla-3.15.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
- >=dev-db/sqlite-3.7
- >=dev-libs/libfilezilla-0.3.0
- >=dev-libs/pugixml-1.7
- net-dns/libidn
- >=net-libs/gnutls-3.1.12
- >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils
- dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-pugixml=system \
- --disable-autoupdatecheck
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- doicon src/interface/resources/48x48/${PN}.png
-
- dodoc AUTHORS ChangeLog NEWS
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/files/, net-ftp/filezilla/
@ 2017-06-04 11:21 Bernard Cafarelli
0 siblings, 0 replies; 6+ messages in thread
From: Bernard Cafarelli @ 2017-06-04 11:21 UTC (permalink / raw
To: gentoo-commits
commit: 4dc28e4b46b43da6a0421f9f8de400643f121b01
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 4 11:20:13 2017 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Jun 4 11:20:13 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dc28e4b
net-ftp/filezilla: clean old versions, security bug #610554
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-ftp/filezilla/Manifest | 6 --
.../filezilla/files/filezilla-3.10.2-debug.patch | 13 ----
.../files/filezilla-3.24.1-desktop_entry.patch | 8 ---
net-ftp/filezilla/filezilla-3.12.0.2.ebuild | 67 -------------------
net-ftp/filezilla/filezilla-3.14.1.ebuild | 78 ----------------------
net-ftp/filezilla/filezilla-3.24.0.ebuild | 68 -------------------
net-ftp/filezilla/filezilla-3.24.1-r1.ebuild | 73 --------------------
net-ftp/filezilla/filezilla-3.25.0.ebuild | 68 -------------------
net-ftp/filezilla/filezilla-3.25.1.ebuild | 68 -------------------
9 files changed, 449 deletions(-)
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 00f1f29a120..59577e1075d 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,7 +1 @@
-DIST FileZilla_3.12.0.2_src.tar.bz2 4440836 SHA256 7a296fc2cd94d00d3a14ad29b84ff081c60a791f4cddc07f0bd8022bd57e1d0d SHA512 163ab37d0b15ffd511c9237727b2a2879c2ff38f264853148633c87ec2d6e07cca1847104eb8c7190a0d27a6978ddb10b10dd8e1ef6e157051567b04d1ec5930 WHIRLPOOL 1b3c859f77ab1c10adcbbbdf6201adfd388d25af4ff91c4a96cba7ff57eadf66a181ddd421b01dc124b2a58ca96599d5cfd11e321dac76afc18a69698dd8d8e1
-DIST FileZilla_3.14.1_src.tar.bz2 4411187 SHA256 b10871b6ced5f52062b44deda037edb8a38090b226a018b9b64b1a1feb59d46c SHA512 c97767ed01f4538a2f4b8760601778ca7f9aa99b5b928cb86c9508eba0490bbc1f31921d098e0ccd30712ff06dc9f21d323201fb8bee80b9fb7a6528fbb03368 WHIRLPOOL 1fbccfbb0de5111fad14eb0b38ee190aefc4c80777c3611189c74412dfefdf2fd96d4a42c917791d3a3318b6ae22f01a7d24a4a0904386b22a98693151b5a822
-DIST FileZilla_3.24.0_src.tar.bz2 4635977 SHA256 3d5dd4899cdeca038afd330f24098a61a223f15b172611e0c210244911cd4cad SHA512 e5e7fcf1d1c33053775d09ee9a3c0bac1286b4ed5aee1af47498ec2d860bd0571b8e2a35443119d3ebe61a8eea4fb236edb0e7d9dc6a1b37b823902828620ea0 WHIRLPOOL 41abe64523852b45c7ca7e8bf54ed92d749fb4af289b4cdfd0bfa7399dbcd4f135bdc5329b26306b2a04e98c9790b38945c82566db200de8d741603044ba61a1
-DIST FileZilla_3.24.1_src.tar.bz2 4645630 SHA256 e6dd748c7ec067c1165683ebe81325ce6c561f4725963a9515494af346a30c2a SHA512 7a3f871278ad35a9237e7a8e16c4b7becadd29bb3385dd528a645c96a36c9451d7e798da43bfe57de4064206605750a9184494ff8ff233511a4be09b6265bffd WHIRLPOOL 344fff6628ef3f281784b729aa913b33dcff0cc275d389886fb0913aa2d36407362fbe69b36071ded1923a8ccc14fe6304a418b3d69f37649d5401abefdd5d69
-DIST FileZilla_3.25.0_src.tar.bz2 4707698 SHA256 104e5f302dfef72cf9d235a880da159c93c9378ebfc48487ef07a1ba7f5834ac SHA512 efaf92b3705394a310dd2026095b0b44e54182e508e3fa6838944f7d2bca8f053f4242c8138385b1e4fd33837476c34173a33e234be0faaaec9fdc9a7b0fbb79 WHIRLPOOL edd44203e72603072e82f47eb1b78397f707b7d22ecd18706bfdb8a37cdc882a09e808b19c0c742bec2d7979067d532425fcbeafdf952310eef4b8d3cb103eb4
-DIST FileZilla_3.25.1_src.tar.bz2 4707839 SHA256 8873be716059cf7425b72dba5d130ea2a1ec62a769b4ada41f6c7313a2112fc1 SHA512 fbaa5184c21a06884db68befec8a30971a620744114ba0d12f701999210e2448ae88267c0631bbed0abeef302c6f2d80033a8f70ed548a5dd05f74cd5567a64b WHIRLPOOL 6ab1b5a6a3177fbb74bc5db588ee9dd053bbe66a0ddaa90a5e602b37acfb9444275033e3bfbbdc5cc2d169b8218cdf797a9cd693c29c0b070f0110c2eab66869
DIST FileZilla_3.25.2_src.tar.bz2 4712781 SHA256 559b0adbc1aff862dddbce95ed8a4a854c7a255b1de79efba9eabe459381aacd SHA512 6c6feeec0b1bd15ff2c3fecbec22bca9c79f4263e0d1855c6d27a3df54128cfd837f0a546d1540b87b4645e620b57961b8ac0f01bd52748832f5625139c39764 WHIRLPOOL 68bb9fab223af9fdb4a80a14424286c2a1fa28d55393c5ed387ce5b546fc422ca97ced10b81885faab4eb9b29980874b8b7b11ee265b0df0fa50df6c299d0dc8
diff --git a/net-ftp/filezilla/files/filezilla-3.10.2-debug.patch b/net-ftp/filezilla/files/filezilla-3.10.2-debug.patch
deleted file mode 100644
index 74e3fc30ea2..00000000000
--- a/net-ftp/filezilla/files/filezilla-3.10.2-debug.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac.orig 2015-03-03 17:04:56.300296016 +0100
-+++ configure.ac 2015-03-03 17:05:20.739299967 +0100
-@@ -46,8 +46,8 @@
- if ! test "$localesonly" = "yes"; then
-
- if test "X$GCC" = Xyes; then
-- CFLAGS="$CFLAGS -Wall -g"
-- CXXFLAGS="$CXXFLAGS -Wall -g"
-+ CFLAGS="$CFLAGS -Wall"
-+ CXXFLAGS="$CXXFLAGS -Wall"
- fi
-
- # Check for C++11 support
diff --git a/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch b/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch
deleted file mode 100644
index 2a579e898cc..00000000000
--- a/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- FileZilla3/trunk/data/filezilla.desktop 2017/02/28 16:01:04 8248
-+++ FileZilla3/trunk/data/filezilla.desktop 2017/03/03 15:38:01 8249
-@@ -1,4 +1,4 @@
--[Desktop Entry]
-+[Desktop Entry]
- Name=FileZilla
- GenericName=FTP client
- GenericName[da]=FTP-klient
diff --git a/net-ftp/filezilla/filezilla-3.12.0.2.ebuild b/net-ftp/filezilla/filezilla-3.12.0.2.ebuild
deleted file mode 100644
index af46a28bcc3..00000000000
--- a/net-ftp/filezilla/filezilla-3.12.0.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
- >=dev-db/sqlite-3.7
- >=dev-libs/tinyxml-2.6.1-r1[stl]
- net-dns/libidn
- >=net-libs/gnutls-3.1.12
- aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
- !aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
- dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
- append-cppflags -DTIXML_USE_STL
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-tinyxml=system \
- --disable-autoupdatecheck
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- doicon src/interface/resources/48x48/${PN}.png
-
- dodoc AUTHORS ChangeLog NEWS
-
- if use aqua ; then
- cat > "${T}/${PN}" <<-EOF || die
- #!${EPREFIX}/bin/bash
- open "${EPREFIX}"/Applications/FileZilla.app
- EOF
- rm "${ED}/usr/bin/${PN}" || die
- dobin "${T}/${PN}"
- insinto /Applications
- doins -r "${S}"/FileZilla.app
- fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.14.1.ebuild b/net-ftp/filezilla/filezilla-3.14.1.ebuild
deleted file mode 100644
index c7f58871ea0..00000000000
--- a/net-ftp/filezilla/filezilla-3.14.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="aqua dbus nls test"
-
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
- >=dev-db/sqlite-3.7
- net-dns/libidn
- >=net-libs/gnutls-3.1.12
- aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
- !aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
- dbus? ( sys-apps/dbus )"
-# >=dev-libs/pugixml-1.5
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
- eautoreconf
-}
-
-src_configure() {
- # system pugixml lacks long long ops support, use builtin for now
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-pugixml=builtin \
- --disable-autoupdatecheck
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- doicon src/interface/resources/48x48/${PN}.png
-
- dodoc AUTHORS ChangeLog NEWS
-
- if use aqua ; then
- cat > "${T}/${PN}" <<-EOF || die
- #!${EPREFIX}/bin/bash
- open "${EPREFIX}"/Applications/FileZilla.app
- EOF
- rm "${ED}/usr/bin/${PN}" || die
- dobin "${T}/${PN}"
- insinto /Applications
- doins -r "${S}"/FileZilla.app
- fi
-}
diff --git a/net-ftp/filezilla/filezilla-3.24.0.ebuild b/net-ftp/filezilla/filezilla-3.24.0.ebuild
deleted file mode 100644
index 1be888aca65..00000000000
--- a/net-ftp/filezilla/filezilla-3.24.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
- >=dev-libs/nettle-3.1:=
- >=dev-db/sqlite-3.7
- >=dev-libs/libfilezilla-0.9.0
- >=dev-libs/pugixml-1.7
- net-dns/libidn
- >=net-libs/gnutls-3.4.0
- >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils
- dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.22.1-debug.patch
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-pugixml=system \
- --disable-autoupdatecheck
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- doicon src/interface/resources/48x48/${PN}.png
-
- dodoc AUTHORS ChangeLog NEWS
-}
diff --git a/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild b/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild
deleted file mode 100644
index fc028119488..00000000000
--- a/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
- >=dev-libs/nettle-3.1:=
- >=dev-db/sqlite-3.7
- >=dev-libs/libfilezilla-0.9.0
- >=dev-libs/pugixml-1.7
- net-dns/libidn
- >=net-libs/gnutls-3.4.0
- >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils
- dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.22.1-debug.patch
- "${FILESDIR}"/${P}-desktop_entry.patch #466206
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-pugixml=system \
- --disable-autoupdatecheck
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- doicon src/interface/resources/48x48/${PN}.png
-
- dodoc AUTHORS ChangeLog NEWS
-}
diff --git a/net-ftp/filezilla/filezilla-3.25.0.ebuild b/net-ftp/filezilla/filezilla-3.25.0.ebuild
deleted file mode 100644
index 17003f08647..00000000000
--- a/net-ftp/filezilla/filezilla-3.25.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
- >=dev-libs/nettle-3.1:=
- >=dev-db/sqlite-3.7
- >=dev-libs/libfilezilla-0.9.1
- >=dev-libs/pugixml-1.7
- net-dns/libidn
- >=net-libs/gnutls-3.4.0
- >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X]
- x11-misc/xdg-utils
- dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.22.1-debug.patch
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_prepare() {
- setup-wxwidgets
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-pugixml=system \
- --disable-autoupdatecheck
-}
diff --git a/net-ftp/filezilla/filezilla-3.25.1.ebuild b/net-ftp/filezilla/filezilla-3.25.1.ebuild
deleted file mode 100644
index 17003f08647..00000000000
--- a/net-ftp/filezilla/filezilla-3.25.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-inherit autotools eutils flag-o-matic multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="dbus nls test"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
- >=dev-libs/nettle-3.1:=
- >=dev-db/sqlite-3.7
- >=dev-libs/libfilezilla-0.9.1
- >=dev-libs/pugixml-1.7
- net-dns/libidn
- >=net-libs/gnutls-3.4.0
- >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X]
- x11-misc/xdg-utils
- dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-DOCS=(AUTHORS ChangeLog NEWS )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.22.1-debug.patch
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
-
-src_prepare() {
- setup-wxwidgets
- default
- eautoreconf
-}
-
-src_configure() {
- econf $(use_with dbus) $(use_enable nls locales) \
- --with-pugixml=system \
- --disable-autoupdatecheck
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/files/, net-ftp/filezilla/
@ 2020-02-25 10:02 Lars Wendler
0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2020-02-25 10:02 UTC (permalink / raw
To: gentoo-commits
commit: e3b1fe69b9d655655c64b6d4c03fcb317e16a1ac
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 10:02:13 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 10:02:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3b1fe69
net-ftp/filezilla: Bump to version 3.47.0
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-ftp/filezilla/Manifest | 1 +
.../files/filezilla-3.47.0-metainfo.patch | 11 +++
net-ftp/filezilla/filezilla-3.47.0.ebuild | 87 ++++++++++++++++++++++
3 files changed, 99 insertions(+)
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 877c43cd209..e72b8e28aa1 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -3,3 +3,4 @@ DIST FileZilla_3.44.2_src.tar.bz2 4619337 BLAKE2B 11d61b14fcf464706dabe491fa8cbf
DIST FileZilla_3.45.1_src.tar.bz2 4649083 BLAKE2B 8d3113e5ce96d2115a6ec02109f2617d3d58109464c527284baecacea733d2f564206779cd32be4060171d7fcd8768b0296b445842b8c2964b173ca360983082 SHA512 feb267b85ad2843baea0c6df66ed86866121f33e2295fcb9003a8bc2603ad684f4fe801ea842cb291e3fb5cd7195ccb2d21bfa95711a61be6b4debfd4e1c7822
DIST FileZilla_3.46.0_src.tar.bz2 4661100 BLAKE2B ccda60b590e85afd7de0edd064ee7b993e663e43643f262378db6d26a019730ec493518e0e2b39bce0710acafe888f47f84ecb098e35d3b32061f089a99a6a30 SHA512 26ffb039b4a6d51d6d1011ee452f3690f74514c91a9e58c79880dbf778296cfc81283fade52f65f81654b828449e2b7e703b1d6c1e2e84c08f54681d2aa92674
DIST FileZilla_3.46.3_src.tar.bz2 4720329 BLAKE2B 92369d2fb3b8c9eded37f912bbd25a0e995a5fc1ab86ef6aa746a8eb239f17e8fafa78de00529b0f3af102fe268b51a60ce40ac967cf9b2fbbd6fa7900898ffc SHA512 35b61c3bfd1d40848e7846b4533da8844df0e4873cb89286b90330cbc29dffeff96fcab10aec908a08d9129198bb2d80df8f223d8ebc1a0863a4083cb06abffc
+DIST FileZilla_3.47.0_src.tar.bz2 4732662 BLAKE2B 02b3b16b41b6c7dc19f3349d14414023dfd900b5cc592b44a89a27541a3c4c0e876be59089d202e4b2938b2eb8b96d6e1b25501f16d5d3bcfd6477b744535728 SHA512 6b2089da271411552524621f6635857f37c42e1e67978337b02d2d26ee5f31e5895636158f647aaa184213d6ddfcf45d8320da1b7e52549bd5adbf62b6ebf22d
diff --git a/net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch b/net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch
new file mode 100644
index 00000000000..309c66815e3
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.47.0-metainfo.patch
@@ -0,0 +1,11 @@
+--- filezilla-3.47.0/data/Makefile.am
++++ filezilla-3.47.0/data/Makefile.am
+@@ -75,7 +75,7 @@
+ desktopentrydir = $(datadir)/applications
+ dist_desktopentry_DATA = filezilla.desktop
+
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metainfo
+ dist_appdata_DATA = filezilla.appdata.xml
+
+ clean-local:
diff --git a/net-ftp/filezilla/filezilla-3.47.0.ebuild b/net-ftp/filezilla/filezilla-3.47.0.ebuild
new file mode 100644
index 00000000000..9f99a47ff44
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.47.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+MY_PV=${PV/_/-}
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="dbus nls test"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+ >=dev-libs/nettle-3.1:=
+ >=dev-db/sqlite-3.7
+ >=dev-libs/libfilezilla-0.20.0:=
+ <dev-libs/libfilezilla-0.21.0:=
+ >=dev-libs/pugixml-1.7
+ >=net-libs/gnutls-3.5.7
+ >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X]
+ x11-misc/xdg-utils
+ dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-1.4
+ nls? ( >=sys-devel/gettext-0.11 )
+ test? ( >=dev-util/cppunit-1.13.0 )"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DOCS=(AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.22.1-debug.patch
+ "${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+)
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if ! test-flag-CXX -std=c++14; then
+ eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+ eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+ eerror "to gcc-4.9 or an equivalent version supporting C++14."
+ die "Currently active compiler does not support -std=c++14"
+ fi
+ fi
+}
+
+src_prepare() {
+ setup-wxwidgets
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-autoupdatecheck
+ --with-pugixml=system
+ $(use_enable nls locales)
+ $(use_with dbus)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/files/, net-ftp/filezilla/
@ 2024-01-09 12:04 Bernard Cafarelli
0 siblings, 0 replies; 6+ messages in thread
From: Bernard Cafarelli @ 2024-01-09 12:04 UTC (permalink / raw
To: gentoo-commits
commit: e4d96befef64f3a70b00d4976a8377bf2c973471
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 12:03:16 2024 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 12:03:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d96bef
net-ftp/filezilla: fix incompatible pointer type
This becomes an error in GCC14
Closes: https://bugs.gentoo.org/921432
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../filezilla/files/filezilla-3.66.4-gcc14.patch | 27 ++++++++++++++++++++++
net-ftp/filezilla/filezilla-3.66.4.ebuild | 3 ++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/net-ftp/filezilla/files/filezilla-3.66.4-gcc14.patch b/net-ftp/filezilla/files/filezilla-3.66.4-gcc14.patch
new file mode 100644
index 000000000000..0c66931d31aa
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.66.4-gcc14.patch
@@ -0,0 +1,27 @@
+diff --git a/src/putty/unix/uxsftp.c b/src/putty/unix/uxsftp.c
+index f078d97..05ec2ff 100644
+--- a/src/putty/unix/uxsftp.c
++++ b/src/putty/unix/uxsftp.c
+@@ -211,7 +211,7 @@ int read_from_file(RFile *f, void *buffer, int length)
+ #if 1
+ if (f->state == ok && !f->remaining_) {
+ fznotify1(sftp_io_nextbuf, 0);
+- char const* s = priority_read();
++ char *s = priority_read();
+ if (s[1] == '-') {
+ f->state = error;
+ return -1;
+@@ -220,11 +220,11 @@ int read_from_file(RFile *f, void *buffer, int length)
+ f->state = eof;
+ }
+ else {
+- char const* p = s + 1;
++ char *p = s + 1;
+ f->buffer_ = f->memory_ + next_int(&p);
+ f->remaining_ = (int)next_int(&p);
+ }
+- sfree(s);
++ sfree((void *)s);
+ }
+ if (f->state == eof) {
+ return 0;
diff --git a/net-ftp/filezilla/filezilla-3.66.4.ebuild b/net-ftp/filezilla/filezilla-3.66.4.ebuild
index 3355a66cdf57..b13ff09bc0eb 100644
--- a/net-ftp/filezilla/filezilla-3.66.4.ebuild
+++ b/net-ftp/filezilla/filezilla-3.66.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
"${FILESDIR}"/${PN}-3.60.1-desktop.patch
+ "${FILESDIR}"/${PN}-3.66.4-gcc14.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/files/, net-ftp/filezilla/
@ 2024-07-10 7:56 Yixun Lan
0 siblings, 0 replies; 6+ messages in thread
From: Yixun Lan @ 2024-07-10 7:56 UTC (permalink / raw
To: gentoo-commits
commit: 6c33a435474c05703d8f93eed28d639b8269616e
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 03:15:12 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 07:55:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c33a435
net-ftp/filezilla: backport patch to fix ODR violations
Closes: https://bugs.gentoo.org/927178
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
net-ftp/filezilla/files/filezilla-3.67.0-odr.patch | 670 +++++++++++++++++++++
net-ftp/filezilla/filezilla-3.67.0-r1.ebuild | 77 +++
2 files changed, 747 insertions(+)
diff --git a/net-ftp/filezilla/files/filezilla-3.67.0-odr.patch b/net-ftp/filezilla/files/filezilla-3.67.0-odr.patch
new file mode 100644
index 000000000000..ec6af91b56cb
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.67.0-odr.patch
@@ -0,0 +1,670 @@
+https://bugs.gentoo.org/927178#c3
+
+No upstream bug link -- their trac was temporarily down so I had to send the
+report in via email.
+
+Revision exported from:
+
+```
+svn diff -c 11167 https://svn.filezilla-project.org/svn/FileZilla3
+```
+
+https://svn.filezilla-project.org/filezilla?view=revision&revision=11167
+
+
+Index: trunk/src/engine/storj/delete.cpp
+===================================================================
+--- trunk/src/engine/storj/delete.cpp (revision 11166)
++++ trunk/src/engine/storj/delete.cpp (revision 11167)
+@@ -3,6 +3,7 @@
+ #include "../directorycache.h"
+ #include "delete.h"
+
++namespace {
+ enum DeleteStates
+ {
+ delete_init,
+@@ -9,6 +10,7 @@
+ delete_resolve,
+ delete_delete
+ };
++}
+
+ int CStorjDeleteOpData::Send()
+ {
+Index: trunk/src/engine/storj/list.cpp
+===================================================================
+--- trunk/src/engine/storj/list.cpp (revision 11166)
++++ trunk/src/engine/storj/list.cpp (revision 11167)
+@@ -3,6 +3,7 @@
+ #include "../directorycache.h"
+ #include "list.h"
+
++namespace {
+ enum listStates
+ {
+ list_init = 0,
+@@ -9,6 +10,7 @@
+ list_waitlock,
+ list_list
+ };
++}
+
+ int CStorjListOpData::Send()
+ {
+Index: trunk/src/engine/storj/rmd.cpp
+===================================================================
+--- trunk/src/engine/storj/rmd.cpp (revision 11166)
++++ trunk/src/engine/storj/rmd.cpp (revision 11167)
+@@ -5,6 +5,7 @@
+
+ #include <assert.h>
+
++namespace {
+ enum mkdStates
+ {
+ rmd_init = 0,
+@@ -11,8 +12,8 @@
+ rmd_rmbucket,
+ rmd_rmdir
+ };
++}
+
+-
+ int CStorjRemoveDirOpData::Send()
+ {
+ switch (opState) {
+Index: trunk/src/engine/ftp/chmod.cpp
+===================================================================
+--- trunk/src/engine/ftp/chmod.cpp (revision 11166)
++++ trunk/src/engine/ftp/chmod.cpp (revision 11167)
+@@ -3,6 +3,7 @@
+ #include "chmod.h"
+ #include "../directorycache.h"
+
++namespace {
+ enum chmodStates
+ {
+ chmod_init,
+@@ -9,6 +10,7 @@
+ chmod_waitcwd,
+ chmod_chmod
+ };
++}
+
+ int CFtpChmodOpData::Send()
+ {
+Index: trunk/src/engine/ftp/cwd.cpp
+===================================================================
+--- trunk/src/engine/ftp/cwd.cpp (revision 11166)
++++ trunk/src/engine/ftp/cwd.cpp (revision 11167)
+@@ -3,6 +3,7 @@
+ #include "cwd.h"
+ #include "../pathcache.h"
+
++namespace {
+ enum cwdStates
+ {
+ cwd_init = 0,
+@@ -12,6 +13,7 @@
+ cwd_cwd_subdir,
+ cwd_pwd_subdir
+ };
++}
+
+ int CFtpChangeDirOpData::Send()
+ {
+Index: trunk/src/engine/ftp/delete.cpp
+===================================================================
+--- trunk/src/engine/ftp/delete.cpp (revision 11166)
++++ trunk/src/engine/ftp/delete.cpp (revision 11167)
+@@ -3,6 +3,7 @@
+ #include "delete.h"
+ #include "../directorycache.h"
+
++namespace {
+ enum rmdStates
+ {
+ del_init,
+@@ -9,6 +10,7 @@
+ del_waitcwd,
+ del_del
+ };
++}
+
+ int CFtpDeleteOpData::Send()
+ {
+Index: trunk/src/engine/ftp/filetransfer.cpp
+===================================================================
+--- trunk/src/engine/ftp/filetransfer.cpp (revision 11166)
++++ trunk/src/engine/ftp/filetransfer.cpp (revision 11167)
+@@ -12,6 +12,22 @@
+
+ #include <assert.h>
+
++namespace {
++enum filetransferStates
++{
++ filetransfer_init = 0,
++ filetransfer_waitcwd,
++ filetransfer_waitlist,
++ filetransfer_size,
++ filetransfer_mdtm,
++ filetransfer_resumetest,
++ filetransfer_transfer,
++ filetransfer_waittransfer,
++ filetransfer_waitresumetest,
++ filetransfer_mfmt
++};
++}
++
+ CFtpFileTransferOpData::CFtpFileTransferOpData(CFtpControlSocket& controlSocket, CFileTransferCommand const& cmd)
+ : CFileTransferOpData(L"CFtpFileTransferOpData", cmd)
+ , CFtpOpData(controlSocket)
+Index: trunk/src/engine/ftp/filetransfer.h
+===================================================================
+--- trunk/src/engine/ftp/filetransfer.h (revision 11166)
++++ trunk/src/engine/ftp/filetransfer.h (revision 11167)
+@@ -3,20 +3,6 @@
+
+ #include "ftpcontrolsocket.h"
+
+-enum filetransferStates
+-{
+- filetransfer_init = 0,
+- filetransfer_waitcwd,
+- filetransfer_waitlist,
+- filetransfer_size,
+- filetransfer_mdtm,
+- filetransfer_resumetest,
+- filetransfer_transfer,
+- filetransfer_waittransfer,
+- filetransfer_waitresumetest,
+- filetransfer_mfmt
+-};
+-
+ class CFtpFileTransferOpData final : public CFileTransferOpData, public CFtpTransferOpData, public CFtpOpData
+ {
+ public:
+Index: trunk/src/engine/ftp/ftpcontrolsocket.cpp
+===================================================================
+--- trunk/src/engine/ftp/ftpcontrolsocket.cpp (revision 11166)
++++ trunk/src/engine/ftp/ftpcontrolsocket.cpp (revision 11167)
+@@ -34,6 +34,9 @@
+
+ #include <assert.h>
+
++using namespace ftpLogonStates;
++using namespace FtpRawTransferStates;
++
+ CFtpControlSocket::CFtpControlSocket(CFileZillaEnginePrivate & engine)
+ : CRealControlSocket(engine)
+ {
+Index: trunk/src/engine/ftp/list.cpp
+===================================================================
+--- trunk/src/engine/ftp/list.cpp (revision 11166)
++++ trunk/src/engine/ftp/list.cpp (revision 11167)
+@@ -9,6 +9,15 @@
+ #include <assert.h>
+
+ namespace {
++enum listStates
++{
++ list_init,
++ list_waitcwd,
++ list_waitlock,
++ list_waittransfer,
++ list_mdtm
++};
++
+ // Some servers are broken. Instead of an empty listing, some MVS servers
+ // for example they return "550 no members found"
+ // Other servers return "550 No files found."
+Index: trunk/src/engine/ftp/list.h
+===================================================================
+--- trunk/src/engine/ftp/list.h (revision 11166)
++++ trunk/src/engine/ftp/list.h (revision 11167)
+@@ -6,15 +6,6 @@
+
+ class CDirectoryListingParser;
+
+-enum listStates
+-{
+- list_init,
+- list_waitcwd,
+- list_waitlock,
+- list_waittransfer,
+- list_mdtm
+-};
+-
+ class CFtpListOpData final : public COpData, public CFtpOpData, public CFtpTransferOpData
+ {
+ public:
+Index: trunk/src/engine/ftp/logon.cpp
+===================================================================
+--- trunk/src/engine/ftp/logon.cpp (revision 11166)
++++ trunk/src/engine/ftp/logon.cpp (revision 11167)
+@@ -10,6 +10,7 @@
+ #include "../../include/engine_options.h"
+
+ using namespace std::literals;
++using namespace ftpLogonStates;
+
+ CFtpLogonOpData::CFtpLogonOpData(CFtpControlSocket& controlSocket)
+ : COpData(Command::connect, L"CFtpLogonOpData")
+Index: trunk/src/engine/ftp/logon.h
+===================================================================
+--- trunk/src/engine/ftp/logon.h (revision 11166)
++++ trunk/src/engine/ftp/logon.h (revision 11167)
+@@ -3,27 +3,27 @@
+
+ #include "ftpcontrolsocket.h"
+
+-enum loginStates
+-{
+- LOGON_CONNECT,
+- LOGON_WELCOME,
+- LOGON_AUTH_TLS,
+- LOGON_AUTH_SSL,
+- LOGON_AUTH_WAIT,
+- LOGON_SECURITY,
+- LOGON_LOGON,
+- LOGON_SYST,
+- LOGON_FEAT,
+- LOGON_CLNT,
+- LOGON_OPTSUTF8,
+- LOGON_PBSZ,
+- LOGON_PROT,
+- LOGON_OPTSMLST,
+- LOGON_CUSTOMCOMMANDS,
+- LOGON_DONE
++namespace ftpLogonStates {
++enum type {
++ LOGON_CONNECT,
++ LOGON_WELCOME,
++ LOGON_AUTH_TLS,
++ LOGON_AUTH_SSL,
++ LOGON_AUTH_WAIT,
++ LOGON_SECURITY,
++ LOGON_LOGON,
++ LOGON_SYST,
++ LOGON_FEAT,
++ LOGON_CLNT,
++ LOGON_OPTSUTF8,
++ LOGON_PBSZ,
++ LOGON_PROT,
++ LOGON_OPTSMLST,
++ LOGON_CUSTOMCOMMANDS,
++ LOGON_DONE
+ };
++}
+
+-
+ enum class loginCommandType
+ {
+ user,
+@@ -73,7 +73,7 @@
+
+ unsigned int customCommandIndex{};
+
+- int neededCommands[LOGON_DONE]{};
++ int neededCommands[ftpLogonStates::LOGON_DONE]{};
+
+ std::deque<t_loginCommand> loginSequence;
+
+Index: trunk/src/engine/ftp/mkd.cpp
+===================================================================
+--- trunk/src/engine/ftp/mkd.cpp (revision 11166)
++++ trunk/src/engine/ftp/mkd.cpp (revision 11167)
+@@ -5,6 +5,7 @@
+
+ using namespace std::literals;
+
++namespace {
+ enum mkdStates
+ {
+ mkd_init = 0,
+@@ -13,6 +14,7 @@
+ mkd_cwdsub,
+ mkd_tryfull
+ };
++}
+
+ /* Directory creation works like this: First find a parent directory into
+ * which we can CWD, then create the subdirs one by one. If either part
+Index: trunk/src/engine/ftp/rawtransfer.cpp
+===================================================================
+--- trunk/src/engine/ftp/rawtransfer.cpp (revision 11166)
++++ trunk/src/engine/ftp/rawtransfer.cpp (revision 11167)
+@@ -7,7 +7,7 @@
+
+ #include <libfilezilla/iputils.hpp>
+
+-#include <assert.h>
++using namespace FtpRawTransferStates;
+
+ int CFtpRawTransferOpData::Send()
+ {
+@@ -423,7 +423,6 @@
+ {
+ std::wstring ret = L"PASV";
+
+- assert(bPasv);
+ bTriedPasv = true;
+
+ if (controlSocket_.proxy_layer_) {
+Index: trunk/src/engine/ftp/rawtransfer.h
+===================================================================
+--- trunk/src/engine/ftp/rawtransfer.h (revision 11166)
++++ trunk/src/engine/ftp/rawtransfer.h (revision 11167)
+@@ -3,18 +3,20 @@
+
+ #include "ftpcontrolsocket.h"
+
+-enum rawtransferStates
++namespace FtpRawTransferStates {
++enum type
+ {
+- rawtransfer_init = 0,
+- rawtransfer_type,
+- rawtransfer_port_pasv,
+- rawtransfer_rest,
+- rawtransfer_transfer,
+- rawtransfer_waitfinish,
+- rawtransfer_waittransferpre,
+- rawtransfer_waittransfer,
+- rawtransfer_waitsocket
++ rawtransfer_init = 0,
++ rawtransfer_type,
++ rawtransfer_port_pasv,
++ rawtransfer_rest,
++ rawtransfer_transfer,
++ rawtransfer_waitfinish,
++ rawtransfer_waittransferpre,
++ rawtransfer_waittransfer,
++ rawtransfer_waitsocket
+ };
++}
+
+ class CFtpRawTransferOpData final : public COpData, public CFtpOpData
+ {
+Index: trunk/src/engine/ftp/rename.cpp
+===================================================================
+--- trunk/src/engine/ftp/rename.cpp (revision 11166)
++++ trunk/src/engine/ftp/rename.cpp (revision 11167)
+@@ -4,6 +4,7 @@
+ #include "../directorycache.h"
+ #include "../pathcache.h"
+
++namespace {
+ enum renameStates
+ {
+ rename_init,
+@@ -11,6 +12,7 @@
+ rename_rnfrom,
+ rename_rnto
+ };
++}
+
+ int CFtpRenameOpData::Send()
+ {
+Index: trunk/src/engine/ftp/rmd.cpp
+===================================================================
+--- trunk/src/engine/ftp/rmd.cpp (revision 11166)
++++ trunk/src/engine/ftp/rmd.cpp (revision 11167)
+@@ -4,6 +4,7 @@
+ #include "../directorycache.h"
+ #include "../pathcache.h"
+
++namespace {
+ enum rmdStates
+ {
+ rmd_init,
+@@ -10,6 +11,7 @@
+ rmd_waitcwd,
+ rmd_rmd
+ };
++}
+
+ int CFtpRemoveDirOpData::Send()
+ {
+Index: trunk/src/engine/http/filetransfer.cpp
+===================================================================
+--- trunk/src/engine/http/filetransfer.cpp (revision 11166)
++++ trunk/src/engine/http/filetransfer.cpp (revision 11167)
+@@ -7,6 +7,7 @@
+ #include <assert.h>
+ #include <string.h>
+
++namespace {
+ enum filetransferStates
+ {
+ filetransfer_init = 0,
+@@ -13,6 +14,7 @@
+ filetransfer_transfer,
+ filetransfer_waittransfer
+ };
++}
+
+ CHttpFileTransferOpData::CHttpFileTransferOpData(CHttpControlSocket & controlSocket, CFileTransferCommand const& cmd)
+ : CFileTransferOpData(L"CHttpFileTransferOpData", cmd)
+Index: trunk/src/engine/sftp/chmod.cpp
+===================================================================
+--- trunk/src/engine/sftp/chmod.cpp (revision 11166)
++++ trunk/src/engine/sftp/chmod.cpp (revision 11167)
+@@ -3,6 +3,7 @@
+ #include "chmod.h"
+ #include "../directorycache.h"
+
++namespace {
+ enum chmodStates
+ {
+ chmod_init,
+@@ -9,6 +10,7 @@
+ chmod_waitcwd,
+ chmod_chmod
+ };
++}
+
+ int CSftpChmodOpData::Send()
+ {
+Index: trunk/src/engine/sftp/connect.cpp
+===================================================================
+--- trunk/src/engine/sftp/connect.cpp (revision 11166)
++++ trunk/src/engine/sftp/connect.cpp (revision 11167)
+@@ -21,6 +21,7 @@
+ #include <sys/mman.h>
+ #endif
+
++namespace {
+ enum connectStates
+ {
+ connect_init,
+@@ -28,6 +29,7 @@
+ connect_keys,
+ connect_open
+ };
++}
+
+ int CSftpConnectOpData::Send()
+ {
+Index: trunk/src/engine/sftp/cwd.cpp
+===================================================================
+--- trunk/src/engine/sftp/cwd.cpp (revision 11166)
++++ trunk/src/engine/sftp/cwd.cpp (revision 11167)
+@@ -3,6 +3,7 @@
+ #include "cwd.h"
+ #include "../pathcache.h"
+
++namespace {
+ enum cwdStates
+ {
+ cwd_init = 0,
+@@ -10,6 +11,7 @@
+ cwd_cwd,
+ cwd_cwd_subdir
+ };
++}
+
+ int CSftpChangeDirOpData::Send()
+ {
+Index: trunk/src/engine/sftp/filetransfer.cpp
+===================================================================
+--- trunk/src/engine/sftp/filetransfer.cpp (revision 11166)
++++ trunk/src/engine/sftp/filetransfer.cpp (revision 11167)
+@@ -10,6 +10,7 @@
+
+ #include <assert.h>
+
++namespace {
+ enum filetransferStates
+ {
+ filetransfer_init = 0,
+@@ -19,6 +20,7 @@
+ filetransfer_transfer,
+ filetransfer_chmtime
+ };
++}
+
+ CSftpFileTransferOpData::~CSftpFileTransferOpData()
+ {
+Index: trunk/src/engine/sftp/list.cpp
+===================================================================
+--- trunk/src/engine/sftp/list.cpp (revision 11166)
++++ trunk/src/engine/sftp/list.cpp (revision 11167)
+@@ -5,6 +5,7 @@
+
+ #include <assert.h>
+
++namespace {
+ enum listStates
+ {
+ list_init = 0,
+@@ -12,6 +13,7 @@
+ list_waitlock,
+ list_list
+ };
++}
+
+ int CSftpListOpData::Send()
+ {
+Index: trunk/src/engine/sftp/mkd.cpp
+===================================================================
+--- trunk/src/engine/sftp/mkd.cpp (revision 11166)
++++ trunk/src/engine/sftp/mkd.cpp (revision 11167)
+@@ -3,6 +3,7 @@
+ #include "../directorycache.h"
+ #include "mkd.h"
+
++namespace {
+ enum mkdStates
+ {
+ mkd_init = 0,
+@@ -11,6 +12,7 @@
+ mkd_cwdsub,
+ mkd_tryfull
+ };
++}
+
+ /* Directory creation works like this: First find a parent directory into
+ * which we can CWD, then create the subdirs one by one. If either part
+Index: trunk/src/engine/sftp/rename.cpp
+===================================================================
+--- trunk/src/engine/sftp/rename.cpp (revision 11166)
++++ trunk/src/engine/sftp/rename.cpp (revision 11167)
+@@ -4,6 +4,7 @@
+ #include "../pathcache.h"
+ #include "rename.h"
+
++namespace {
+ enum renameStates
+ {
+ rename_init,
+@@ -10,6 +11,7 @@
+ rename_waitcwd,
+ rename_rename
+ };
++}
+
+ int CSftpRenameOpData::Send()
+ {
+Index: trunk/src/engine/storj/connect.cpp
+===================================================================
+--- trunk/src/engine/storj/connect.cpp (revision 11166)
++++ trunk/src/engine/storj/connect.cpp (revision 11167)
+@@ -22,6 +22,16 @@
+ #include <sys/mman.h>
+ #endif
+
++namespace {
++enum connectStates
++{
++ connect_init,
++ connect_host,
++ connect_user,
++ connect_pass
++};
++}
++
+ int CStorjConnectOpData::Send()
+ {
+ switch (opState)
+Index: trunk/src/engine/storj/connect.h
+===================================================================
+--- trunk/src/engine/storj/connect.h (revision 11166)
++++ trunk/src/engine/storj/connect.h (revision 11167)
+@@ -3,14 +3,6 @@
+
+ #include "storjcontrolsocket.h"
+
+-enum connectStates
+-{
+- connect_init,
+- connect_host,
+- connect_user,
+- connect_pass
+-};
+-
+ class CStorjConnectOpData final : public COpData, public CStorjOpData
+ {
+ public:
+Index: trunk/src/engine/storj/file_transfer.cpp
+===================================================================
+--- trunk/src/engine/storj/file_transfer.cpp (revision 11166)
++++ trunk/src/engine/storj/file_transfer.cpp (revision 11167)
+@@ -7,6 +7,7 @@
+ #include <libfilezilla/local_filesys.hpp>
+ #include <libfilezilla/process.hpp>
+
++namespace {
+ enum FileTransferStates
+ {
+ filetransfer_init,
+@@ -15,6 +16,7 @@
+ filetransfer_delete,
+ filetransfer_transfer
+ };
++}
+
+ CStorjFileTransferOpData::~CStorjFileTransferOpData()
+ {
+Index: trunk/src/engine/storj/mkd.cpp
+===================================================================
+--- trunk/src/engine/storj/mkd.cpp (revision 11166)
++++ trunk/src/engine/storj/mkd.cpp (revision 11167)
+@@ -3,6 +3,7 @@
+ #include "../directorycache.h"
+ #include "mkd.h"
+
++namespace {
+ enum mkdStates
+ {
+ mkd_init = 0,
+@@ -9,6 +10,7 @@
+ mkd_mkbucket,
+ mkd_put
+ };
++}
+
+ int CStorjMkdirOpData::Send()
+ {
diff --git a/net-ftp/filezilla/filezilla-3.67.0-r1.ebuild b/net-ftp/filezilla/filezilla-3.67.0-r1.ebuild
new file mode 100644
index 000000000000..5c66ad26eef6
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.67.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit autotools flag-o-matic wxwidgets xdg
+
+MY_PV="${PV/_/-}"
+MY_P="FileZilla_${MY_PV}"
+
+DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
+HOMEPAGE="https://filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="cpu_flags_x86_sse2 dbus nls test"
+RESTRICT="!test? ( test )"
+
+# pugixml 1.7 minimal dependency is for c++11 proper configuration
+RDEPEND="
+ >=dev-libs/nettle-3.1:=
+ >=dev-db/sqlite-3.7
+ >=dev-libs/boost-1.76.0:=
+ >=dev-libs/libfilezilla-0.47.0:=
+ >=dev-libs/pugixml-1.7
+ >=net-libs/gnutls-3.5.7
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ x11-misc/xdg-utils
+ dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+ test? ( >=dev-util/cppunit-1.13.0 )"
+BDEPEND="
+ virtual/pkgconfig
+ >=dev-build/libtool-1.4
+ nls? ( >=sys-devel/gettext-0.11 )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.22.1-debug.patch
+ "${FILESDIR}"/${PN}-3.47.0-metainfo.patch
+ "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
+ "${FILESDIR}"/${PN}-3.52.2-slibtool.patch
+ "${FILESDIR}"/${PN}-3.60.1-desktop.patch
+ # backport patch for ODR
+ "${FILESDIR}"/filezilla-3.67.0-odr.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ if use x86 && ! use cpu_flags_x86_sse2; then
+ append-cppflags -D_FORCE_SOFTWARE_SHA
+ fi
+ setup-wxwidgets
+
+ local myeconfargs=(
+ --disable-autoupdatecheck
+ --with-pugixml=system
+ $(use_enable nls locales)
+ $(use_with dbus)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # no static archives
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/files/, net-ftp/filezilla/
@ 2024-11-08 3:03 Yixun Lan
0 siblings, 0 replies; 6+ messages in thread
From: Yixun Lan @ 2024-11-08 3:03 UTC (permalink / raw
To: gentoo-commits
commit: ac030b32d854245cd056acba89e417b9adb5dcf8
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 8 02:58:34 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 03:03:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac030b32
net-ftp/filezilla: drop 3.67.0, 3.67.0-r1
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
net-ftp/filezilla/Manifest | 1 -
net-ftp/filezilla/files/filezilla-3.67.0-odr.patch | 670 ---------------------
net-ftp/filezilla/filezilla-3.67.0-r1.ebuild | 77 ---
net-ftp/filezilla/filezilla-3.67.0.ebuild | 75 ---
4 files changed, 823 deletions(-)
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 77d09b3a42be..40035a0e9189 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,3 +1,2 @@
-DIST FileZilla_3.67.0_src.tar.xz 4058264 BLAKE2B 28799d60188ed94bc80143ccabf073eced4caa9960daa2b8d7f617252355735647fe4b3776ee38eb179fdb2667fd05536a89b6c17b25d056c72e565585ddef98 SHA512 b2d4cd45f2ed7e70fbb11500a42fe0d0e51919831a35bcfb439455d03af8eb744eb25d7f7b6ea9a94c424065e4d071d9706fcf46019da829d1318c099ab8108c
DIST FileZilla_3.67.1_src.tar.xz 4065540 BLAKE2B e3e286da6c8777df4fe3a66f440b1e0e2c9f99777fbcf75c709e1290b37df6ed2db7e5e9fd73403bec0733a04a04989351005b7455a5d2620f213b1d18c20f36 SHA512 630820a0c67ee8b1d48a8ff4193e066d35bbf9048526c91b8804d786defc28a635dac252b298de518b506506607abd96ce35c455c21a50503844a57c47ea78e7
DIST FileZilla_3.68.1_src.tar.xz 4105072 BLAKE2B d0e65adae49e68204de035c70d6abea3313dae6f0f3c2d55bfee2b63fb86979b54108d88c36b2c87e978c7caa3268518902966cdd7f9c4b7564ec93fb5f6fcd6 SHA512 b8cd7a524c13753118f8c48b0f4063a3459d119efe2bfd11c0ca40e35573885e2cae85007e7958d6eec4bcbdd557eba76bcaa72a922d3bd4f85385fc06d0df6b
diff --git a/net-ftp/filezilla/files/filezilla-3.67.0-odr.patch b/net-ftp/filezilla/files/filezilla-3.67.0-odr.patch
deleted file mode 100644
index ec6af91b56cb..000000000000
--- a/net-ftp/filezilla/files/filezilla-3.67.0-odr.patch
+++ /dev/null
@@ -1,670 +0,0 @@
-https://bugs.gentoo.org/927178#c3
-
-No upstream bug link -- their trac was temporarily down so I had to send the
-report in via email.
-
-Revision exported from:
-
-```
-svn diff -c 11167 https://svn.filezilla-project.org/svn/FileZilla3
-```
-
-https://svn.filezilla-project.org/filezilla?view=revision&revision=11167
-
-
-Index: trunk/src/engine/storj/delete.cpp
-===================================================================
---- trunk/src/engine/storj/delete.cpp (revision 11166)
-+++ trunk/src/engine/storj/delete.cpp (revision 11167)
-@@ -3,6 +3,7 @@
- #include "../directorycache.h"
- #include "delete.h"
-
-+namespace {
- enum DeleteStates
- {
- delete_init,
-@@ -9,6 +10,7 @@
- delete_resolve,
- delete_delete
- };
-+}
-
- int CStorjDeleteOpData::Send()
- {
-Index: trunk/src/engine/storj/list.cpp
-===================================================================
---- trunk/src/engine/storj/list.cpp (revision 11166)
-+++ trunk/src/engine/storj/list.cpp (revision 11167)
-@@ -3,6 +3,7 @@
- #include "../directorycache.h"
- #include "list.h"
-
-+namespace {
- enum listStates
- {
- list_init = 0,
-@@ -9,6 +10,7 @@
- list_waitlock,
- list_list
- };
-+}
-
- int CStorjListOpData::Send()
- {
-Index: trunk/src/engine/storj/rmd.cpp
-===================================================================
---- trunk/src/engine/storj/rmd.cpp (revision 11166)
-+++ trunk/src/engine/storj/rmd.cpp (revision 11167)
-@@ -5,6 +5,7 @@
-
- #include <assert.h>
-
-+namespace {
- enum mkdStates
- {
- rmd_init = 0,
-@@ -11,8 +12,8 @@
- rmd_rmbucket,
- rmd_rmdir
- };
-+}
-
--
- int CStorjRemoveDirOpData::Send()
- {
- switch (opState) {
-Index: trunk/src/engine/ftp/chmod.cpp
-===================================================================
---- trunk/src/engine/ftp/chmod.cpp (revision 11166)
-+++ trunk/src/engine/ftp/chmod.cpp (revision 11167)
-@@ -3,6 +3,7 @@
- #include "chmod.h"
- #include "../directorycache.h"
-
-+namespace {
- enum chmodStates
- {
- chmod_init,
-@@ -9,6 +10,7 @@
- chmod_waitcwd,
- chmod_chmod
- };
-+}
-
- int CFtpChmodOpData::Send()
- {
-Index: trunk/src/engine/ftp/cwd.cpp
-===================================================================
---- trunk/src/engine/ftp/cwd.cpp (revision 11166)
-+++ trunk/src/engine/ftp/cwd.cpp (revision 11167)
-@@ -3,6 +3,7 @@
- #include "cwd.h"
- #include "../pathcache.h"
-
-+namespace {
- enum cwdStates
- {
- cwd_init = 0,
-@@ -12,6 +13,7 @@
- cwd_cwd_subdir,
- cwd_pwd_subdir
- };
-+}
-
- int CFtpChangeDirOpData::Send()
- {
-Index: trunk/src/engine/ftp/delete.cpp
-===================================================================
---- trunk/src/engine/ftp/delete.cpp (revision 11166)
-+++ trunk/src/engine/ftp/delete.cpp (revision 11167)
-@@ -3,6 +3,7 @@
- #include "delete.h"
- #include "../directorycache.h"
-
-+namespace {
- enum rmdStates
- {
- del_init,
-@@ -9,6 +10,7 @@
- del_waitcwd,
- del_del
- };
-+}
-
- int CFtpDeleteOpData::Send()
- {
-Index: trunk/src/engine/ftp/filetransfer.cpp
-===================================================================
---- trunk/src/engine/ftp/filetransfer.cpp (revision 11166)
-+++ trunk/src/engine/ftp/filetransfer.cpp (revision 11167)
-@@ -12,6 +12,22 @@
-
- #include <assert.h>
-
-+namespace {
-+enum filetransferStates
-+{
-+ filetransfer_init = 0,
-+ filetransfer_waitcwd,
-+ filetransfer_waitlist,
-+ filetransfer_size,
-+ filetransfer_mdtm,
-+ filetransfer_resumetest,
-+ filetransfer_transfer,
-+ filetransfer_waittransfer,
-+ filetransfer_waitresumetest,
-+ filetransfer_mfmt
-+};
-+}
-+
- CFtpFileTransferOpData::CFtpFileTransferOpData(CFtpControlSocket& controlSocket, CFileTransferCommand const& cmd)
- : CFileTransferOpData(L"CFtpFileTransferOpData", cmd)
- , CFtpOpData(controlSocket)
-Index: trunk/src/engine/ftp/filetransfer.h
-===================================================================
---- trunk/src/engine/ftp/filetransfer.h (revision 11166)
-+++ trunk/src/engine/ftp/filetransfer.h (revision 11167)
-@@ -3,20 +3,6 @@
-
- #include "ftpcontrolsocket.h"
-
--enum filetransferStates
--{
-- filetransfer_init = 0,
-- filetransfer_waitcwd,
-- filetransfer_waitlist,
-- filetransfer_size,
-- filetransfer_mdtm,
-- filetransfer_resumetest,
-- filetransfer_transfer,
-- filetransfer_waittransfer,
-- filetransfer_waitresumetest,
-- filetransfer_mfmt
--};
--
- class CFtpFileTransferOpData final : public CFileTransferOpData, public CFtpTransferOpData, public CFtpOpData
- {
- public:
-Index: trunk/src/engine/ftp/ftpcontrolsocket.cpp
-===================================================================
---- trunk/src/engine/ftp/ftpcontrolsocket.cpp (revision 11166)
-+++ trunk/src/engine/ftp/ftpcontrolsocket.cpp (revision 11167)
-@@ -34,6 +34,9 @@
-
- #include <assert.h>
-
-+using namespace ftpLogonStates;
-+using namespace FtpRawTransferStates;
-+
- CFtpControlSocket::CFtpControlSocket(CFileZillaEnginePrivate & engine)
- : CRealControlSocket(engine)
- {
-Index: trunk/src/engine/ftp/list.cpp
-===================================================================
---- trunk/src/engine/ftp/list.cpp (revision 11166)
-+++ trunk/src/engine/ftp/list.cpp (revision 11167)
-@@ -9,6 +9,15 @@
- #include <assert.h>
-
- namespace {
-+enum listStates
-+{
-+ list_init,
-+ list_waitcwd,
-+ list_waitlock,
-+ list_waittransfer,
-+ list_mdtm
-+};
-+
- // Some servers are broken. Instead of an empty listing, some MVS servers
- // for example they return "550 no members found"
- // Other servers return "550 No files found."
-Index: trunk/src/engine/ftp/list.h
-===================================================================
---- trunk/src/engine/ftp/list.h (revision 11166)
-+++ trunk/src/engine/ftp/list.h (revision 11167)
-@@ -6,15 +6,6 @@
-
- class CDirectoryListingParser;
-
--enum listStates
--{
-- list_init,
-- list_waitcwd,
-- list_waitlock,
-- list_waittransfer,
-- list_mdtm
--};
--
- class CFtpListOpData final : public COpData, public CFtpOpData, public CFtpTransferOpData
- {
- public:
-Index: trunk/src/engine/ftp/logon.cpp
-===================================================================
---- trunk/src/engine/ftp/logon.cpp (revision 11166)
-+++ trunk/src/engine/ftp/logon.cpp (revision 11167)
-@@ -10,6 +10,7 @@
- #include "../../include/engine_options.h"
-
- using namespace std::literals;
-+using namespace ftpLogonStates;
-
- CFtpLogonOpData::CFtpLogonOpData(CFtpControlSocket& controlSocket)
- : COpData(Command::connect, L"CFtpLogonOpData")
-Index: trunk/src/engine/ftp/logon.h
-===================================================================
---- trunk/src/engine/ftp/logon.h (revision 11166)
-+++ trunk/src/engine/ftp/logon.h (revision 11167)
-@@ -3,27 +3,27 @@
-
- #include "ftpcontrolsocket.h"
-
--enum loginStates
--{
-- LOGON_CONNECT,
-- LOGON_WELCOME,
-- LOGON_AUTH_TLS,
-- LOGON_AUTH_SSL,
-- LOGON_AUTH_WAIT,
-- LOGON_SECURITY,
-- LOGON_LOGON,
-- LOGON_SYST,
-- LOGON_FEAT,
-- LOGON_CLNT,
-- LOGON_OPTSUTF8,
-- LOGON_PBSZ,
-- LOGON_PROT,
-- LOGON_OPTSMLST,
-- LOGON_CUSTOMCOMMANDS,
-- LOGON_DONE
-+namespace ftpLogonStates {
-+enum type {
-+ LOGON_CONNECT,
-+ LOGON_WELCOME,
-+ LOGON_AUTH_TLS,
-+ LOGON_AUTH_SSL,
-+ LOGON_AUTH_WAIT,
-+ LOGON_SECURITY,
-+ LOGON_LOGON,
-+ LOGON_SYST,
-+ LOGON_FEAT,
-+ LOGON_CLNT,
-+ LOGON_OPTSUTF8,
-+ LOGON_PBSZ,
-+ LOGON_PROT,
-+ LOGON_OPTSMLST,
-+ LOGON_CUSTOMCOMMANDS,
-+ LOGON_DONE
- };
-+}
-
--
- enum class loginCommandType
- {
- user,
-@@ -73,7 +73,7 @@
-
- unsigned int customCommandIndex{};
-
-- int neededCommands[LOGON_DONE]{};
-+ int neededCommands[ftpLogonStates::LOGON_DONE]{};
-
- std::deque<t_loginCommand> loginSequence;
-
-Index: trunk/src/engine/ftp/mkd.cpp
-===================================================================
---- trunk/src/engine/ftp/mkd.cpp (revision 11166)
-+++ trunk/src/engine/ftp/mkd.cpp (revision 11167)
-@@ -5,6 +5,7 @@
-
- using namespace std::literals;
-
-+namespace {
- enum mkdStates
- {
- mkd_init = 0,
-@@ -13,6 +14,7 @@
- mkd_cwdsub,
- mkd_tryfull
- };
-+}
-
- /* Directory creation works like this: First find a parent directory into
- * which we can CWD, then create the subdirs one by one. If either part
-Index: trunk/src/engine/ftp/rawtransfer.cpp
-===================================================================
---- trunk/src/engine/ftp/rawtransfer.cpp (revision 11166)
-+++ trunk/src/engine/ftp/rawtransfer.cpp (revision 11167)
-@@ -7,7 +7,7 @@
-
- #include <libfilezilla/iputils.hpp>
-
--#include <assert.h>
-+using namespace FtpRawTransferStates;
-
- int CFtpRawTransferOpData::Send()
- {
-@@ -423,7 +423,6 @@
- {
- std::wstring ret = L"PASV";
-
-- assert(bPasv);
- bTriedPasv = true;
-
- if (controlSocket_.proxy_layer_) {
-Index: trunk/src/engine/ftp/rawtransfer.h
-===================================================================
---- trunk/src/engine/ftp/rawtransfer.h (revision 11166)
-+++ trunk/src/engine/ftp/rawtransfer.h (revision 11167)
-@@ -3,18 +3,20 @@
-
- #include "ftpcontrolsocket.h"
-
--enum rawtransferStates
-+namespace FtpRawTransferStates {
-+enum type
- {
-- rawtransfer_init = 0,
-- rawtransfer_type,
-- rawtransfer_port_pasv,
-- rawtransfer_rest,
-- rawtransfer_transfer,
-- rawtransfer_waitfinish,
-- rawtransfer_waittransferpre,
-- rawtransfer_waittransfer,
-- rawtransfer_waitsocket
-+ rawtransfer_init = 0,
-+ rawtransfer_type,
-+ rawtransfer_port_pasv,
-+ rawtransfer_rest,
-+ rawtransfer_transfer,
-+ rawtransfer_waitfinish,
-+ rawtransfer_waittransferpre,
-+ rawtransfer_waittransfer,
-+ rawtransfer_waitsocket
- };
-+}
-
- class CFtpRawTransferOpData final : public COpData, public CFtpOpData
- {
-Index: trunk/src/engine/ftp/rename.cpp
-===================================================================
---- trunk/src/engine/ftp/rename.cpp (revision 11166)
-+++ trunk/src/engine/ftp/rename.cpp (revision 11167)
-@@ -4,6 +4,7 @@
- #include "../directorycache.h"
- #include "../pathcache.h"
-
-+namespace {
- enum renameStates
- {
- rename_init,
-@@ -11,6 +12,7 @@
- rename_rnfrom,
- rename_rnto
- };
-+}
-
- int CFtpRenameOpData::Send()
- {
-Index: trunk/src/engine/ftp/rmd.cpp
-===================================================================
---- trunk/src/engine/ftp/rmd.cpp (revision 11166)
-+++ trunk/src/engine/ftp/rmd.cpp (revision 11167)
-@@ -4,6 +4,7 @@
- #include "../directorycache.h"
- #include "../pathcache.h"
-
-+namespace {
- enum rmdStates
- {
- rmd_init,
-@@ -10,6 +11,7 @@
- rmd_waitcwd,
- rmd_rmd
- };
-+}
-
- int CFtpRemoveDirOpData::Send()
- {
-Index: trunk/src/engine/http/filetransfer.cpp
-===================================================================
---- trunk/src/engine/http/filetransfer.cpp (revision 11166)
-+++ trunk/src/engine/http/filetransfer.cpp (revision 11167)
-@@ -7,6 +7,7 @@
- #include <assert.h>
- #include <string.h>
-
-+namespace {
- enum filetransferStates
- {
- filetransfer_init = 0,
-@@ -13,6 +14,7 @@
- filetransfer_transfer,
- filetransfer_waittransfer
- };
-+}
-
- CHttpFileTransferOpData::CHttpFileTransferOpData(CHttpControlSocket & controlSocket, CFileTransferCommand const& cmd)
- : CFileTransferOpData(L"CHttpFileTransferOpData", cmd)
-Index: trunk/src/engine/sftp/chmod.cpp
-===================================================================
---- trunk/src/engine/sftp/chmod.cpp (revision 11166)
-+++ trunk/src/engine/sftp/chmod.cpp (revision 11167)
-@@ -3,6 +3,7 @@
- #include "chmod.h"
- #include "../directorycache.h"
-
-+namespace {
- enum chmodStates
- {
- chmod_init,
-@@ -9,6 +10,7 @@
- chmod_waitcwd,
- chmod_chmod
- };
-+}
-
- int CSftpChmodOpData::Send()
- {
-Index: trunk/src/engine/sftp/connect.cpp
-===================================================================
---- trunk/src/engine/sftp/connect.cpp (revision 11166)
-+++ trunk/src/engine/sftp/connect.cpp (revision 11167)
-@@ -21,6 +21,7 @@
- #include <sys/mman.h>
- #endif
-
-+namespace {
- enum connectStates
- {
- connect_init,
-@@ -28,6 +29,7 @@
- connect_keys,
- connect_open
- };
-+}
-
- int CSftpConnectOpData::Send()
- {
-Index: trunk/src/engine/sftp/cwd.cpp
-===================================================================
---- trunk/src/engine/sftp/cwd.cpp (revision 11166)
-+++ trunk/src/engine/sftp/cwd.cpp (revision 11167)
-@@ -3,6 +3,7 @@
- #include "cwd.h"
- #include "../pathcache.h"
-
-+namespace {
- enum cwdStates
- {
- cwd_init = 0,
-@@ -10,6 +11,7 @@
- cwd_cwd,
- cwd_cwd_subdir
- };
-+}
-
- int CSftpChangeDirOpData::Send()
- {
-Index: trunk/src/engine/sftp/filetransfer.cpp
-===================================================================
---- trunk/src/engine/sftp/filetransfer.cpp (revision 11166)
-+++ trunk/src/engine/sftp/filetransfer.cpp (revision 11167)
-@@ -10,6 +10,7 @@
-
- #include <assert.h>
-
-+namespace {
- enum filetransferStates
- {
- filetransfer_init = 0,
-@@ -19,6 +20,7 @@
- filetransfer_transfer,
- filetransfer_chmtime
- };
-+}
-
- CSftpFileTransferOpData::~CSftpFileTransferOpData()
- {
-Index: trunk/src/engine/sftp/list.cpp
-===================================================================
---- trunk/src/engine/sftp/list.cpp (revision 11166)
-+++ trunk/src/engine/sftp/list.cpp (revision 11167)
-@@ -5,6 +5,7 @@
-
- #include <assert.h>
-
-+namespace {
- enum listStates
- {
- list_init = 0,
-@@ -12,6 +13,7 @@
- list_waitlock,
- list_list
- };
-+}
-
- int CSftpListOpData::Send()
- {
-Index: trunk/src/engine/sftp/mkd.cpp
-===================================================================
---- trunk/src/engine/sftp/mkd.cpp (revision 11166)
-+++ trunk/src/engine/sftp/mkd.cpp (revision 11167)
-@@ -3,6 +3,7 @@
- #include "../directorycache.h"
- #include "mkd.h"
-
-+namespace {
- enum mkdStates
- {
- mkd_init = 0,
-@@ -11,6 +12,7 @@
- mkd_cwdsub,
- mkd_tryfull
- };
-+}
-
- /* Directory creation works like this: First find a parent directory into
- * which we can CWD, then create the subdirs one by one. If either part
-Index: trunk/src/engine/sftp/rename.cpp
-===================================================================
---- trunk/src/engine/sftp/rename.cpp (revision 11166)
-+++ trunk/src/engine/sftp/rename.cpp (revision 11167)
-@@ -4,6 +4,7 @@
- #include "../pathcache.h"
- #include "rename.h"
-
-+namespace {
- enum renameStates
- {
- rename_init,
-@@ -10,6 +11,7 @@
- rename_waitcwd,
- rename_rename
- };
-+}
-
- int CSftpRenameOpData::Send()
- {
-Index: trunk/src/engine/storj/connect.cpp
-===================================================================
---- trunk/src/engine/storj/connect.cpp (revision 11166)
-+++ trunk/src/engine/storj/connect.cpp (revision 11167)
-@@ -22,6 +22,16 @@
- #include <sys/mman.h>
- #endif
-
-+namespace {
-+enum connectStates
-+{
-+ connect_init,
-+ connect_host,
-+ connect_user,
-+ connect_pass
-+};
-+}
-+
- int CStorjConnectOpData::Send()
- {
- switch (opState)
-Index: trunk/src/engine/storj/connect.h
-===================================================================
---- trunk/src/engine/storj/connect.h (revision 11166)
-+++ trunk/src/engine/storj/connect.h (revision 11167)
-@@ -3,14 +3,6 @@
-
- #include "storjcontrolsocket.h"
-
--enum connectStates
--{
-- connect_init,
-- connect_host,
-- connect_user,
-- connect_pass
--};
--
- class CStorjConnectOpData final : public COpData, public CStorjOpData
- {
- public:
-Index: trunk/src/engine/storj/file_transfer.cpp
-===================================================================
---- trunk/src/engine/storj/file_transfer.cpp (revision 11166)
-+++ trunk/src/engine/storj/file_transfer.cpp (revision 11167)
-@@ -7,6 +7,7 @@
- #include <libfilezilla/local_filesys.hpp>
- #include <libfilezilla/process.hpp>
-
-+namespace {
- enum FileTransferStates
- {
- filetransfer_init,
-@@ -15,6 +16,7 @@
- filetransfer_delete,
- filetransfer_transfer
- };
-+}
-
- CStorjFileTransferOpData::~CStorjFileTransferOpData()
- {
-Index: trunk/src/engine/storj/mkd.cpp
-===================================================================
---- trunk/src/engine/storj/mkd.cpp (revision 11166)
-+++ trunk/src/engine/storj/mkd.cpp (revision 11167)
-@@ -3,6 +3,7 @@
- #include "../directorycache.h"
- #include "mkd.h"
-
-+namespace {
- enum mkdStates
- {
- mkd_init = 0,
-@@ -9,6 +10,7 @@
- mkd_mkbucket,
- mkd_put
- };
-+}
-
- int CStorjMkdirOpData::Send()
- {
diff --git a/net-ftp/filezilla/filezilla-3.67.0-r1.ebuild b/net-ftp/filezilla/filezilla-3.67.0-r1.ebuild
deleted file mode 100644
index bdff3eaada9e..000000000000
--- a/net-ftp/filezilla/filezilla-3.67.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="cpu_flags_x86_sse2 dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
- >=dev-libs/nettle-3.1:=
- >=dev-db/sqlite-3.7
- >=dev-libs/boost-1.76.0:=
- >=dev-libs/libfilezilla-0.47.0:=
- >=dev-libs/pugixml-1.7
- >=net-libs/gnutls-3.5.7
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- x11-misc/xdg-utils
- dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
- test? ( >=dev-util/cppunit-1.13.0 )"
-BDEPEND="
- virtual/pkgconfig
- >=dev-build/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.22.1-debug.patch
- "${FILESDIR}"/${PN}-3.47.0-metainfo.patch
- "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
- "${FILESDIR}"/${PN}-3.52.2-slibtool.patch
- "${FILESDIR}"/${PN}-3.60.1-desktop.patch
- # backport patch for ODR
- "${FILESDIR}"/filezilla-3.67.0-odr.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- if use x86 && ! use cpu_flags_x86_sse2; then
- append-cppflags -D_FORCE_SOFTWARE_SHA
- fi
- setup-wxwidgets
-
- local myeconfargs=(
- --disable-autoupdatecheck
- --with-pugixml=system
- $(use_enable nls locales)
- $(use_with dbus)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-ftp/filezilla/filezilla-3.67.0.ebuild b/net-ftp/filezilla/filezilla-3.67.0.ebuild
deleted file mode 100644
index 8e7d6d453348..000000000000
--- a/net-ftp/filezilla/filezilla-3.67.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="cpu_flags_x86_sse2 dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
- >=dev-libs/nettle-3.1:=
- >=dev-db/sqlite-3.7
- >=dev-libs/boost-1.76.0:=
- >=dev-libs/libfilezilla-0.47.0:=
- >=dev-libs/pugixml-1.7
- >=net-libs/gnutls-3.5.7
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- x11-misc/xdg-utils
- dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
- test? ( >=dev-util/cppunit-1.13.0 )"
-BDEPEND="
- virtual/pkgconfig
- >=dev-build/libtool-1.4
- nls? ( >=sys-devel/gettext-0.11 )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.22.1-debug.patch
- "${FILESDIR}"/${PN}-3.47.0-metainfo.patch
- "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
- "${FILESDIR}"/${PN}-3.52.2-slibtool.patch
- "${FILESDIR}"/${PN}-3.60.1-desktop.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- if use x86 && ! use cpu_flags_x86_sse2; then
- append-cppflags -D_FORCE_SOFTWARE_SHA
- fi
- setup-wxwidgets
-
- local myeconfargs=(
- --disable-autoupdatecheck
- --with-pugixml=system
- $(use_enable nls locales)
- $(use_with dbus)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-11-08 3:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-04 11:21 [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/files/, net-ftp/filezilla/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 3:03 Yixun Lan
2024-07-10 7:56 Yixun Lan
2024-01-09 12:04 Bernard Cafarelli
2020-02-25 10:02 Lars Wendler
2016-02-11 9:37 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox