summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-02-06 17:52:02 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-02-06 17:52:02 +0000
commitd291b87c8ae3353aafc6e53280a1df584fe78b33 (patch)
treedbc1ecc9f06d7d9d6682259ff63af393571d6a5e /www-client/midori
parentold (diff)
downloadgentoo-2-d291b87c8ae3353aafc6e53280a1df584fe78b33.tar.gz
gentoo-2-d291b87c8ae3353aafc6e53280a1df584fe78b33.tar.bz2
gentoo-2-d291b87c8ae3353aafc6e53280a1df584fe78b33.zip
Fix desktop file validation of midori.desktop wrt #435864 by Julian Ospald
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'www-client/midori')
-rw-r--r--www-client/midori/ChangeLog6
-rw-r--r--www-client/midori/files/midori-0.4.8-desktop_file_validation.patch26
-rw-r--r--www-client/midori/midori-0.4.8.ebuild4
3 files changed, 34 insertions, 2 deletions
diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index bec680780b10..baaa4f6375e0 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-client/midori
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.102 2013/02/06 17:37:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.103 2013/02/06 17:52:02 ssuominen Exp $
+
+ 06 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> midori-0.4.8.ebuild,
+ +files/midori-0.4.8-desktop_file_validation.patch:
+ Fix desktop file validation of midori.desktop wrt #435864 by Julian Ospald
06 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> -midori-0.4.7.ebuild:
old
diff --git a/www-client/midori/files/midori-0.4.8-desktop_file_validation.patch b/www-client/midori/files/midori-0.4.8-desktop_file_validation.patch
new file mode 100644
index 000000000000..c7cc50e12227
--- /dev/null
+++ b/www-client/midori/files/midori-0.4.8-desktop_file_validation.patch
@@ -0,0 +1,26 @@
+http://bugs.gentoo.org/show_bug.cgi?id=435864
+http://bugs.launchpad.net/midori/+bug/1117543
+
+--- data/midori.desktop.in
++++ data/midori.desktop.in
+@@ -17,17 +17,17 @@
+ X-Osso-Service=midori
+ X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private
+
+-[TabNew Shortcut Group]
++[X-TabNew Shortcut Group]
+ _Name=New Tab
+ Exec=midori -e TabNew
+ TargetEnvironment=Unity
+
+-[WindowNew Shortcut Group]
++[X-WindowNew Shortcut Group]
+ _Name=New Window
+ Exec=midori -e WindowNew
+ TargetEnvironment=Unity
+
+-[Private Shortcut Group]
++[X-Private Shortcut Group]
+ _Name=New Private Browsing Window
+ Exec=midori --private
+ TargetEnvironment=Unity
diff --git a/www-client/midori/midori-0.4.8.ebuild b/www-client/midori/midori-0.4.8.ebuild
index 4df8439b6c61..b1706e0eb186 100644
--- a/www-client/midori/midori-0.4.8.ebuild
+++ b/www-client/midori/midori-0.4.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.8.ebuild,v 1.1 2013/02/06 12:56:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.8.ebuild,v 1.2 2013/02/06 17:52:02 ssuominen Exp $
EAPI=5
@@ -72,6 +72,8 @@ src_unpack() {
src_prepare() {
# Force disabled because we don't have this custom renamed in Portage
sed -i -e 's:gcr-3-gtk2:&dIsAbLe:' wscript || die
+
+ epatch "${FILESDIR}"/${P}-desktop_file_validation.patch
}
src_configure() {