commit: d4618488e5f1564a6b89aebe99c7e189a1a597d2 Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> AuthorDate: Sat May 9 14:23:46 2020 +0000 Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> CommitDate: Sat May 9 14:25:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4618488
net-ftp/filezilla: 3.48.0 bump Also patch build system to skip useless configure sub script (win-only shell extension) that used default CC. Apply same patch to stable candidate 3.47.2.1 Closes: https://bugs.gentoo.org/717736 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> net-ftp/filezilla/Manifest | 1 + .../files/filezilla-3.47.0-disable-shellext_conf.patch | 13 +++++++++++++ net-ftp/filezilla/filezilla-3.47.2.1.ebuild | 1 + .../{filezilla-3.47.2.1.ebuild => filezilla-3.48.0.ebuild} | 7 ++++--- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest index a1ae050d5d7..b78827f5aea 100644 --- a/net-ftp/filezilla/Manifest +++ b/net-ftp/filezilla/Manifest @@ -4,3 +4,4 @@ DIST FileZilla_3.45.1_src.tar.bz2 4649083 BLAKE2B 8d3113e5ce96d2115a6ec02109f261 DIST FileZilla_3.46.3_src.tar.bz2 4720329 BLAKE2B 92369d2fb3b8c9eded37f912bbd25a0e995a5fc1ab86ef6aa746a8eb239f17e8fafa78de00529b0f3af102fe268b51a60ce40ac967cf9b2fbbd6fa7900898ffc SHA512 35b61c3bfd1d40848e7846b4533da8844df0e4873cb89286b90330cbc29dffeff96fcab10aec908a08d9129198bb2d80df8f223d8ebc1a0863a4083cb06abffc DIST FileZilla_3.47.1_src.tar.bz2 4732088 BLAKE2B 3db5247a9e2d9a7bf296091317b8faf049dbe9dca328536671dba5e5ab7b32d16d273348d0cbcf89342262a34dcf7d90198b4dfb98e67bfb683febf07b7b680e SHA512 32573e847bc23acb86bdea8eb4de102e4f673465e0b86738d954b47eacdf6e534854a9065bddf8b586eba315bf65b1bfc4f17f9379819a6c9bd43ae6ed8f388a DIST FileZilla_3.47.2.1_src.tar.bz2 4733941 BLAKE2B 0517d43bfba8aa116ae4031d56e5070aadbcaf81ace2311f6cfddb47e7f67ec62396ae3690c139bcc1a8368be690776b3163dd6d53a6ebb27ee5e99300b3c67b SHA512 8919eab7762e0e30241637a8978fbf61f02ac4c52aac293191315b931d52b41ae228b753f4e3b7530835578836dfee7f91772841273e9fc2bdf75ff7ed48fafc +DIST FileZilla_3.48.0_src.tar.bz2 4765599 BLAKE2B 0ab391c0862a34dd5ede7a80290afc82b4d85b2deaf42d3bacd243bddf15505f05028522f73eeada07e91d91e0af87676ad77081c843448fda53c3b2ac18a70d SHA512 c9d4eb17dc31894468ca4b7c4c8fda0f307d3931bf1b3b8fb44afd084a1b2c9309d39e5745f9ba287a5566d44089af32350703e324a559afd6a015af469433fb diff --git a/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch b/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch new file mode 100644 index 00000000000..55868dce80f --- /dev/null +++ b/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch @@ -0,0 +1,13 @@ +diff -Naur filezilla-3.47.2.1.orig/configure.ac filezilla-3.47.2.1/configure.ac +--- filezilla-3.47.2.1.orig/configure.ac 2020-03-11 12:24:12.000000000 +0100 ++++ filezilla-3.47.2.1/configure.ac 2020-05-09 16:09:23.832476049 +0200 +@@ -130,9 +130,6 @@ + "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=i686-w64-mingw32 || exit 1 + cd "$OLD_DIR/src/fzshellext/64" || exit 1 + "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=x86_64-w64-mingw32 || exit 1 +-else +- cd "$OLD_DIR/src/fzshellext/64" || exit 1 +- "$ac_abs_confdir/src/fzshellext/configure" --disable-shellext || exit 1 + fi + cd "$OLD_DIR" + diff --git a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild index 9b6e1abcc95..2d228d74462 100644 --- a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild +++ b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild @@ -45,6 +45,7 @@ DOCS=(AUTHORS ChangeLog NEWS ) PATCHES=( "${FILESDIR}"/${PN}-3.22.1-debug.patch "${FILESDIR}"/${PN}-3.47.0-metainfo.patch + "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch ) pkg_pretend() { diff --git a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild b/net-ftp/filezilla/filezilla-3.48.0.ebuild similarity index 91% copy from net-ftp/filezilla/filezilla-3.47.2.1.ebuild copy to net-ftp/filezilla/filezilla-3.48.0.ebuild index 9b6e1abcc95..9e6b4b3a1bf 100644 --- a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild +++ b/net-ftp/filezilla/filezilla-3.48.0.ebuild @@ -16,15 +16,15 @@ 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" +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.2:= - <dev-libs/libfilezilla-0.21.0:= + >=dev-libs/libfilezilla-0.21.0:= + <dev-libs/libfilezilla-0.22.0:= >=dev-libs/pugixml-1.7 >=net-libs/gnutls-3.5.7 >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X] @@ -45,6 +45,7 @@ DOCS=(AUTHORS ChangeLog NEWS ) PATCHES=( "${FILESDIR}"/${PN}-3.22.1-debug.patch "${FILESDIR}"/${PN}-3.47.0-metainfo.patch + "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch ) pkg_pretend() {
