Adding a patch to fix .desktop file, bug 186942

Package-Manager: portage-2.1.3.6

4 files changed, 46 insertions, 14 deletions

diff --git a/kde-misc/kdiff3/ChangeLog b/kde-misc/kdiff3/ChangeLog
index 490e105ce5fe..d78b29324198 100644
--- a/kde-misc/kdiff3/ChangeLog
+++ b/kde-misc/kdiff3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kdiff3
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.28 2007/05/22 14:27:54 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/ChangeLog,v 1.29 2007/08/20 18:42:25 keytoaster Exp $
+
+  20 Aug 2007; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/kdiff3-0.9.92-fix-desktop-file.patch, kdiff3-0.9.92.ebuild:
+  Adding a patch to fix .desktop file, bug 186942
 
   22 May 2007; Wulf C. Krueger <philantrop@gentoo.org> kdiff3-0.9.92.ebuild:
   Added LINGUAS support, fixes bug 134605.
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index c7b6f13cb9a3..d7caade102df 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kdiff3-0.9.92-fix-desktop-file.patch 712 RMD160 252e91681ceb34bde100042ce979a1529f928b47 SHA1 ff014b5514150c0db2b682db48734857c9fca584 SHA256 7d8753f3e9a230861132dd13689ec6919aaee185fa1d0b1e74f7a7763e838e9c
+MD5 59f8facf055924938e157cefad7c91fe files/kdiff3-0.9.92-fix-desktop-file.patch 712
+RMD160 252e91681ceb34bde100042ce979a1529f928b47 files/kdiff3-0.9.92-fix-desktop-file.patch 712
+SHA256 7d8753f3e9a230861132dd13689ec6919aaee185fa1d0b1e74f7a7763e838e9c files/kdiff3-0.9.92-fix-desktop-file.patch 712
 DIST kdiff3-0.9.92.tar.gz 2220173 RMD160 3757fe678e944755164cdc62bfca9f0214acdbb8 SHA1 c97b98150a1f5de16736a399affe1b4243d1e6c2 SHA256 ec9cc646f6411497cfd5d76ae081b12ff2b11265967ad936d304bd6c452864e4
-EBUILD kdiff3-0.9.92.ebuild 1924 RMD160 039eca658b4ebbeecaef359f082b2a0e8a996b3c SHA1 0b39be24b0af591a0bf1db9119c28ea74ff74c84 SHA256 cf298eacc8465440d6be9e72c2c380e3751ed3edd885bc7bd44359f894eeba50
-MD5 5ffbf6d09ba617ea43f60273bf46a392 kdiff3-0.9.92.ebuild 1924
-RMD160 039eca658b4ebbeecaef359f082b2a0e8a996b3c kdiff3-0.9.92.ebuild 1924
-SHA256 cf298eacc8465440d6be9e72c2c380e3751ed3edd885bc7bd44359f894eeba50 kdiff3-0.9.92.ebuild 1924
-MISC ChangeLog 5363 RMD160 d3e320b2c67d70d8af5fb89b54e8e12340bb3e54 SHA1 7bb0739e2238036976ddf0a6e7a2cb74e329070a SHA256 f68d898ef21eb15039f9caeec4f2e62243c4d2a43c0e1e73e3d2203f6768d474
-MD5 4adc099a44f05e2cb04f70b978fe0ef9 ChangeLog 5363
-RMD160 d3e320b2c67d70d8af5fb89b54e8e12340bb3e54 ChangeLog 5363
-SHA256 f68d898ef21eb15039f9caeec4f2e62243c4d2a43c0e1e73e3d2203f6768d474 ChangeLog 5363
+EBUILD kdiff3-0.9.92.ebuild 1993 RMD160 e9977a995cb325b18f19544117932d9c934161d7 SHA1 bf00bb31d67eea693687c287e1809d88144f23e8 SHA256 a4b4eb36d1b77cda088e64f9bd9f13dff80209223b23ec89f15f9ae931ba939c
+MD5 d1552167e91aa7ff02483e424883a9df kdiff3-0.9.92.ebuild 1993
+RMD160 e9977a995cb325b18f19544117932d9c934161d7 kdiff3-0.9.92.ebuild 1993
+SHA256 a4b4eb36d1b77cda088e64f9bd9f13dff80209223b23ec89f15f9ae931ba939c kdiff3-0.9.92.ebuild 1993
+MISC ChangeLog 5538 RMD160 00e15b05d47554be5b84f360726f2b884b0d4375 SHA1 01c6369b007a4b89f6defe77c04d86781997c4ad SHA256 609bd8901e8f11d335944998afac702f778948e2f0034776c871a1238f60f745
+MD5 651de22646650409571a238c9db452c3 ChangeLog 5538
+RMD160 00e15b05d47554be5b84f360726f2b884b0d4375 ChangeLog 5538
+SHA256 609bd8901e8f11d335944998afac702f778948e2f0034776c871a1238f60f745 ChangeLog 5538
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -18,9 +22,9 @@ MD5 a70cddbce1da0ea2aa919fc5c92c1a5a files/digest-kdiff3-0.9.92 244
 RMD160 d6992c504e971b1f6aad8f9277a390617055b94e files/digest-kdiff3-0.9.92 244
 SHA256 f1b0eafd901c24de2f85d244f2548f3df9df7609800f589106454962f7d560ed files/digest-kdiff3-0.9.92 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGUv3wCkvF58q80IkRAibsAJ9ZnPTv0JExx7P0Zhqjhyee6sCunACfRpLt
