<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f06de7034a6fb67865915d4058e76d5033b802a4">https://github.com/macports/macports-ports/commit/f06de7034a6fb67865915d4058e76d5033b802a4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f06de7034a6fb67865915d4058e76d5033b802a4
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jun 16 16:43:21 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> luminance-hdr: update version 2.5.1->2.6.0
</span>---
aqua/luminance-hdr/Portfile | 53 ++++-------
aqua/luminance-hdr/files/patch-CMakeLists.txt.diff | 11 ---
.../files/patch-PackagingApple.cmake_01.diff | 13 ---
.../files/patch-PackagingApple.cmake_02.diff | 10 --
aqua/luminance-hdr/files/patch-Version.cmake.diff | 2 +-
.../files/patch-cmake_build_type.diff | 19 ++++
.../files/patch-compiler_settings.diff | 33 +++++++
aqua/luminance-hdr/files/patch-exiv2_error.diff | 20 ----
aqua/luminance-hdr/files/patch-no_copy.diff | 105 +++++++++++++++++++++
aqua/luminance-hdr/files/patch-openmp.diff | 12 +++
...rc-TransplantExif-TransplantExifDialog.cpp.diff | 10 --
11 files changed, 190 insertions(+), 98 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/Portfile b/aqua/luminance-hdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 79dfbc7..e9ccfd0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/luminance-hdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/luminance-hdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,10 +3,11 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
name luminance-hdr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories aqua graphics
license GPL-2+
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +23,6 @@ use_bzip2 yes
</span> depends_lib-append port:exiv2 \
port:openexr \
port:ilmbase \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3 \
</span> port:fftw-3-single \
port:tiff \
port:libraw \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,22 +38,11 @@ qt5.depends_component \
</span> qtwebengine \
qttools
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ab0546bf779f801ea88283d47943bf00299ff4c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a8986e0afba434a2e9da7e8aed19cdb763fedc8de2655bdb496c4ee9d3f41696 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10238826
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append port:hugin-app
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow Portfile to set install location
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# do not attempt to copy any Qt component into application directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-PackagingApple.cmake_01.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix for exiv2 0.27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src-TransplantExif-TransplantExifDialog.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# at some point, exiv2 restructured header files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# avoid "no type named 'AnyError' in namespace 'Exiv2'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-exiv2_error.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b1ad15d37434524c5793685e035692c5fff579d6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d7d2003e0ef4ead6f4b4c526bc44749a1fb845e795e0c5b7c35a393b0c0518a1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11556372
</span>
# see ${worksrcpath}/cmake/Version.cmake for LHDR_NAME and LHDR_OSX_EXECUTABLE_NAME values
set ldhr_name "Luminance HDR"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,24 +50,22 @@ set ldhr_name "Luminance HDR"
</span> patchfiles-append patch-Version.cmake.diff
set executable_name ${ldhr_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ensure that installed file has correct file permissions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-PackagingApple.cmake_02.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# recognize MacPorts as valid value for CMAKE_BUILD_TYPE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-cmake_build_type.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_PREFIX=${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove questionable compiler flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-compiler_settings.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant external description {use external programs provided by MacPorts instead of packaged binaries} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:hugin-app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin {align_image_stack} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete "${destroot}${applications_dir}/${executable_name}.app/Contents/MacOS/${bin}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/${bin} "${destroot}${applications_dir}/${executable_name}.app/Contents/MacOS/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append +external
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# only include OpenMP header file if compiler supports it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-openmp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# do not install libraries provided by MacPorts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-no_copy.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy "${cmake.build_dir}/${executable_name}.app" ${destroot}${applications_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/align_image_stack "${destroot}${applications_dir}/${executable_name}.app/Contents/MacOS/"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span> ln -s "${applications_dir}/${executable_name}.app/Contents/MacOS/luminance-hdr-cli" ${destroot}${prefix}/bin/
xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
ln -s "${applications_dir}/${executable_name}.app/Contents/Resources/html" ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-CMakeLists.txt.diff b/aqua/luminance-hdr/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63bf3b5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/luminance-hdr/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2014-01-27 13:20:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2016-05-22 03:44:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -212,8 +212,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Apple Mac OS X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_INSTALL_PREFIX "/Applications")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set Bundle settings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(MACOSX_BUNDLE_INFO_STRING "${LHDR_NAME} ${LHDR_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(MACOSX_BUNDLE_BUNDLE_VERSION "${LHDR_NAME} ${LHDR_VERSION}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-PackagingApple.cmake_01.diff b/aqua/luminance-hdr/files/patch-PackagingApple.cmake_01.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 655238d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/luminance-hdr/files/patch-PackagingApple.cmake_01.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build_files/PackagingApple.cmake.orig 2017-05-10 12:14:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build_files/PackagingApple.cmake 2018-04-19 11:54:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,8 +39,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install a qt.conf file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--install(FILES ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/qt.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#install(FILES ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/qt.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install README and other files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-PackagingApple.cmake_02.diff b/aqua/luminance-hdr/files/patch-PackagingApple.cmake_02.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f4198da..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/luminance-hdr/files/patch-PackagingApple.cmake_02.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build_files/PackagingApple.cmake.orig 2018-04-19 12:06:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build_files/PackagingApple.cmake 2018-04-19 12:08:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install align_image_stack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/align_image_stack
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install help
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-Version.cmake.diff b/aqua/luminance-hdr/files/patch-Version.cmake.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ed34fba..1ff81c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/luminance-hdr/files/patch-Version.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/luminance-hdr/files/patch-Version.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@
</span> +++ build_files/Modules/Version.cmake 2018-04-19 12:04:57.000000000 -0700
@@ -10,7 +10,7 @@
SET(LHDR_VENDOR "Luminance HDR Development Team")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(LHDR_COPYRIGHT_YEAR "2006-2017")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(LHDR_COPYRIGHT_YEAR "2006-2019")
</span>
-SET(LHDR_OSX_EXECUTABLE_NAME "${LHDR_NAME} ${LHDR_VERSION}")
+SET(LHDR_OSX_EXECUTABLE_NAME "${LHDR_NAME}")
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-cmake_build_type.diff b/aqua/luminance-hdr/files/patch-cmake_build_type.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..15424af
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/luminance-hdr/files/patch-cmake_build_type.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-06-09 12:18:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-06-15 08:38:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,14 +6,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROJECT("Luminance HDR")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel)$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel|macports)$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "CMAKE_BUILD_TYPE should be one of:\nDebug, Release, RelWithDebInfo, MinSizeRel")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel)$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel|macports)$")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions("-DQT_NO_DEBUG_OUTPUT")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-compiler_settings.diff b/aqua/luminance-hdr/files/patch-compiler_settings.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a835056
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/luminance-hdr/files/patch-compiler_settings.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build_files/Modules/CompilerSettings.cmake.orig 2019-06-09 12:18:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build_files/Modules/CompilerSettings.cmake 2019-06-15 08:52:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # optimize for 64-bit core 2 architecture on Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ADD_DEFINITIONS(-march=core2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ADD_DEFINITIONS(-march=core2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "C++11 activated for Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_EXE_LINKER_FLAGS "-lc++abi -stdlib=libc++ -rpath @loader_path/../Frameworks/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #set(CMAKE_EXE_LINKER_FLAGS "-lc++abi -stdlib=libc++ -rpath @loader_path/../Frameworks/")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DLHDR_CXX11_ENABLED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,9 +38,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wreturn-type -Wself-assign -Wunused-argument -Wunused-function -Wtautological-compare")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #OpenMP support under Linux with clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIND_PACKAGE(OpenMP REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #FIND_PACKAGE(OpenMP REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "C++11 is active by default on Microsoft Visual Studio")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-exiv2_error.diff b/aqua/luminance-hdr/files/patch-exiv2_error.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dc21df1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/luminance-hdr/files/patch-exiv2_error.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Exif/ExifOperations.cpp.orig 2017-05-10 12:14:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Exif/ExifOperations.cpp 2019-05-11 08:42:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <boost/assign/list_of.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <exif.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <error.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <image.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "ExifOperations.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/TransplantExif/TransplantExifDialog.cpp.orig 2019-05-11 08:40:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/TransplantExif/TransplantExifDialog.cpp 2019-05-11 08:44:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,6 +27,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <image.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <exif.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <exiv2/version.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <exiv2/error.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Common/global.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Common/config.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-no_copy.diff b/aqua/luminance-hdr/files/patch-no_copy.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2541d48
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/luminance-hdr/files/patch-no_copy.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,105 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-06-09 12:18:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-06-16 16:02:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,18 +328,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy align_image_stack into bundle/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/align_image_stack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE WORLD_EXECUTE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #FILE(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/align_image_stack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE WORLD_EXECUTE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy help/icons/hdrhtml and qt.conf to bundle resources
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE(COPY "${CMAKE_SOURCE_DIR}/help" DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE(COPY "${CMAKE_SOURCE_DIR}/icons" DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE(COPY "${CMAKE_SOURCE_DIR}/hdrhtml" DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE(COPY "${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/qt.conf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #FILE(COPY "${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/qt.conf"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Resources)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy Licence/README/Authors/Changelog to top of bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,42 +351,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copy align_image_stack dependencies to bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FILE(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/Libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #FILE(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # ${CMAKE_SOURCE_DIR}/build_files/platforms/macosx/Libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install Boost libs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(MAKE_DIRECTORY ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${Boost_SYSTEM_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${Boost_THREAD_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${Boost_CHRONO_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${Boost_DATE_TIME_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${Boost_ATOMIC_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- TARGET ${LHDR_OSX_EXECUTABLE_TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- COMMAND install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_thread.dylib @rpath/libboost_thread.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_program_options.dylib @rpath/libboost_program_options.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_chrono.dylib @rpath/libboost_chrono.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_date_time.dylib @rpath/libboost_date_time.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_atomic.dylib @rpath/libboost_atomic.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/Frameworks/libboost_chrono.dylib &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/Frameworks/libboost_thread.dylib &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_thread.dylib @rpath/libboost_thread.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_program_options.dylib @rpath/libboost_program_options.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_chrono.dylib @rpath/libboost_chrono.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_date_time.dylib @rpath/libboost_date_time.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- install_name_tool -change libboost_atomic.dylib @rpath/libboost_atomic.dylib *.app/Contents/MacOS/luminance-hdr-cli)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #file(MAKE_DIRECTORY ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # ${Boost_SYSTEM_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # ${Boost_THREAD_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # ${Boost_CHRONO_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # ${Boost_DATE_TIME_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #file(COPY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # ${Boost_ATOMIC_LIBRARY_RELEASE} DESTINATION ${LHDR_OSX_EXECUTABLE_NAME}.app/Contents/Frameworks)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # TARGET ${LHDR_OSX_EXECUTABLE_TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # COMMAND install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_thread.dylib @rpath/libboost_thread.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_program_options.dylib @rpath/libboost_program_options.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_chrono.dylib @rpath/libboost_chrono.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_date_time.dylib @rpath/libboost_date_time.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_atomic.dylib @rpath/libboost_atomic.dylib *.app/Contents/MacOS/luminance-hdr &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/Frameworks/libboost_chrono.dylib &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/Frameworks/libboost_thread.dylib &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_system.dylib @rpath/libboost_system.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_thread.dylib @rpath/libboost_thread.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_program_options.dylib @rpath/libboost_program_options.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_chrono.dylib @rpath/libboost_chrono.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_date_time.dylib @rpath/libboost_date_time.dylib *.app/Contents/MacOS/luminance-hdr-cli &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # install_name_tool -change libboost_atomic.dylib @rpath/libboost_atomic.dylib *.app/Contents/MacOS/luminance-hdr-cli)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSEIF(UNIX)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-openmp.diff b/aqua/luminance-hdr/files/patch-openmp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dec6f68
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/luminance-hdr/files/patch-openmp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Common/CommonFunctions.cpp.orig 2019-06-09 12:18:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Common/CommonFunctions.cpp 2019-06-16 07:36:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Common/LuminanceOptions.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <boost/algorithm/minmax_element.hpp>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef _OPENMP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <omp.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace std;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace pfs;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/luminance-hdr/files/patch-src-TransplantExif-TransplantExifDialog.cpp.diff b/aqua/luminance-hdr/files/patch-src-TransplantExif-TransplantExifDialog.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6c13441..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/luminance-hdr/files/patch-src-TransplantExif-TransplantExifDialog.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/TransplantExif/TransplantExifDialog.cpp.orig 2017-05-10 12:14:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/TransplantExif/TransplantExifDialog.cpp 2018-12-23 15:24:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QFileInfo>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <image.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <exif.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <exiv2/version.hpp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Common/global.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Common/config.h"
</span></pre><pre style='margin:0'>
</pre>