summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Heinlein <keytoaster@gentoo.org>2007-08-20 18:42:25 +0000
committerTobias Heinlein <keytoaster@gentoo.org>2007-08-20 18:42:25 +0000
commit95fccf60e5ffe196f066fb32a979707a7a45d951 (patch)
treea55564548e8b76d24905bc456b3c3b3c09d9d9b8 /kde-misc
parentFix crosscompiling; bug #185684 (diff)
downloadgentoo-2-95fccf60e5ffe196f066fb32a979707a7a45d951.tar.gz
gentoo-2-95fccf60e5ffe196f066fb32a979707a7a45d951.tar.bz2
gentoo-2-95fccf60e5ffe196f066fb32a979707a7a45d951.zip
Adding a patch to fix .desktop file, bug 186942
(Portage version: 2.1.3.6)
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/kdiff3/ChangeLog6
-rw-r--r--kde-misc/kdiff3/files/kdiff3-0.9.92-fix-desktop-file.patch21
-rw-r--r--kde-misc/kdiff3/kdiff3-0.9.92.ebuild5
3 files changed, 30 insertions, 2 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/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
}