From 32b3f457169b0689280038139c67012f92046b4c Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 7 Mar 2017 19:11:14 +0100 Subject: [PATCH] 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 --- .../filezilla/files/filezilla-3.24.1-desktop_entry.patch | 8 ++++++++ ...filezilla-3.24.1.ebuild => filezilla-3.24.1-r1.ebuild} | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch rename net-ftp/filezilla/{filezilla-3.24.1.ebuild => filezilla-3.24.1-r1.ebuild} (93%) 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.ebuild b/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild similarity index 93% rename from net-ftp/filezilla/filezilla-3.24.1.ebuild rename to net-ftp/filezilla/filezilla-3.24.1-r1.ebuild index 1be888aca65a..fc0281194883 100644 --- a/net-ftp/filezilla/filezilla-3.24.1.ebuild +++ b/net-ftp/filezilla/filezilla-3.24.1-r1.ebuild @@ -37,6 +37,11 @@ DEPEND="${RDEPEND} 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 @@ -49,7 +54,7 @@ pkg_pretend() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-3.22.1-debug.patch + epatch "${PATCHES[@]}" eautoreconf } -- 2.26.2