summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2013-01-21 15:54:24 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2013-01-21 15:54:24 +0000
commit615c125bb79ceec8b1d2480b968c4e5430a24b96 (patch)
tree35b149987de383c6cb941dd80a71179b0022a8be /net-ftp/filezilla
parentupdated pypy deps (diff)
downloadgentoo-2-615c125bb79ceec8b1d2480b968c4e5430a24b96.tar.gz
gentoo-2-615c125bb79ceec8b1d2480b968c4e5430a24b96.tar.bz2
gentoo-2-615c125bb79ceec8b1d2480b968c4e5430a24b96.zip
Fix tests compilation, bug #450212
(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
Diffstat (limited to 'net-ftp/filezilla')
-rw-r--r--net-ftp/filezilla/ChangeLog8
-rw-r--r--net-ftp/filezilla/files/filezilla-3.6.0.2-tests_link.patch11
-rw-r--r--net-ftp/filezilla/filezilla-3.6.0.2.ebuild5
3 files changed, 20 insertions, 4 deletions
diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 65a729cffe6f..738df14ff340 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/filezilla
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.94 2012/11/30 16:32:28 voyageur Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.95 2013/01/21 15:54:24 voyageur Exp $
+
+ 21 Jan 2013; Bernard Cafarelli <voyageur@gentoo.org>
+ filezilla-3.6.0.2.ebuild, +files/filezilla-3.6.0.2-tests_link.patch:
+ Fix tests compilation, bug #450212
*filezilla-3.6.0.2 (30 Nov 2012)
diff --git a/net-ftp/filezilla/files/filezilla-3.6.0.2-tests_link.patch b/net-ftp/filezilla/files/filezilla-3.6.0.2-tests_link.patch
new file mode 100644
index 000000000000..00b4b6d3426b
--- /dev/null
+++ b/net-ftp/filezilla/files/filezilla-3.6.0.2-tests_link.patch
@@ -0,0 +1,11 @@
+diff -Naur filezilla-3.6.0.2.orig/tests/Makefile.am filezilla-3.6.0.2/tests/Makefile.am
+--- filezilla-3.6.0.2.orig/tests/Makefile.am 2013-01-21 16:46:47.794228822 +0100
++++ filezilla-3.6.0.2/tests/Makefile.am 2013-01-21 16:47:39.312178175 +0100
+@@ -18,6 +18,7 @@
+ test_LDFLAGS = $(CPPUNIT_LIBS)
+ test_LDFLAGS += ../src/engine/libengine.a
+ test_LDFLAGS += $(LIBGNUTLS_LIBS)
++test_LDFLAGS += $(LIBSQLITE3_LIBS)
+ test_LDFLAGS += $(WX_LIBS)
+ test_LDFLAGS += $(IDN_LIB)
+
diff --git a/net-ftp/filezilla/filezilla-3.6.0.2.ebuild b/net-ftp/filezilla/filezilla-3.6.0.2.ebuild
index 0cffc6f8065d..df0b0c305ac2 100644
--- a/net-ftp/filezilla/filezilla-3.6.0.2.ebuild
+++ b/net-ftp/filezilla/filezilla-3.6.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.6.0.2.ebuild,v 1.1 2012/11/30 16:32:28 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.6.0.2.ebuild,v 1.2 2013/01/21 15:54:24 voyageur Exp $
EAPI=5
@@ -38,6 +38,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.3.5.1-debug.patch
+ epatch "${FILESDIR}"/${P}-tests_link.patch
append-cppflags -DTIXML_USE_STL
eautoreconf
}