From 0267271d0ad5d61de0cf4883f5253bbbc61626f1 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 14 May 2015 15:36:48 +0000 Subject: [PATCH] community/luminancehdr to 2.4.0-3 --- community/luminancehdr/PKGBUILD | 23 ++++++++---- community/luminancehdr/luminancehdr.changelog | 37 ++++++++++++------- community/luminancehdr/qt5_printsupport.diff | 29 +++++++++++++++ 3 files changed, 68 insertions(+), 21 deletions(-) create mode 100644 community/luminancehdr/qt5_printsupport.diff diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 61b1c8d33..366bee8f0 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,5 +1,5 @@ # $Id$ -# Maintainer: Jaroslav Lichtblau +# Maintainer: Jaroslav Lichtblau # Contributor: Lukas Jirkovsky # Contributor: Dmitry N. Shilov @@ -8,33 +8,42 @@ pkgname=luminancehdr pkgver=2.4.0 -pkgrel=2 +pkgrel=3 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' license=('GPL') depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt5-webkit' 'ccfits') -makedepends=('cmake' 'boost' 'gtest' 'qt5-tools') +makedepends=('cmake' 'boost' 'gtest' 'qt5-tools' 'patch') optdepends=('hugin: align image stack functionality') install=$pkgname.install changelog=$pkgname.changelog options=('!emptydirs') -source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2 +source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/$pkgver/luminance-hdr-$pkgver.tar.bz2 + qt5_printsupport.diff strip-sse.patch) sha256sums=('14014eadab099944f051dd99447f6f47d455ffb0e4e0272d93a8e71fd96ad401' + 'be2aaf8f544b086b770cec3db026e8ef7057bf3797961efeb8465197e4332c01' 'f74a1d27684a7a8fa3223e1bf8e04bd2158925b8f1d0b32ef167910920511974') -build() { - cd "${srcdir}/luminance-hdr-${pkgver}" +prepare() { + cd "${srcdir}"/luminance-hdr-${pkgver} + +#Fix build error with Qt >= 5.3.2 + patch -Np1 -i "${srcdir}"/qt5_printsupport.diff patch -p0 -i ../strip-sse.patch +} + +build() { + cd "${srcdir}"/luminance-hdr-${pkgver} cmake -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}/luminance-hdr-${pkgver}" + cd "${srcdir}"/luminance-hdr-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog index ab6898db8..9c7bf4094 100644 --- a/community/luminancehdr/luminancehdr.changelog +++ b/community/luminancehdr/luminancehdr.changelog @@ -1,34 +1,43 @@ -2013-06-15 Jaroslav Lichtblau +2015-05-14 Jaroslav Lichtblau + * luminancehdr 2.4.0-3 + +2014-02-04 Jaroslav Lichtblau + * luminancehdr 2.4.0-1 + +2014-01-20 Jaroslav Lichtblau + * luminancehdr 2.3.1-4 libraw rebuild + +2013-06-15 Jaroslav Lichtblau * luminancehdr 2.3.1-3 libraw rebuild -2013-04-20 Jaroslav Lichtblau +2013-04-20 Jaroslav Lichtblau * luminancehdr 2.3.1-1 -2012-07-30 Jaroslav Lichtblau +2012-07-30 Jaroslav Lichtblau * luminancehdr 2.3.0-2 exiv2-0.23 rebuild -2012-07-07 Jaroslav Lichtblau +2012-07-07 Jaroslav Lichtblau * luminancehdr 2.3.0-1 -2012-03-18 Jaroslav Lichtblau +2012-03-18 Jaroslav Lichtblau * luminancehdr 2.2.1-1 2012-01-27 Eric Belanger * Rebuild against libpng 1.5 and libtiff 4.0 -2011-08-21 Jaroslav Lichtblau +2011-08-21 Jaroslav Lichtblau * luminancehdr 2.1.0-1 -2011-05-01 Jaroslav Lichtblau +2011-05-01 Jaroslav Lichtblau * luminancehdr 2.0.2-1 -2010-10-19 Jaroslav Lichtblau +2010-10-19 Jaroslav Lichtblau * exiv2 0.20 rebuild -2010-10-17 Jaroslav Lichtblau +2010-10-17 Jaroslav Lichtblau * Update to major release 2.0.1 -2010-06-27 Jaroslav Lichtblau +2010-06-27 Jaroslav Lichtblau * Package renamed to LuminanceHDR * Update to major release 2.0.0 @@ -38,14 +47,14 @@ 2009-11-02 Biru Ionut * add translation and fix segfault on old i686 procesors -2009-04-29 Jaroslav Lichtblau +2009-04-29 Jaroslav Lichtblau * Update to major release v1.9.3 -2009-04-04 Jaroslav Lichtblau +2009-04-04 Jaroslav Lichtblau * Minor version (v1.9.2-3) update caused by exiv2 upgrade. -2008-11-04 Jaroslav Lichtblau +2008-11-04 Jaroslav Lichtblau * Minor version (v1.9.2-2) update caused by openexr upgrade. -2008-09-17 Jaroslav Lichtblau +2008-09-17 Jaroslav Lichtblau * Package moved to [community] diff --git a/community/luminancehdr/qt5_printsupport.diff b/community/luminancehdr/qt5_printsupport.diff new file mode 100644 index 000000000..9dda7c3d5 --- /dev/null +++ b/community/luminancehdr/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 +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)