diff options
author | Leo Famulari <leo@famulari.name> | 2017-04-14 13:07:16 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-04-14 13:07:16 -0400 |
commit | c57ce31a896f659a2e311c2ee90b9027f4a405bc (patch) | |
tree | 17d0d0238ca1db65cce1f2ac68273af0483c9e7d /gnu/packages/patches/luminance-hdr-qt-printer.patch | |
parent | f575efa12c5df9f9879b7be0fe3593a3106a346d (diff) | |
parent | 8439c9c05eab5c98d889fb1de56bc78f62a8058f (diff) | |
download | guix-c57ce31a896f659a2e311c2ee90b9027f4a405bc.tar guix-c57ce31a896f659a2e311c2ee90b9027f4a405bc.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/luminance-hdr-qt-printer.patch')
-rw-r--r-- | gnu/packages/patches/luminance-hdr-qt-printer.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/luminance-hdr-qt-printer.patch b/gnu/packages/patches/luminance-hdr-qt-printer.patch new file mode 100644 index 0000000000..c65f9537cd --- /dev/null +++ b/gnu/packages/patches/luminance-hdr-qt-printer.patch @@ -0,0 +1,28 @@ +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) |