From 1c670dcff7734dbb86f8dbfeb9495a1cbfeefd0a Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Fri, 15 Jan 2016 03:04:03 +1100
Subject: media-gfx/nomacs: version bump

Gentoo-bug: 571534

Package-Manager: portage-2.2.26
---
 .../nomacs/files/nomacs-3.0.0-quazip-build.patch   | 32 ++++++++++++++++++++++
 .../nomacs/files/nomacs-3.0.0-quazip-link.patch    | 25 +++++++++++++++++
 .../nomacs/files/nomacs-3.0.0-tiff-build.patch     | 28 +++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 media-gfx/nomacs/files/nomacs-3.0.0-quazip-build.patch
 create mode 100644 media-gfx/nomacs/files/nomacs-3.0.0-quazip-link.patch
 create mode 100644 media-gfx/nomacs/files/nomacs-3.0.0-tiff-build.patch

(limited to 'media-gfx/nomacs/files')

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
+
-- 
cgit v1.2.3-65-gdbad