Date: Thursday, May 14, 2015 @ 16:00:00
  Author: jlichtblau
Revision: 133431

upgpkg: luminancehdr 2.4.0-3
openexr 2.2.0 rebuild

Added:
  luminancehdr/trunk/qt5_printsupport.diff
Modified:
  luminancehdr/trunk/PKGBUILD
  luminancehdr/trunk/luminancehdr.changelog

------------------------+
 PKGBUILD               |   19 ++++++++++++++-----
 luminancehdr.changelog |   35 +++++++++++++++++++----------------
 qt5_printsupport.diff  |   29 +++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2015-05-14 13:45:02 UTC (rev 133430)
+++ PKGBUILD    2015-05-14 14:00:00 UTC (rev 133431)
@@ -1,24 +1,33 @@
 # $Id$
-# Maintainer: Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com>
 # Contributor: Dmitry N. Shilov <stormbl...@land.ru>
 
 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)
-sha256sums=('14014eadab099944f051dd99447f6f47d455ffb0e4e0272d93a8e71fd96ad401')
+source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/$pkgver/luminance-hdr-$pkgver.tar.bz2
+        qt5_printsupport.diff)
+sha256sums=('14014eadab099944f051dd99447f6f47d455ffb0e4e0272d93a8e71fd96ad401'
+            'be2aaf8f544b086b770cec3db026e8ef7057bf3797961efeb8465197e4332c01')
 
+prepare() {
+  cd "${srcdir}"/luminance-hdr-${pkgver}
+
+#Fix build error with Qt >= 5.3.2
+  patch -Np1 -i "${srcdir}"/qt5_printsupport.diff
+}
+
 build() {
   cd "${srcdir}"/luminance-hdr-${pkgver}
 

Modified: luminancehdr.changelog
===================================================================
--- luminancehdr.changelog      2015-05-14 13:45:02 UTC (rev 133430)
+++ luminancehdr.changelog      2015-05-14 14:00:00 UTC (rev 133431)
@@ -1,40 +1,43 @@
-2014-02-04 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2015-05-14 Jaroslav Lichtblau <svetlemo...@archlinux.org>
+       * luminancehdr 2.4.0-3
+
+2014-02-04 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * luminancehdr 2.4.0-1
 
-2014-01-20 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2014-01-20 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * luminancehdr 2.3.1-4 libraw rebuild
 
-2013-06-15 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2013-06-15 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * luminancehdr 2.3.1-3 libraw rebuild
 
-2013-04-20 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2013-04-20 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * luminancehdr 2.3.1-1
 
-2012-07-30 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2012-07-30 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * luminancehdr 2.3.0-2 exiv2-0.23 rebuild
 
-2012-07-07 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2012-07-07 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * luminancehdr 2.3.0-1
 
-2012-03-18 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2012-03-18 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * luminancehdr 2.2.1-1
 
 2012-01-27 Eric Belanger  <e...@archlinux.org>
        * Rebuild against libpng 1.5 and libtiff 4.0
 
-2011-08-21 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2011-08-21 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * luminancehdr 2.1.0-1
 
-2011-05-01 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2011-05-01 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * luminancehdr 2.0.2-1
 
-2010-10-19 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2010-10-19 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * exiv2 0.20 rebuild
 
-2010-10-17 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2010-10-17 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * Update to major release 2.0.1
 
-2010-06-27 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2010-06-27 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * Package renamed to LuminanceHDR
        * Update to major release 2.0.0
 
@@ -44,14 +47,14 @@
 2009-11-02 Biru Ionut <io...@archlinux.ro>
        * add translation and fix segfault on old i686 procesors
 
-2009-04-29 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2009-04-29 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * Update to major release v1.9.3
 
-2009-04-04 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2009-04-04 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * Minor version (v1.9.2-3) update caused by exiv2 upgrade.
 
-2008-11-04 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2008-11-04 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * Minor version (v1.9.2-2) update caused by openexr upgrade.
 
-2008-09-17 Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+2008-09-17 Jaroslav Lichtblau <svetlemo...@archlinux.org>
        * Package moved to [community]

Added: qt5_printsupport.diff
===================================================================
--- qt5_printsupport.diff                               (rev 0)
+++ qt5_printsupport.diff       2015-05-14 14:00:00 UTC (rev 133431)
@@ -0,0 +1,29 @@
+Description: Fix build error with Qt >= 5.3.2
+ Upstream's 07e36ef892343b01bf13545866823e6a55044382 does essentially the
+ same thing.
+Author: Andreas Metzler <ametz...@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)

Reply via email to