From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 744E41382C5 for ; Tue, 19 Jan 2021 00:06:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C15AE0867; Tue, 19 Jan 2021 00:06:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70F99E0867 for ; Tue, 19 Jan 2021 00:06:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5271F340976 for ; Tue, 19 Jan 2021 00:06:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E42AB487 for ; Tue, 19 Jan 2021 00:06:45 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1611014803.10d9859ef5c73d5c4e514717fd6bbdf536f2b5a0.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/filezilla/, net-ftp/filezilla/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/filezilla/files/filezilla-3.52.2-slibtool.patch net-ftp/filezilla/filezilla-3.52.2.ebuild X-VCS-Directories: net-ftp/filezilla/files/ net-ftp/filezilla/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 10d9859ef5c73d5c4e514717fd6bbdf536f2b5a0 X-VCS-Branch: master Date: Tue, 19 Jan 2021 00:06:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c2edfdab-a2c4-49b8-8a49-b27014b42c0e X-Archives-Hash: e2f25fba28608d2632f11f2725c67d41 commit: 10d9859ef5c73d5c4e514717fd6bbdf536f2b5a0 Author: Lars Wendler gentoo org> AuthorDate: Tue Jan 19 00:06:32 2021 +0000 Commit: Lars Wendler gentoo 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 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() {