commit:     904008cf9f669202e0bbc7ddc30c2eaf2c3647ac
Author:     Christian Gerloff <chrgerloff <AT> gmx <DOT> net>
AuthorDate: Wed Jul  5 13:47:07 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 21:23:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904008cf

media-gfx/kuickshow: Restore package

Include a patch to fix a compile error with GCC 6.

Also update ebuild to EAPI 6, mark the package as unstable,
and change download url and maintainer.

Closes: https://github.com/gentoo/gentoo/pull/5012
Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-gfx/kuickshow/Manifest                       |  1 +
 .../files/kuickshow-0.9.1-gcc6-compile-fix.patch   | 15 ++++++++++
 media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild      | 33 ++++++++++++++++++++++
 media-gfx/kuickshow/metadata.xml                   | 12 ++++++++
 4 files changed, 61 insertions(+)

diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
new file mode 100644
index 00000000000..ce449bb6636
--- /dev/null
+++ b/media-gfx/kuickshow/Manifest
@@ -0,0 +1 @@
+DIST kuickshow-0.9.1-kde4.4.0.tar.bz2 915108 SHA256 
fa849380e8c5b628551510f6bf3d6c59e7d68bf437f80d0414ef2b73c826a40e SHA512 
394b95c6b7c3b655a96729559271cd837ff5995aefc7e229f3bc7905f7e64f3fb05d34a67c9a9ba584c1cdbc459b7349d0e134a16afe9e0505b5a494e85ab87e
 WHIRLPOOL 
3b2766833d86acd861d424054e73124287d3c2ceddeff0c9b5165d2aacae9cccb2e9c51d9092bf70bc4f3c979855ae3ee34c1e38e0928dc364b37045c59d773f

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
new file mode 100644
index 00000000000..82bf2eafd27
--- /dev/null
+++ b/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch
@@ -0,0 +1,15 @@
+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)

diff --git a/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild 
b/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild
new file mode 100644
index 00000000000..81ffeba74ae
--- /dev/null
+++ b/media-gfx/kuickshow/kuickshow-0.9.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_LINGUAS="af ar be bg bn br ca ca@valencia cs cy da de el en_GB eo es et eu
+fa fi fr ga gl he hi hne hr hu is it ja km lt lv mai mk ms nb nds ne nl nn oc
+pa pl pt pt_BR ro ru se sk sl sv ta tg th tr uk uz uz@cyrillic vi xh zh_CN
+zh_TW"
+KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
+inherit kde4-base
+
+MY_P=${P}-kde4.4.0
+
+DESCRIPTION="KDE program to view images"
+HOMEPAGE="https://userbase.kde.org/KuickShow";
+SRC_URI="mirror://kde/Attic/4.4.0/src/extragear/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +handbook"
+
+DEPEND="media-libs/imlib"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS BUGS ChangeLog README TODO )
+
+PATCHES=(
+       "${FILESDIR}/${P}-gcc6-compile-fix.patch"
+)
+
+S=${WORKDIR}/${MY_P}

diff --git a/media-gfx/kuickshow/metadata.xml b/media-gfx/kuickshow/metadata.xml
new file mode 100644
index 00000000000..dacb6f1032b
--- /dev/null
+++ b/media-gfx/kuickshow/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+       <maintainer type="person">
+               <email>chrgerl...@gmx.net</email>
+               <name>Christian Gerloff</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>proxy-ma...@gentoo.org</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
+</pkgmetadata>

Reply via email to