diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-02-15 21:51:18 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-02-15 21:51:18 +0000 |
commit | 2d5a9da93e2846c67dac84784224645900af36d3 (patch) | |
tree | 9278b282a98eb2289c2f5d6613988049da905305 /app-arch/p7zip/files | |
parent | Version Bump per 300838 (diff) | |
download | gentoo-2-2d5a9da93e2846c67dac84784224645900af36d3.tar.gz gentoo-2-2d5a9da93e2846c67dac84784224645900af36d3.tar.bz2 gentoo-2-2d5a9da93e2846c67dac84784224645900af36d3.zip |
Fix for the kde4 patches, thanks ssuominen for spying on my commits
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'app-arch/p7zip/files')
-rw-r--r-- | app-arch/p7zip/files/4.65-kde4.patch | 14 | ||||
-rw-r--r-- | app-arch/p7zip/files/9.04-kde4.patch | 44 |
2 files changed, 44 insertions, 14 deletions
diff --git a/app-arch/p7zip/files/4.65-kde4.patch b/app-arch/p7zip/files/4.65-kde4.patch index fae64e446b7b..dad8cfaf1ef4 100644 --- a/app-arch/p7zip/files/4.65-kde4.patch +++ b/app-arch/p7zip/files/4.65-kde4.patch @@ -1,12 +1,11 @@ diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop -index 9010fbd..53f25ec 100644 +index 9010fbd..eec41dd 100644 --- a/GUI/kde/p7zip_compress.desktop +++ b/GUI/kde/p7zip_compress.desktop -@@ -1,6 +1,9 @@ +@@ -1,6 +1,8 @@ [Desktop Entry] -ServiceTypes=inode/directory -Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark -+Encoding=UTF-8 +Type=Service +ServiceTypes=KonqPopupMenu/Plugin +MimeType=all/all; @@ -14,7 +13,7 @@ index 9010fbd..53f25ec 100644 X-KDE-Priority=TopLevel X-KDE-Submenu=7-Zip X-KDE-Icon=p7zip -@@ -20,26 +23,6 @@ Name=Add to Zip Archive +@@ -20,26 +22,6 @@ Name=Add to Zip Archive Icon=p7zip Exec=p7zipForFilemanager a -tzip %U @@ -42,13 +41,13 @@ index 9010fbd..53f25ec 100644 Name=Benchmark Icon=p7zip diff --git a/GUI/kde/p7zip_extract.desktop b/GUI/kde/p7zip_extract.desktop -index 9038c76..4eda887 100644 +index 9038c76..217788c 100644 --- a/GUI/kde/p7zip_extract.desktop +++ b/GUI/kde/p7zip_extract.desktop -@@ -1,10 +1,30 @@ +@@ -1,10 +1,29 @@ [Desktop Entry] -X-SuSE-translate=true - Encoding=UTF-8 +-Encoding=UTF-8 -ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak -Actions=extractHere +Type=Service @@ -80,4 +79,3 @@ index 9038c76..4eda887 100644 +Name=Test Archive +Exec=p7zipForFilemanager t %U +Icon=p7zip -\ No newline at end of file diff --git a/app-arch/p7zip/files/9.04-kde4.patch b/app-arch/p7zip/files/9.04-kde4.patch index 2e074c287b14..c309d70d8bbe 100644 --- a/app-arch/p7zip/files/9.04-kde4.patch +++ b/app-arch/p7zip/files/9.04-kde4.patch @@ -1,12 +1,11 @@ diff --git a/GUI/kde/p7zip_compress.desktop b/GUI/kde/p7zip_compress.desktop -index 9010fbd..99e76b9 100644 +index 9010fbd..b965fa6 100644 --- a/GUI/kde/p7zip_compress.desktop +++ b/GUI/kde/p7zip_compress.desktop -@@ -1,6 +1,9 @@ +@@ -1,6 +1,8 @@ [Desktop Entry] -ServiceTypes=inode/directory -Actions=CompressDialog;Compress7z;CompressZip;extractHere;ExtractSubdir;ExtractTo;test;Benchmark -+Encoding=UTF-8 +Type=Service +ServiceTypes=KonqPopupMenu/Plugin +MimeType=all/all; @@ -15,13 +14,13 @@ index 9010fbd..99e76b9 100644 X-KDE-Submenu=7-Zip X-KDE-Icon=p7zip diff --git a/GUI/kde/p7zip_extract.desktop b/GUI/kde/p7zip_extract.desktop -index 9038c76..499d83a 100644 +index 9038c76..a7dca4d 100644 --- a/GUI/kde/p7zip_extract.desktop +++ b/GUI/kde/p7zip_extract.desktop -@@ -1,10 +1,31 @@ +@@ -1,10 +1,30 @@ [Desktop Entry] X-SuSE-translate=true - Encoding=UTF-8 +-Encoding=UTF-8 -ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak -Actions=extractHere +Type=Service @@ -53,3 +52,36 @@ index 9038c76..499d83a 100644 +Name=Test Archive +Exec=p7zipForFilemanager t %U +Icon=p7zip +diff --git a/GUI/kde/p7zip_extract_subdir.desktop b/GUI/kde/p7zip_extract_subdir.desktop +index 1800fa0..a711f3c 100644 +--- a/GUI/kde/p7zip_extract_subdir.desktop ++++ b/GUI/kde/p7zip_extract_subdir.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + X-SuSE-translate=true +-Encoding=UTF-8 + ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak + Actions=ExtractSubdir + +diff --git a/GUI/kde/p7zip_extract_to.desktop b/GUI/kde/p7zip_extract_to.desktop +index bf13ec0..18d2b74 100644 +--- a/GUI/kde/p7zip_extract_to.desktop ++++ b/GUI/kde/p7zip_extract_to.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + X-SuSE-translate=true +-Encoding=UTF-8 + ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak + Actions=ExtractTo + +diff --git a/GUI/kde/p7zip_test.desktop b/GUI/kde/p7zip_test.desktop +index 2c17acb..5212bb2 100644 +--- a/GUI/kde/p7zip_test.desktop ++++ b/GUI/kde/p7zip_test.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + X-SuSE-translate=true +-Encoding=UTF-8 + ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak + Actions=test + |