From 39d1cb43786bec546ad742400e68ad3a0bac6ec5 Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Sun, 2 Apr 2017 18:12:13 +0200
Subject: [PATCH] nomacs: update to 3.6.1

---
 srcpkgs/nomacs/patches/gcc6.patch | 22 ----------------------
 srcpkgs/nomacs/template           | 24 +++++++++++++++++-------
 2 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/nomacs/patches/gcc6.patch

diff --git a/srcpkgs/nomacs/patches/gcc6.patch b/srcpkgs/nomacs/patches/gcc6.patch
deleted file mode 100644
index 61cb60badc6..00000000000
--- a/srcpkgs/nomacs/patches/gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/DkGui/DkPong.cpp.orig	2016-04-28 11:31:15.000000000 +0000
-+++ src/DkGui/DkPong.cpp	2016-12-30 18:51:24.147034114 +0000
-@@ -655,7 +655,7 @@
- 	double angle = mDirection.angle();
- 	double range = CV_PI / 5.0;
- 	double sign = angle > 0 ? 1.0 : -1.0;
--	angle = abs(angle);
-+	angle = std::abs(angle);
- 	double newAngle = 0.0;
- 
- 	if (angle < CV_PI*0.5 && angle > CV_PI*0.5 - range) {
---- src/DkGui/DkViewPort.cpp.orig	2016-04-28 11:31:15.000000000 +0000
-+++ src/DkGui/DkViewPort.cpp	2016-12-30 18:54:36.602044043 +0000
-@@ -1251,7 +1251,7 @@
- 	mAnimationValue = 1.0f-(float)(mAnimationTime.elapsed()/1000.0)/Settings::param().display().animationDuration;
- 	
- 	// slow in - slow out
--	double speed = mAnimationValue > 0.5 ? abs(1.0 - mAnimationValue) : abs(mAnimationValue);
-+	double speed = mAnimationValue > 0.5 ? std::abs(1.0 - mAnimationValue) : std::abs(mAnimationValue);
- 	speed *= .05;
- 
- 	mAnimationValue += (float)speed;
diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template
index 384e3d829ee..3e408750c33 100644
--- a/srcpkgs/nomacs/template
+++ b/srcpkgs/nomacs/template
@@ -1,15 +1,25 @@
 # Template file for 'nomacs'
 pkgname=nomacs
-version=3.2.0
-revision=4
+version=3.6.1
+revision=1
 build_style=cmake
+build_wrksrc="ImageLounge"
+configure_args="-DUSE_SYSTEM_QUAZIP=1"
 hostmakedepends="pkg-config"
-# XXX: use vendored quazip for now
-makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel libraw-devel"
+makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel libraw-devel quazip-qt5-devel"
 short_desc="Simple yet powerful Qt imageviewer"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-replaces="nomacs-qt5>=0"
 license="GPL-3"
 homepage="http://nomacs.org/"
-distfiles="https://github.com/nomacs/nomacs/releases/download/${version}/nomacs-${version}-source.tar.bz2"
-checksum=82462f36659b0b09ef4169d927d0861244ecf83790ba03185a244440278c49ad
+distfiles="https://github.com/nomacs/nomacs/archive/${version}.tar.gz"
+checksum=09b289cac51a5fdccc02aa4a60405bbbd4b5bfdb6b2a52ca5b0cb3b0f7a87068
+
+pre_configure() {
+	# fix build with quazip-qt5
+	sed -i 's/find_package(QuaZIP/find_package(QuaZip5/' cmake/Unix.cmake
+	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
+}