| 1 |
commit: d4618488e5f1564a6b89aebe99c7e189a1a597d2 |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 9 14:23:46 2020 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 9 14:25:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4618488 |
| 7 |
|
| 8 |
net-ftp/filezilla: 3.48.0 bump |
| 9 |
|
| 10 |
Also patch build system to skip useless configure sub script (win-only |
| 11 |
shell extension) that used default CC. Apply same patch to stable |
| 12 |
candidate 3.47.2.1 |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/717736 |
| 15 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 16 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 17 |
|
| 18 |
net-ftp/filezilla/Manifest | 1 + |
| 19 |
.../files/filezilla-3.47.0-disable-shellext_conf.patch | 13 +++++++++++++ |
| 20 |
net-ftp/filezilla/filezilla-3.47.2.1.ebuild | 1 + |
| 21 |
.../{filezilla-3.47.2.1.ebuild => filezilla-3.48.0.ebuild} | 7 ++++--- |
| 22 |
4 files changed, 19 insertions(+), 3 deletions(-) |
| 23 |
|
| 24 |
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest |
| 25 |
index a1ae050d5d7..b78827f5aea 100644 |
| 26 |
--- a/net-ftp/filezilla/Manifest |
| 27 |
+++ b/net-ftp/filezilla/Manifest |
| 28 |
@@ -4,3 +4,4 @@ DIST FileZilla_3.45.1_src.tar.bz2 4649083 BLAKE2B 8d3113e5ce96d2115a6ec02109f261 |
| 29 |
DIST FileZilla_3.46.3_src.tar.bz2 4720329 BLAKE2B 92369d2fb3b8c9eded37f912bbd25a0e995a5fc1ab86ef6aa746a8eb239f17e8fafa78de00529b0f3af102fe268b51a60ce40ac967cf9b2fbbd6fa7900898ffc SHA512 35b61c3bfd1d40848e7846b4533da8844df0e4873cb89286b90330cbc29dffeff96fcab10aec908a08d9129198bb2d80df8f223d8ebc1a0863a4083cb06abffc |
| 30 |
DIST FileZilla_3.47.1_src.tar.bz2 4732088 BLAKE2B 3db5247a9e2d9a7bf296091317b8faf049dbe9dca328536671dba5e5ab7b32d16d273348d0cbcf89342262a34dcf7d90198b4dfb98e67bfb683febf07b7b680e SHA512 32573e847bc23acb86bdea8eb4de102e4f673465e0b86738d954b47eacdf6e534854a9065bddf8b586eba315bf65b1bfc4f17f9379819a6c9bd43ae6ed8f388a |
| 31 |
DIST FileZilla_3.47.2.1_src.tar.bz2 4733941 BLAKE2B 0517d43bfba8aa116ae4031d56e5070aadbcaf81ace2311f6cfddb47e7f67ec62396ae3690c139bcc1a8368be690776b3163dd6d53a6ebb27ee5e99300b3c67b SHA512 8919eab7762e0e30241637a8978fbf61f02ac4c52aac293191315b931d52b41ae228b753f4e3b7530835578836dfee7f91772841273e9fc2bdf75ff7ed48fafc |
| 32 |
+DIST FileZilla_3.48.0_src.tar.bz2 4765599 BLAKE2B 0ab391c0862a34dd5ede7a80290afc82b4d85b2deaf42d3bacd243bddf15505f05028522f73eeada07e91d91e0af87676ad77081c843448fda53c3b2ac18a70d SHA512 c9d4eb17dc31894468ca4b7c4c8fda0f307d3931bf1b3b8fb44afd084a1b2c9309d39e5745f9ba287a5566d44089af32350703e324a559afd6a015af469433fb |
| 33 |
|
| 34 |
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 |
| 35 |
new file mode 100644 |
| 36 |
index 00000000000..55868dce80f |
| 37 |
--- /dev/null |
| 38 |
+++ b/net-ftp/filezilla/files/filezilla-3.47.0-disable-shellext_conf.patch |
| 39 |
@@ -0,0 +1,13 @@ |
| 40 |
+diff -Naur filezilla-3.47.2.1.orig/configure.ac filezilla-3.47.2.1/configure.ac |
| 41 |
+--- filezilla-3.47.2.1.orig/configure.ac 2020-03-11 12:24:12.000000000 +0100 |
| 42 |
++++ filezilla-3.47.2.1/configure.ac 2020-05-09 16:09:23.832476049 +0200 |
| 43 |
+@@ -130,9 +130,6 @@ |
| 44 |
+ "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=i686-w64-mingw32 || exit 1 |
| 45 |
+ cd "$OLD_DIR/src/fzshellext/64" || exit 1 |
| 46 |
+ "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=x86_64-w64-mingw32 || exit 1 |
| 47 |
+-else |
| 48 |
+- cd "$OLD_DIR/src/fzshellext/64" || exit 1 |
| 49 |
+- "$ac_abs_confdir/src/fzshellext/configure" --disable-shellext || exit 1 |
| 50 |
+ fi |
| 51 |
+ cd "$OLD_DIR" |
| 52 |
+ |
| 53 |
|
| 54 |
diff --git a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild |
| 55 |
index 9b6e1abcc95..2d228d74462 100644 |
| 56 |
--- a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild |
| 57 |
+++ b/net-ftp/filezilla/filezilla-3.47.2.1.ebuild |
| 58 |
@@ -45,6 +45,7 @@ DOCS=(AUTHORS ChangeLog NEWS ) |
| 59 |
PATCHES=( |
| 60 |
"${FILESDIR}"/${PN}-3.22.1-debug.patch |
| 61 |
"${FILESDIR}"/${PN}-3.47.0-metainfo.patch |
| 62 |
+ "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch |
| 63 |
) |
| 64 |
|
| 65 |
pkg_pretend() { |
| 66 |
|
| 67 |
diff --git a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild b/net-ftp/filezilla/filezilla-3.48.0.ebuild |
| 68 |
similarity index 91% |
| 69 |
copy from net-ftp/filezilla/filezilla-3.47.2.1.ebuild |
| 70 |
copy to net-ftp/filezilla/filezilla-3.48.0.ebuild |
| 71 |
index 9b6e1abcc95..9e6b4b3a1bf 100644 |
| 72 |
--- a/net-ftp/filezilla/filezilla-3.47.2.1.ebuild |
| 73 |
+++ b/net-ftp/filezilla/filezilla-3.48.0.ebuild |
| 74 |
@@ -16,15 +16,15 @@ SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2" |
| 75 |
|
| 76 |
LICENSE="GPL-2" |
| 77 |
SLOT="0" |
| 78 |
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 x86" |
| 79 |
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" |
| 80 |
IUSE="dbus nls test" |
| 81 |
|
| 82 |
# pugixml 1.7 minimal dependency is for c++11 proper configuration |
| 83 |
RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 |
| 84 |
>=dev-libs/nettle-3.1:= |
| 85 |
>=dev-db/sqlite-3.7 |
| 86 |
- >=dev-libs/libfilezilla-0.20.2:= |
| 87 |
- <dev-libs/libfilezilla-0.21.0:= |
| 88 |
+ >=dev-libs/libfilezilla-0.21.0:= |
| 89 |
+ <dev-libs/libfilezilla-0.22.0:= |
| 90 |
>=dev-libs/pugixml-1.7 |
| 91 |
>=net-libs/gnutls-3.5.7 |
| 92 |
>=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X] |
| 93 |
@@ -45,6 +45,7 @@ DOCS=(AUTHORS ChangeLog NEWS ) |
| 94 |
PATCHES=( |
| 95 |
"${FILESDIR}"/${PN}-3.22.1-debug.patch |
| 96 |
"${FILESDIR}"/${PN}-3.47.0-metainfo.patch |
| 97 |
+ "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch |
| 98 |
) |
| 99 |
|
| 100 |
pkg_pretend() { |
Archives