Add upstream patch to correct desktop file

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

3 files changed, 59 insertions, 2 deletions

diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index acdf6e45049b..f8b3e7472700 100644
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/qupzilla
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.7 2012/07/12 14:20:32 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/ChangeLog,v 1.8 2012/07/12 14:50:02 yngwin Exp $
+
+  12 Jul 2012; Ben de Groot <yngwin@gentoo.org>
+  +files/qupzilla-1.3.0-desktop.patch, qupzilla-1.3.0.ebuild:
+  Add upstream patch to correct desktop file
 
 *qupzilla-1.3.0 (12 Jul 2012)
 
diff --git a/www-client/qupzilla/files/qupzilla-1.3.0-desktop.patch b/www-client/qupzilla/files/qupzilla-1.3.0-desktop.patch
new file mode 100644
index 000000000000..e812049b89cc
--- /dev/null
+++ b/www-client/qupzilla/files/qupzilla-1.3.0-desktop.patch
@@ -0,0 +1,49 @@
+From 8f9d27ec13fa8e7799e803c66db7c1d8685dca13 Mon Sep 17 00:00:00 2001
+From: nowrep <nowrep@gmail.com>
+Date: Thu, 12 Jul 2012 16:27:34 +0200
+Subject: [PATCH] Should fix errors in qupzilla.desktop
+
+---
+ linux/applications/qupzilla.desktop |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/linux/applications/qupzilla.desktop b/linux/applications/qupzilla.desktop
+index 09a94ed..8b069b1 100644
+--- a/linux/applications/qupzilla.desktop
++++ b/linux/applications/qupzilla.desktop
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=QupZilla
+ Name[ka]=ქუპზილა
+ Name[sr]=Капзила
+@@ -61,7 +60,7 @@ MimeType=text/html;application/xhtml+xml;
+ Terminal=false
+ X-Ayatana-Desktop-Shortcuts=NewTab;NewWindow;PrivateBrowsing;
+ 
+-[NewTab Shortcut Group]
++[X-NewTab Shortcut Group]
+ Name=Open new tab
+ Name[cs]=Otevřít nový panel
+ Name[de]=Neuen Tab öffnen
+@@ -89,7 +88,7 @@ Name[ja]=新しいタブを開く
+ Exec=qupzilla --new-tab
+ TargetEnvironment=Unity
+ 
+-[NewWindow Shortcut Group]
++[X-NewWindow Shortcut Group]
+ Name=Open new window
+ Name[cs]=Otevřít nové okno
+ Name[de]=Neues Fenster öffnen
+@@ -117,7 +116,7 @@ Name[ja]=新しいウィンドウを開く
+ Exec=qupzilla --new-window
+ TargetEnvironment=Unity
+ 
+-[PrivateBrowsing Shortcut Group]
++[X-PrivateBrowsing Shortcut Group]
+ Name=Start private browsing
+ Name[cs]=Spustit soukromé prohlížení
+ Name[de]=Privaten Modus starten
+-- 
+1.7.10
+
diff --git a/www-client/qupzilla/qupzilla-1.3.0.ebuild b/www-client/qupzilla/qupzilla-1.3.0.ebuild
index 81252865ac04..16e8ff32766e 100644
--- a/www-client/qupzilla/qupzilla-1.3.0.ebuild
+++ b/www-client/qupzilla/qupzilla-1.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.3.0.ebuild,v 1.1 2012/07/12 14:20:32 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/qupzilla/qupzilla-1.3.0.ebuild,v 1.2 2012/07/12 14:50:02 yngwin Exp $
 
 EAPI=4
 
@@ -31,6 +31,10 @@ S=${WORKDIR}/${MY_P}
 
 DOCS="AUTHORS CHANGELOG FAQ TODO"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch
+}
+
 src_configure() {
 	export QUPZILLA_PREFIX=${EPREFIX}/usr/
 	export USE_LIBPATH=${QUPZILLA_PREFIX}$(get_libdir)