From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/
Date: Tue, 19 Jan 2021 00:06:45 +0000 (UTC) [thread overview]
Message-ID: <1611014803.10d9859ef5c73d5c4e514717fd6bbdf536f2b5a0.polynomial-c@gentoo> (raw)
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() {
next reply other threads:[~2021-01-19 0:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-19 0:06 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-29 7:39 [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/ Bernard Cafarelli
2023-02-22 19:00 Bernard Cafarelli
2022-07-07 21:09 Bernard Cafarelli
2020-05-09 14:25 Bernard Cafarelli
2017-03-07 18:11 Lars Wendler
2016-10-04 8:16 Lars Wendler
2015-10-17 22:19 Bernard Cafarelli
2015-08-17 15:21 Bernard Cafarelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1611014803.10d9859ef5c73d5c4e514717fd6bbdf536f2b5a0.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox