media-gfx/nomacs: version bump

Gentoo-bug: 571534

Package-Manager: portage-2.2.26

5 files changed, 154 insertions, 0 deletions

diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index acc003c7a667..eabafb60fdbd 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,3 +1,4 @@
 DIST nomacs-2.4.2-source.tar.bz2 1443270 SHA256 b0f52b919025a48a0e0300ea15c90b40d6ad892b055088fca02a8137e229bc3a SHA512 e3fae11ae8c385f9548bda32b2364967a457e9645fa4375da9d1cf85dc8fb150a56a19c3eab12ddef90d58f20a57d02a8720ddb8fef22c569ab6c28d54654f02 WHIRLPOOL ac21dd3afe3b45324daa6e07030203611c9f2de4ad1427ce4bb388d84ade5e38a686b42e0d757adbaa3a91fbb658d94f9f47de61e9ccf4ccc339af4ce1c4fd8d
 DIST nomacs-2.4.4-source.tar.bz2 1448716 SHA256 01b0cb48936ca0214c120a126069c50a9b8fe7ecbdb69bb4e5fe283d6b198257 SHA512 76cd5efaba09584757843e895b5b8293adcdab7df68a7d5bdcf38e9e5df04e38382944cf64293c9820815b9e6328793dd8e46afef5ffeaa80ddc4f7d43290fc2 WHIRLPOOL d858887f66cbbed858c1985313107839a8162052bfb825bc48f344516444a1e184e839c9a067283d7503b98a6993126ade3f39c0a85b50ca534f963335c85513
 DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71 WHIRLPOOL 97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940
+DIST nomacs-3.0.0-source.tar.bz2 1465264 SHA256 a0e30cf2795dc18d1af29435145ea37f0cbb8dfb4013e01f5af267039560e476 SHA512 2a536012eed6ba59227aab9374fc22b7c9d49340d335c6c124cdc8f366f279a62edc37407dff47f1444b0d52f9df13e165ee76d44d453badefbffe5effbf8449 WHIRLPOOL 9a75bba86531b87025b8a01d96c9a12a2549d6d462cc0baeb37e06e37e419cb6e81d3be5c2b4894adb001210429f851dea4035aa281104566d1b168c9a81938d
diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch
new file mode 100644
index 000000000000..5f33b6565350
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch
@@ -0,0 +1,32 @@
+From 204dd809ae0d6287385905d44c1a60a38a7c4084 Mon Sep 17 00:00:00 2001
+From: diemmarkus <diemmarkus@gmail.com>
+Date: Thu, 14 Jan 2016 16:35:55 +0100
+Subject: [PATCH] #44 (github) fix proposed by @kensingtion
+
+---
+ ImageLounge/src/DkImageLoader.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ImageLounge/src/DkImageLoader.cpp b/ImageLounge/src/DkImageLoader.cpp
+index 5d66e09..3a00010 100644
+--- a/ImageLounge/src/DkImageLoader.cpp
++++ b/ImageLounge/src/DkImageLoader.cpp
+@@ -512,6 +512,7 @@ QSharedPointer<DkImageContainerT> DkImageLoader::getSkippedImage(int skipIdx, bo
+ 
+ 	}
+ 
++#ifdef WITH_QUAZIP
+ 	if (mCurrentImage && (newFileIdx < 0 || newFileIdx >= mImages.size()) && mCurrentImage->isFromZip() && mCurrentImage->getZipData()) {
+ 
+ 		// load the zip again and go on from there
+@@ -522,6 +523,7 @@ QSharedPointer<DkImageContainerT> DkImageLoader::getSkippedImage(int skipIdx, bo
+ 
+ 		return getSkippedImage(newFileIdx);
+ 	}
++#endif
+ 
+ 	// this should never happen!
+ 	if (mImages.empty()) {
+-- 
+2.4.10
+
diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch
new file mode 100644
index 000000000000..d31f6507b836
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch
@@ -0,0 +1,25 @@
+From 060f4e972fec0308404a7e535b43254b06908a84 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 14 Jan 2016 00:24:05 +1100
+Subject: [PATCH] Fix linking failure with system quazip.
+
+---
+ ImageLounge/cmake/UnixBuildTarget.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ImageLounge/cmake/UnixBuildTarget.cmake b/ImageLounge/cmake/UnixBuildTarget.cmake
+index ce95617..8a59c97 100644
+--- a/ImageLounge/cmake/UnixBuildTarget.cmake
++++ b/ImageLounge/cmake/UnixBuildTarget.cmake
+@@ -93,7 +93,7 @@ else()
+ 		  
+   add_library(${DLL_NAME} SHARED ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_HEADERS} ${NOMACS_RC} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${WEBP_SOURCE}  ${QUAZIP_SOURCES} ${NOMACS_RESOURCES} ${NOMACS_RCC})
+   target_include_directories(${DLL_NAME} PRIVATE  ${OpenCV_INCLUDE_DIRS})
+-  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES})
++  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${QUAZIP_LIBRARIES} ${WEBP_STATIC_LIBRARIES})
+   add_dependencies(${BINARY_NAME} ${DLL_NAME})
+   set_target_properties(${DLL_NAME} PROPERTIES PREFIX "")
+ 
+-- 
+2.4.10
+
diff --git a/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch b/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch
new file mode 100644
index 000000000000..71f564cb9de1
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch
@@ -0,0 +1,28 @@
+From 0ac51051b7e9460a2958917750d7c31072318313 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Thu, 14 Jan 2016 00:55:24 +1100
+Subject: [PATCH] Fix build with tiff disabled.
+
+---
+ ImageLounge/src/DkBasicLoader.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ImageLounge/src/DkBasicLoader.cpp b/ImageLounge/src/DkBasicLoader.cpp
+index 67ef31f..8c2c71e 100644
+--- a/ImageLounge/src/DkBasicLoader.cpp
++++ b/ImageLounge/src/DkBasicLoader.cpp
+@@ -98,9 +98,11 @@
+ #endif
+ 
+ #else
++#ifdef WIN32
+ #include <olectl.h>
+ #pragma comment(lib, "oleaut32.lib")
+ #endif
++#endif
+ 
+ #pragma warning(pop)
+ 
+-- 
+2.4.10
+
diff --git a/media-gfx/nomacs/nomacs-3.0.0.ebuild b/media-gfx/nomacs/nomacs-3.0.0.ebuild
new file mode 100644
index 000000000000..67552f9e5438
--- /dev/null
+++ b/media-gfx/nomacs/nomacs-3.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils fdo-mime
+
+DESCRIPTION="Qt-based image viewer"
+HOMEPAGE="http://www.nomacs.org/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}-source.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="opencv raw tiff webp zip"
+
+REQUIRED_USE="
+	raw? ( opencv )
+	tiff? ( opencv )
+"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	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:=[qt5] )
+	raw? ( >=media-libs/libraw-0.14:= )
+	tiff? ( media-libs/tiff:0 )
+	webp? ( >=media-libs/libwebp-0.3.1:= )
+	zip? ( dev-libs/quazip[qt5] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tiff-build.patch"
+	"${FILESDIR}/${P}-quazip-build.patch"
+	"${FILESDIR}/${P}-quazip-link.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_enable opencv)
+		$(cmake-utils_use_enable raw)
+		$(cmake-utils_use_enable tiff)
+		$(cmake-utils_use_enable webp)
+		$(cmake-utils_use_enable zip QUAZIP)
+		-DUSE_SYSTEM_WEBP=ON
+		-DUSE_SYSTEM_QUAZIP=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}