Fix desktop file validation of midori.desktop wrt #435864 by Julian Ospald

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 44 insertions, 11 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/Manifest b/www-client/midori/Manifest
index 938161cecd1a..33a5f88bfc19 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA256
 
 AUX midori-0.4.6-dl.patch 2667 SHA256 5c85f994fc577e0bf8c69a1f4bb3bb260c71f80794333c8bac966b163af259c7 SHA512 b7f5bb965fcbf513813138a6dbad4e56f02809baaf03077aa7f01e91b470a6149b76f81f51ef9a0241a9842e074e1abd33674c24a17479a84b3caab37e7ba678 WHIRLPOOL 9f4d1671e704de539f043321596f7a21b90317741484db93769a99793896e2d6796ce10ad48230dbe53bee471328f90318325fa66df46ee6fe984d60de8588b4
+AUX midori-0.4.8-desktop_file_validation.patch 629 SHA256 c000f9f93b430e5d752ea1e05732471bdb5fd26d2a73cb33320b145ee6304498 SHA512 09e83fec2bf021d46dd77f21e5060bb8c84b7ef10b81e51a149d3bf92342a637e3a319a3e474464ab667764adb2c8fc725b446c2c0d6898a5fd018d5a6b746e2 WHIRLPOOL 8a9f1ff5e7bf657014ddb0db8cfd66073875e363f574ad8378c944c73c35e54dcadc713340ae12b85a084f8e7fa3845df5d6bc14371a8b6d6adbcf08687d9a98
 DIST midori-0.4.6.tar.bz2 978570 SHA256 910f47bd2b5f2998cd4fce45c08f9e282318820b68562d0bade2096b9a17e3ea SHA512 8c46f2eed6dd0af237b6aa021f8fc2150bd4387f7de14c9265cf5b8c1a1a558ecf908c98389415100ca0eac9037d7df89c5a348ef9dcd397bb1d3421104a8e7a WHIRLPOOL 36a498e2fd22039816da7072c1a7d59c84548fc187480b33b7a12ddf2ecd41626bb5a80d28298f336148ff74e3ec6fd2dd6da7a19f466ea899849b2d0919c0b2
 DIST midori-0.4.8.tar.bz2 1047789 SHA256 40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f SHA512 ec10fb836f824928cee2df4ca13d65b8436efd8f34af911884fb225b521d1f67dd44bdb5588cd36e0f2db802ed9d1d3c6852563f563b18e20416fcdf3dc3d349 WHIRLPOOL 607c49dd4269a588bd4c33445b3342aa7c785da458aea3abd10deb7c0ffb55a22024e7f1d293e9237b3cd54fc023a0afb70931ed5bdf99df7bd46d67bf889f42
 EBUILD midori-0.4.6-r1.ebuild 2246 SHA256 02f9afa0790834dded6e7153ed1307fc1537497223c3066fa557fb5d4b765699 SHA512 f5a6dfd6e85a76cacdbf4d73957047cf37bb6c19174e14e586874a94abfa91f6973ccd45c128a4ca373f355aec05779e48f0587b22c3a2fc277e2d916636ca76 WHIRLPOOL 283c97500a5862f3f06e1f8b7ae279a5654c63a7d46598a41d1e7767198e8f05e32a0385a4281c9d887b6f14156d3e3fa4aaf48bc4cfbf893a197bc82efc93b8
-EBUILD midori-0.4.8.ebuild 2412 SHA256 c90ea303ae05699566a2f32189e7d035e47d9e29fe62771e834dd921c2f31326 SHA512 771b7e32a2cabc1bed13a98a213ca1c5f4d6aaf116c3c9d60f660bd7b59c87bacf185ad8f467df54a86858308b84be64cacaf260e8cf5950fb98e911e6b3a4e6 WHIRLPOOL 031e2a60cf0036b7425793b5654a79ac5b784615326d7ee3cbd5ea0954e983fca792b89464c14a2942a70dc01f976183ab282b21f2592c02963ac2311b44c180
+EBUILD midori-0.4.8.ebuild 2470 SHA256 2380b1bf3d707f389314d2bb48f4d4ddc8f7a6a3264f2ad9a9f8ccc0cb36a896 SHA512 6ff6d43ec47b149d44df9eeb24292a8a1153b08e08cbf0f418a38df2c72931d0b9eda6a334757af9c716133339a5f0522f52a7b978832c9a1b8bc0403ba8a721 WHIRLPOOL 087935c1c6bf83dbf61d2fcd1afd6651e25519bfed3c369933e374582f18ae4db36b919a32a38f88a8f608dbce9aba66b779f650760679d092fd48c0e0234249
 EBUILD midori-9999.ebuild 2412 SHA256 af653b1ad7a57e4421582642b4a46b278b459f2f1bb179b019f7a67161f248dc SHA512 f1ab9e81c296941b6229bed5aee87950f1c9974f1b1c1397b35f3f683a30ae0e031def8a73934606049e63ec704da8e72a12fcb1e7d326a48753f7310cf31b28 WHIRLPOOL dd380ee8abc059ba8661d28cf9ab47be3a456ba3a69cb88d8fd64a4fcb2bfbe922a3489918f954ceebc80e7aabbb99f4ce9437f965be351ee60b9b8049decc45
