Browse Source

gnu: luminance-hdr: Update to 2.6.0.

* gnu/packages/patches/luminance-hdr-qt-printer.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/image-viewers.scm (luminance-hdr): Update to 2.6.0.
[inputs]: Add QTSVG and EIGEN.
[arguments]: Add #:tests? #f.
gn-latest-20200725
Marius Bakke 1 year ago
parent
commit
beb7a28110
No known key found for this signature in database GPG Key ID: A2A06DF2A33A54FA
3 changed files with 6 additions and 33 deletions
  1. +0
    -1
      gnu/local.mk
  2. +6
    -4
      gnu/packages/image-viewers.scm
  3. +0
    -28
      gnu/packages/patches/luminance-hdr-qt-printer.patch

+ 0
- 1
gnu/local.mk View File

@ -1273,7 +1273,6 @@ dist_patch_DATA = \
%D%/packages/patches/lua-liblua-so.patch \
%D%/packages/patches/luajit-no_ldconfig.patch \
%D%/packages/patches/luit-posix.patch \
%D%/packages/patches/luminance-hdr-qt-printer.patch \
%D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/mariadb-client-test-32bit.patch \


+ 6
- 4
gnu/packages/image-viewers.scm View File

@ -329,7 +329,7 @@ It supports JPEG, PNG and GIF formats.")
(define-public luminance-hdr
(package
(name "luminance-hdr")
(version "2.4.0")
(version "2.6.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -337,8 +337,7 @@ It supports JPEG, PNG and GIF formats.")
version "/luminance-hdr-" version ".tar.bz2"))
(sha256
(base32
"00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l"))
(patches (search-patches "luminance-hdr-qt-printer.patch"))))
"188q0l63nfasqfvwbq4mwx2vh7wsfi2bq9n5nksddspl1qz01lnp"))))
(build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@ -346,8 +345,10 @@ It supports JPEG, PNG and GIF formats.")
(inputs
`(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)
("qtsvg" ,qtsvg)
("qtwebkit" ,qtwebkit)
("boost" ,boost)
("eigen" ,eigen)
;; ("gtest" ,gtest)
("libraw" ,libraw)
("zlib" ,zlib)
@ -360,7 +361,8 @@ It supports JPEG, PNG and GIF formats.")
("gsl" ,gsl)
("libtiff" ,libtiff)))
(arguments
'(#:phases
'(#:tests? #f ;XXX: some tests fail to compile
#:phases
(modify-phases %standard-phases
(add-after 'set-paths 'add-ilmbase-include-path
(lambda* (#:key inputs #:allow-other-keys)


+ 0
- 28
gnu/packages/patches/luminance-hdr-qt-printer.patch View File

@ -1,28 +0,0 @@
Allow the 'QtPrinter' header to be found, as described
at <https://github.com/LuminanceHDR/LuminanceHDR/issues/11>.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbad8a2..8379c8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,7 @@ find_package(Qt5Xml)
find_package(Qt5Sql)
find_package(Qt5Network)
find_package(Qt5LinguistTools)
+find_package(Qt5PrintSupport REQUIRED)
IF(WIN32)
find_package(Qt5WinExtras)
ENDIF()
diff --git a/src/HelpBrowser/CMakeLists.txt b/src/HelpBrowser/CMakeLists.txt
index 04319a8..5537dae 100644
--- a/src/HelpBrowser/CMakeLists.txt
+++ b/src/HelpBrowser/CMakeLists.txt
@@ -29,7 +29,7 @@ QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})
-qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets)
+qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport)
SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)

Loading…
Cancel
Save