graphics/luminance-hdr: Updated for version 2.5.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 8 insertions, 40 deletions

diff --git a/graphics/luminance-hdr/luminance-hdr.SlackBuild b/graphics/luminance-hdr/luminance-hdr.SlackBuild
index 22578cb40345..d1c612fb00a1 100644
--- a/graphics/luminance-hdr/luminance-hdr.SlackBuild
+++ b/graphics/luminance-hdr/luminance-hdr.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=luminance-hdr
-VERSION=${VERSION:-2.4.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.5.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -68,10 +68,7 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix recent qt5 breakage (thanks be unto Debian)
-patch -p1 < $CWD/qt5_printsupport.diff
-
-# Workround build failure with gcc-g++-4.9.3 (mangling bug?)
+# Workround build failure with gcc-g++-4.9.3 and beyond (mangling bug?)
 # (fails to link libmvec: "undefined reference to `_ZGVbN4vv_powf'" etc)
 export CXX=clang++
 
@@ -88,7 +85,7 @@ cd ..
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS BUGS Changelog INSTALL LICENSE README README.i18n TODO \
+  AUTHORS BUGS Changelog INSTALL LICENSE README.md README.i18n TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/graphics/luminance-hdr/luminance-hdr.info b/graphics/luminance-hdr/luminance-hdr.info
index a391c3ebad48..fc34679cca1a 100644
--- a/graphics/luminance-hdr/luminance-hdr.info
+++ b/graphics/luminance-hdr/luminance-hdr.info
@@ -1,10 +1,10 @@
 PRGNAM="luminance-hdr"
-VERSION="2.4.0"
+VERSION="2.5.0"
 HOMEPAGE="http://qtpfsgui.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-2.4.0.tar.bz2"
-MD5SUM="b22c9bca0330d80bdec38d37fc94ad93"
+DOWNLOAD="http://downloads.sourceforge.net/qtpfsgui/2.5.0/luminance-hdr-2.5.0.tar.bz2"
+MD5SUM="da707770fddd4dbf61d0c9c943cf3582"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qt5-webkit"
+REQUIRES="qt5-webkit cfitsio"
 MAINTAINER="David Spencer"
 EMAIL="baildon.research@googlemail.com"
diff --git a/graphics/luminance-hdr/qt5_printsupport.diff b/graphics/luminance-hdr/qt5_printsupport.diff
deleted file mode 100644
index 9dda7c3d5a7e..000000000000
--- a/graphics/luminance-hdr/qt5_printsupport.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-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)