-MISC ChangeLog 14986 SHA256 c81908da5de5b09a5057c6d512b4805ebdfffae1fd156be22536f1d7c9fee73a SHA512 ec2e88b028934419a74eb6ba79ed9864f7de1452501fcdbd79f03ae910c10ab0ac9a7c7becd1001baac4e651baf77b863cdec684c91fa342cfac1a34ac863ac1 WHIRLPOOL b527b643ad9037214c448a22ced88ac3381626f204937076ebf6c2d5c1dd6ef35b89e4aa9db02912d10620a7d49382fc88ac3d8987c9454efa7c7cba1c48500f
+MISC ChangeLog 15192 SHA256 d5a7368ad8ece531219668aabc51327b50733ebeed19000f902dd9523dacb100 SHA512 41f4a7ca58c96636138d483a35c9a2b842c1dbe146a1af2e4a2afa63ab4041d1792ccc0a1ad01017abd7a5e98c537c18664ae57db8cc418d10e09adbc29d8859 WHIRLPOOL 1f780c0d1dae6450c87e9b8d9ba0c1879f62ba13173714a7e90e5e5c5c43a14e9de0bf49bdb051392998cb6ec5594a781eb096ce4a31db8f8482903702a0e493
 MISC metadata.xml 468 SHA256 19eecb99ad642e6a8fbd63ed7f3d484eab5d11acb109734121b23e58710b9ba2 SHA512 2d5d7f847a8df75adb35d577658702b96d9838faff55f93e82188b9533f9929c405e1e811eec72ab2df2ab8067f63e8ddfb19da65ac25de42c1e9d56bbe0bc6e WHIRLPOOL a10dc65b031e62c8a20b5b365d3b0769083e1e609eab189cc1403719d66de2da3237dd254d6093091b7a1f7dd826e4f685161318c9bc5fb6ea22b17801b1acb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJREpSZAAoJEEdUh39IaPFNxA8H/2Vh8t0JCrjeOUiWKEISZlUL
-cKqVPY6XlqxNWOkRQ7FSFtMvoAA8U+gNvvurLH5vqiTU7r+mLl/PRcJZVSZvwkoC
-dOgaFOpr5XsnOOshH+wu25Z3px9l8HnmAGBbNLlFpeZG5ur/E1hd0Uz9UaYfnkdt
-/Jm/EBF0d6sDaENpNiFA2VjshO3U+qKufC9vRftnkQXz9KQPJTIJgGKYk3HPoERG
-OuQv+v1HPMfcuvrQjDurKxxHguh6Ck5hw7lTDfj1QQEP1OKhRDWmA25/+DwPRrNy
-QGI4Ojt0gN4TSbHf71Uxis0ZfkMZVNwVGoQHBAWhzaA7Knpekaw3UtuNT2pCfGw=
-=7EMt
+iQEcBAEBCAAGBQJREpgYAAoJEEdUh39IaPFNBf0IAJB6wnAjBGYuky/vXkymxCBQ
+NT6ByQvjn6eU+Oq5JK0YDPXcOB2LRREFusnUwqQOzwWUHuuoXB1VEVvbHXYKgS0h
+JCsDuhwgAtLI9swqxpIJwfIUE+W7KiK0YVgFm3fyiO+zQtI6rYjWuXM/n3UM/Nhf
+kRpoRSKI8hypp4hGn3wvR8A1jc/NwhbgMCcEdoh3Wd1lRMUzD0wXlvP2nXAnQDnN
++UVZEiE1F/vzfwZHmP8KpjQl3Zq8Te4Y9NVtL8V6qu8T3tfQZXQR85Ow93zOb+QA
+YVqw1BfLD+AkPyE3Q2Q5G730fMPKKHW5LF95TwcRiDCPOAn9bUnP4gDJtldSfd8=
+=bS20
 -----END PGP SIGNATURE-----
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() {