net-ftp/filezilla: Revbump to fix broken desktop entry file (bug #611968).
authorLars Wendler <polynomial-c@gentoo.org>
Tue, 7 Mar 2017 18:11:14 +0000 (19:11 +0100)
committerLars Wendler <polynomial-c@gentoo.org>
Tue, 7 Mar 2017 18:11:30 +0000 (19:11 +0100)
Thanks to Francesco Turco for reporting this bug and pointing to the upstream
fix.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

net-ftp/filezilla/files/filezilla-3.24.1-desktop_entry.patch [new file with mode: 0644]
net-ftp/filezilla/filezilla-3.24.1-r1.ebuild [moved from net-ftp/filezilla/filezilla-3.24.1.ebuild with 93% similarity]

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 (file)
index 0000000..2a579e8
--- /dev/null
@@ -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
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 1be888aca65a6d9a7b93d22662129ea926438350..fc0281194883f1672355d0212294aade818bf33b 100644 (file)
@@ -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
 }