-iMzl+uUBfnME42S1ZPR9HC4=
-=h64h
+iD8DBQFGyeCIl1Qf6C0PV04RAj/mAKCBe89+ah1REXO4gZ3sJzsMcyv8wQCgpI9S
+pQJQCgWf7swX1cflpntaCHI=
+=Qgf3
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch b/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch
new file mode 100644
index 000000000000..77ad46e2cc45
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch
@@ -0,0 +1,21 @@
+--- kdiff3-0.9.92.orig/src/kdiff3.desktop	2006-11-04 12:44:14.000000000 +0100
++++ kdiff3-0.9.92/src/kdiff3.desktop	2007-08-20 20:13:35.000000000 +0200
+@@ -1,6 +1,5 @@
+ 
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=KDiff3
+ Name[hi]=के-डिफ3
+ Name[sv]=Kdiff3
+@@ -46,9 +45,10 @@
+ GenericName[xx]=xxDiff/Patch Frontendxx
+ GenericName[zh_CN]=Diff/Patch 前端
+ GenericName[zu]=Diff/PatchIsiqalo sokugcina
+-Exec=kdiff3 %i %m -caption "%c"
++Exec=kdiff3 %i -caption "%c" --miniicon
+ Icon=kdiff3
+ Type=Application
++Categories=Qt;KDE;Development;
+ DocPath=kdiff3/index.html
+ Comment=A File And Directory Comparison And Merge Tool
+ Comment[ar]=أداة مقارنة  و دمج ملفات و دلائل (مجلًدات )
diff --git a/kde-misc/kdiff3/kdiff3-0.9.92.ebuild b/kde-misc/kdiff3/kdiff3-0.9.92.ebuild
index 0efcfb41abb7..6dbaa92d0b1a 100644
--- a/kde-misc/kdiff3/kdiff3-0.9.92.ebuild
+++ b/kde-misc/kdiff3/kdiff3-0.9.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.92.ebuild,v 1.8 2007/05/22 14:27:54 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdiff3/kdiff3-0.9.92.ebuild,v 1.9 2007/08/20 18:42:25 keytoaster Exp $
 
 inherit kde
 
@@ -60,4 +60,7 @@ src_unpack() {
 			rm -f "${KDE_S}/configure"
 		fi
 	fi
+
+	# Fixes bug 186942
+	epatch ${FILESDIR}/${P}-fix-desktop-file.patch
 }