| 1 |
carlo 08/06/21 10:33:42 |
| 2 |
|
| 3 |
Added: kdiff3-0.9.92-desktop-entry-fix.diff |
| 4 |
Log: |
| 5 |
Fix desktop entry properly, get rid of arts use flag. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-misc/kdiff3/files/kdiff3-0.9.92-desktop-entry-fix.diff?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: kdiff3-0.9.92-desktop-entry-fix.diff |
| 15 |
=================================================================== |
| 16 |
--- kdiff3plugin/kdiff3plugin.desktop 2006-11-14 23:06:16.000000000 +0100 |
| 17 |
+++ /dev/null 2008-06-15 10:46:49.536002197 +0200 |
| 18 |
@@ -1,7 +0,0 @@ |
| 19 |
-[Desktop Entry] |
| 20 |
-Encoding=UTF-8 |
| 21 |
-Type=Service |
| 22 |
-Name=Compare/Merge Files/Directories with KDiff3 |
| 23 |
-Icon=kdiff3 |
| 24 |
-X-KDE-ParentApp=konqueror |
| 25 |
-#DocPath=konq-plugins/kdiff3plugin/index.html |
| 26 |
\ No newline at end of file |
| 27 |
--- kdiff3plugin/Makefile.am.orig 2008-06-07 03:46:09.000000000 +0200 |
| 28 |
+++ kdiff3plugin/Makefile.am 2008-06-16 00:14:10.000000000 +0200 |
| 29 |
@@ -13,8 +13,5 @@ |
| 30 |
pluginsdir = $(kde_servicesdir) |
| 31 |
plugins_DATA = kdiff3_plugin.desktop |
| 32 |
|
| 33 |
-appsdir = $(kde_appsdir)/.hidden |
| 34 |
-apps_DATA = kdiff3plugin.desktop |
| 35 |
- |
| 36 |
messages: rc.cpp |
| 37 |
$(XGETTEXT) *.cpp *.h -o $(podir)/kdiff3_plugin.pot |
| 38 |
--- src/Makefile.am.orig 2008-06-16 01:28:37.000000000 +0200 |
| 39 |
+++ src/Makefile.am 2008-06-16 01:30:58.000000000 +0200 |
| 40 |
@@ -29,9 +29,9 @@ |
| 41 |
kdiff3_LDADD = $(LIB_KPARTS) |
| 42 |
|
| 43 |
# this is where the desktop file will go |
| 44 |
-shelldesktopdir = $(kde_appsdir)/Development |
| 45 |
+shelldesktopdir = $(xdg_appsdir) |
| 46 |
shelldesktop_DATA = kdiff3.desktop |
| 47 |
|
| 48 |
# this is where the shell's XML-GUI resource file goes |
| 49 |
shellrcdir = $(kde_datadir)/kdiff3 |
| 50 |
shellrc_DATA = kdiff3_shell.rc |
| 51 |
--- src/kdiff3.desktop.orig 2008-06-16 01:35:21.000000000 +0200 |
| 52 |
+++ src/kdiff3.desktop 2008-06-16 01:36:24.000000000 +0200 |
| 53 |
@@ -1,6 +1,4 @@ |
| 54 |
- |
| 55 |
[Desktop Entry] |
| 56 |
-Encoding=UTF-8 |
| 57 |
Name=KDiff3 |
| 58 |
Name[hi]=के-डिफ3 |
| 59 |
Name[sv]=Kdiff3 |
| 60 |
@@ -46,10 +44,11 @@ |
| 61 |
GenericName[xx]=xxDiff/Patch Frontendxx |
| 62 |
GenericName[zh_CN]=Diff/Patch 前端 |
| 63 |
GenericName[zu]=Diff/PatchIsiqalo sokugcina |
| 64 |
-Exec=kdiff3 %i %m -caption "%c" |
| 65 |
+Categories=Qt;KDE;Development; |
| 66 |
+Exec=kdiff3 %i -caption "%c" |
| 67 |
Icon=kdiff3 |
| 68 |
Type=Application |
| 69 |
-DocPath=kdiff3/index.html |
| 70 |
+X-DocPath=kdiff3/index.html |
| 71 |
Comment=A File And Directory Comparison And Merge Tool |
| 72 |
Comment[ar]=أداة مقارنة و دمج ملفات و دلائل (مجلًدات ) |
| 73 |
Comment[bg]=Инструмент за сравняване и сливане на файлове и директории |
| 74 |
--- src/kdiff3part.desktop.orig 2008-06-16 02:52:00.000000000 +0200 |
| 75 |
+++ src/kdiff3part.desktop 2008-06-16 02:53:07.000000000 +0200 |
| 76 |
@@ -1,5 +1,4 @@ |
| 77 |
[Desktop Entry] |
| 78 |
-Encoding=UTF-8 |
| 79 |
Name=KDiff3Part |
| 80 |
Name[cs]=Komponenta KDiff3 |
| 81 |
Name[fr]=Composant KDiff3 |
| 82 |
@@ -16,3 +15,4 @@ |
| 83 |
ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart |
| 84 |
X-KDE-Library=libkdiff3part |
| 85 |
Type=Service |
| 86 |
+Icon=kdiff3 |
| 87 |
|
| 88 |
|
| 89 |
|
| 90 |
-- |
| 91 |
gentoo-commits@l.g.o mailing list |
Archives