gentoo resync : 16.01.2018

2 files changed, 11 insertions, 15 deletions

diff --git a/media-gfx/kuickshow/files/kuickshow-0.10.0-desktop-fix.patch b/media-gfx/kuickshow/files/kuickshow-0.10.0-desktop-fix.patch
new file mode 100644
index 000000000000..3b914e6e36a3
--- /dev/null
+++ b/media-gfx/kuickshow/files/kuickshow-0.10.0-desktop-fix.patch
@@ -0,0 +1,11 @@
+--- a/src/kuickshow.desktop	2018-01-11 23:33:22.000000000 +0100
++++ b/src/kuickshow.desktop	2018-01-13 18:26:36.622067345 +0100
+@@ -54,7 +54,7 @@
+ Name[x-test]=xxKuickshowxx
+ Name[zh_CN]=Kuickshow
+ Name[zh_TW]=Kuickshow
+-Exec=kuickshow -caption %c %U
++Exec=kuickshow -qwindowtitle %c %U
+ Icon=kuickshow
+ Type=Application
+ # TODO: What is image/x-eim? Register it to freedesktop.org if you need it
diff --git a/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch b/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch
deleted file mode 100644
index 82bf2eafd270..000000000000
--- a/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixed wrong type of 2nd parameter which wouldn't compile with GCC 6.
-
-https://bugs.gentoo.org/614304
-
---- a/src/kuickshow.cpp
-+++ b/src/kuickshow.cpp
-@@ -661,7 +661,7 @@ void KuickShow::performDeleteCurrentImage(QWidget *parent)
-     }
- 
-     tryShowNextImage();
--    fileWidget->del(list, false, false);
-+    fileWidget->del(list, 0L, false);
- }
- 
- void KuickShow::performTrashCurrentImage(QWidget *parent)