From 32b3f457169b0689280038139c67012f92046b4c Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 7 Mar 2017 19:11:14 +0100 Subject: net-ftp/filezilla: Revbump to fix broken desktop entry file (bug #611968). Thanks to Francesco Turco for reporting this bug and pointing to the upstream fix. Package-Manager: Portage-2.3.4, Repoman-2.3.2 --- .../files/filezilla-3.24.1-desktop_entry.patch | 8 +++ net-ftp/filezilla/filezilla-3.24.1-r1.ebuild | 73 ++++++++++++++++++++++ net-ftp/filezilla/filezilla-3.24.1.ebuild | 68 -------------------- 3 files changed, 81 insertions(+), 68 deletions(-) create mode 100644 net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch create mode 100644 net-ftp/filezilla/filezilla-3.24.1-r1.ebuild delete mode 100644 net-ftp/filezilla/filezilla-3.24.1.ebuild (limited to 'net-ftp') diff --git a/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch b/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch new file mode 100644 index 000000000000..2a579e898cce --- /dev/null +++ b/net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch @@ -0,0 +1,8 @@ +--- FileZilla3/trunk/data/filezilla.desktop 2017/02/28 16:01:04 8248 ++++ FileZilla3/trunk/data/filezilla.desktop 2017/03/03 15:38:01 8249 +@@ -1,4 +1,4 @@ +-[Desktop Entry] ++[Desktop Entry] + Name=FileZilla + GenericName=FTP client + GenericName[da]=FTP-klient diff --git a/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild b/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild new file mode 100644 index 000000000000..fc0281194883 --- /dev/null +++ b/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +WX_GTK_VER="3.0" + +inherit autotools eutils flag-o-matic multilib wxwidgets + +MY_PV=${PV/_/-} +MY_P="FileZilla_${MY_PV}" + +DESCRIPTION="FTP client with lots of useful features and an intuitive interface" +HOMEPAGE="http://filezilla-project.org/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="dbus nls test" + +# pugixml 1.7 minimal dependency is for c++11 proper configuration +RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 + >=dev-libs/nettle-3.1:= + >=dev-db/sqlite-3.7 + >=dev-libs/libfilezilla-0.9.0 + >=dev-libs/pugixml-1.7 + net-dns/libidn + >=net-libs/gnutls-3.4.0 + >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils + dbus? ( sys-apps/dbus )" +DEPEND="${RDEPEND} + virtual/pkgconfig + >=sys-devel/libtool-1.4 + nls? ( >=sys-devel/gettext-0.11 ) + test? ( dev-util/cppunit )" + +S="${WORKDIR}"/${PN}-${MY_PV} + +PATCHES=( + "${FILESDIR}"/${PN}-3.22.1-debug.patch + "${FILESDIR}"/${P}-desktop_entry.patch #466206 +) + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if ! test-flag-CXX -std=c++14; then + eerror "${P} requires C++14-capable C++ compiler. Your current compiler" + eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" + eerror "to gcc-4.9 or an equivalent version supporting C++14." + die "Currently active compiler does not support -std=c++14" + fi + fi +} + +src_prepare() { + epatch "${PATCHES[@]}" + eautoreconf +} + +src_configure() { + econf $(use_with dbus) $(use_enable nls locales) \ + --with-pugixml=system \ + --disable-autoupdatecheck +} + +src_install() { + emake DESTDIR="${D}" install + + doicon src/interface/resources/48x48/${PN}.png + + dodoc AUTHORS ChangeLog NEWS +} diff --git a/net-ftp/filezilla/filezilla-3.24.1.ebuild b/net-ftp/filezilla/filezilla-3.24.1.ebuild deleted file mode 100644 index 1be888aca65a..000000000000 --- a/net-ftp/filezilla/filezilla-3.24.1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -WX_GTK_VER="3.0" - -inherit autotools eutils flag-o-matic multilib wxwidgets - -MY_PV=${PV/_/-} -MY_P="FileZilla_${MY_PV}" - -DESCRIPTION="FTP client with lots of useful features and an intuitive interface" -HOMEPAGE="http://filezilla-project.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="dbus nls test" - -# pugixml 1.7 minimal dependency is for c++11 proper configuration -RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1 - >=dev-libs/nettle-3.1:= - >=dev-db/sqlite-3.7 - >=dev-libs/libfilezilla-0.9.0 - >=dev-libs/pugixml-1.7 - net-dns/libidn - >=net-libs/gnutls-3.4.0 - >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils - dbus? ( sys-apps/dbus )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/libtool-1.4 - nls? ( >=sys-devel/gettext-0.11 ) - test? ( dev-util/cppunit )" - -S="${WORKDIR}"/${PN}-${MY_PV} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - if ! test-flag-CXX -std=c++14; then - eerror "${P} requires C++14-capable C++ compiler. Your current compiler" - eerror "does not seem to support -std=c++14 option. Please upgrade your compiler" - eerror "to gcc-4.9 or an equivalent version supporting C++14." - die "Currently active compiler does not support -std=c++14" - fi - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.22.1-debug.patch - eautoreconf -} - -src_configure() { - econf $(use_with dbus) $(use_enable nls locales) \ - --with-pugixml=system \ - --disable-autoupdatecheck -} - -src_install() { - emake DESTDIR="${D}" install - - doicon src/interface/resources/48x48/${PN}.png - - dodoc AUTHORS ChangeLog NEWS -} -- cgit v1.2.3-65-gdbad