[gentoo-commits] repo/gentoo:master commit in: media-gfx/nomacs/files/, media-gfx/nomacs/

[Michael Palimaka]

commit:     d380638becc3a9476fa45c5489a03a10bfa38be6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 13:39:46 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 13:40:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d380638b

media-gfx/nomacs: backport patch from upstream fixing batch resize issue

Gentoo-bug: 629330
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../nomacs/files/nomacs-3.6.1-batch-resize.patch   | 23 +++++++
 media-gfx/nomacs/nomacs-3.6.1-r1.ebuild            | 75 ++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch b/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch
new file mode 100644
index 00000000000..b2dd078d0e9
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.6.1-batch-resize.patch
@@ -0,0 +1,23 @@
+From 11cbd66ca66ea9d97d72546a92fe2b487e62481b Mon Sep 17 00:00:00 2001
+From: diemmarkus <diemmarkus@×××××.com>
+Date: Wed, 17 May 2017 10:08:05 +0200
+Subject: [PATCH] fixes #118 batch resizing - used to only work if rotate was
+ active
+
+---
+ ImageLounge/src/DkCore/DkProcess.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/ImageLounge/src/DkCore/DkProcess.cpp b/ImageLounge/src/DkCore/DkProcess.cpp
+index a47b4194..d0dfd97f 100644
+--- a/src/DkCore/DkProcess.cpp
++++ b/src/DkCore/DkProcess.cpp
+@@ -255,8 +255,6 @@ bool DkBatchTransform::compute(QSharedPointer<DkImageContainer> container, QStri
+ 		rotationMatrix.rotate((double)mAngle);
+ 		tmpImg = tmpImg.transformed(rotationMatrix);
+ 	}
+-	else
+-		tmpImg = img;
+ 
+ 	// logs
+ 	if (!tmpImg.isNull()) {

diff --git a/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
new file mode 100644
index 00000000000..719d2960818
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.6.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="https://nomacs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="+jpeg opencv raw tiff zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[jpeg?]
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=media-gfx/exiv2-0.25:=
+	opencv? ( media-libs/opencv:=[-qt4(-)] )
+	raw? ( >=media-libs/libraw-0.14:= )
+	tiff? ( media-libs/tiff:0 )
+	zip? ( >=dev-libs/quazip-0.7.2[qt5] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/ImageLounge"
+
+PATCHES=( "${FILESDIR}/${P}-batch-resize.patch" )
+
+src_prepare() {
+	default
+
+	# fix build with quazip-0.7.2 - bug 598354
+	sed -i -e "s/find_package(QuaZIP/find_package(QuaZip5/" cmake/Unix.cmake || die
+	sed -e "s/include <quazip/&5/" \
+		-i src/DkCore/DkImageLoader.cpp \
+		-i src/DkCore/DkImageContainer.cpp \
+		-i src/DkCore/DkBasicLoader.cpp \
+		-i src/DkGui/DkDialog.cpp || die
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_RAW=$(usex raw)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_QUAZIP=$(usex zip)
+		-DUSE_SYSTEM_QUAZIP=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}