commit: 10d9859ef5c73d5c4e514717fd6bbdf536f2b5a0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 00:06:32 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 00:06:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d9859e
net-ftp/filezilla: Fixed build with sys-devel/slibtool
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../files/filezilla-3.52.2-slibtool.patch | 24 ++++++++++++++++++++++
net-ftp/filezilla/filezilla-3.52.2.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch
b/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch
new file mode 100644
index 00000000000..4eaae857e1d
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch
@@ -0,0 +1,24 @@
+This fixes compilation with slibtool instead of GNU libtool
+
+--- filezilla-3.52.2/src/engine/Makefile.am
++++ filezilla-3.52.2/src/engine/Makefile.am
+@@ -146,6 +146,8 @@
+ libfzclient_private_la_LDFLAGS += $(LIBFILEZILLA_LIBS)
+ libfzclient_private_la_LDFLAGS += $(IDN_LIB)
+
++libfzclient_private_la_LIBADD = $(PUGIXML_LIBS)
++
+ dist_noinst_DATA = engine.vcxproj
+
+ CLEANFILES = filezilla.h.gch
+--- filezilla-3.52.2/src/interface/Makefile.am
++++ filezilla-3.52.2/src/interface/Makefile.am
+@@ -309,7 +309,7 @@
+
+ if HAVE_DBUS
+ filezilla_DEPENDENCIES += ../dbus/libfzdbus.a
+-filezilla_LDFLAGS += ../dbus/libfzdbus.a $(LIBDBUS_LIBS)
++filezilla_LDADD = ../dbus/libfzdbus.a $(LIBDBUS_LIBS)
+ endif
+
+ filezilla_LDFLAGS += $(WX_LIBS)
diff --git a/net-ftp/filezilla/filezilla-3.52.2.ebuild
b/net-ftp/filezilla/filezilla-3.52.2.ebuild
index ba2ce7335de..c8f67f39ebe 100644
--- a/net-ftp/filezilla/filezilla-3.52.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.52.2.ebuild
@@ -45,6 +45,7 @@ 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
)
pkg_pretend() {
