diff options
| author | David Spencer <baildon.research@googlemail.com> | 2014-09-30 23:52:54 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-10-05 08:08:59 +0700 |
| commit | 6e51374a3ffbe73687e7f7f6f3f33de9a726cd06 (patch) | |
| tree | ae188de9bf2edfad249ba124e36948335cc941e5 | |
| parent | e798968335126643ab6f8c52f4455a61cd4f00f3 (diff) | |
graphics/luminance-hdr: Updated SlackBuild to patch for recent qt5.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
| -rw-r--r-- | graphics/luminance-hdr/luminance-hdr.SlackBuild | 7 | ||||
| -rw-r--r-- | graphics/luminance-hdr/qt5_printsupport.diff | 29 |
2 files changed, 34 insertions, 2 deletions
diff --git a/graphics/luminance-hdr/luminance-hdr.SlackBuild b/graphics/luminance-hdr/luminance-hdr.SlackBuild index fba6b3d592b4..1bddfc05896a 100644 --- a/graphics/luminance-hdr/luminance-hdr.SlackBuild +++ b/graphics/luminance-hdr/luminance-hdr.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=luminance-hdr VERSION=${VERSION:-2.4.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -66,7 +66,10 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Fix recent qt5 breakage (thanks be unto Debian) +patch -p1 < $CWD/qt5_printsupport.diff mkdir -p build cd build diff --git a/graphics/luminance-hdr/qt5_printsupport.diff b/graphics/luminance-hdr/qt5_printsupport.diff new file mode 100644 index 000000000000..9dda7c3d5a7e --- /dev/null +++ b/graphics/luminance-hdr/qt5_printsupport.diff @@ -0,0 +1,29 @@ +Description: Fix build error with Qt >= 5.3.2 + Upstream's 07e36ef892343b01bf13545866823e6a55044382 does essentially the + same thing. +Author: Andreas Metzler <ametzler@debian.org> +Bug-Debian: https://bugs.debian.org/763224 +Origin: vendor +Forwarded: not-needed + +--- 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) + IF(WIN32) + find_package(Qt5WinExtras) + ENDIF() +--- 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) |