[arch-commits] Commit in luminancehdr/repos/community-i686 (7 files)

Jaroslav Lichtblau jlichtblau at archlinux.org
Thu May 14 14:26:59 UTC 2015


    Date: Thursday, May 14, 2015 @ 16:26:59
  Author: jlichtblau
Revision: 133434

archrelease: copy trunk to community-i686

Added:
  luminancehdr/repos/community-i686/PKGBUILD
    (from rev 133433, luminancehdr/trunk/PKGBUILD)
  luminancehdr/repos/community-i686/luminancehdr.changelog
    (from rev 133433, luminancehdr/trunk/luminancehdr.changelog)
  luminancehdr/repos/community-i686/luminancehdr.install
    (from rev 133433, luminancehdr/trunk/luminancehdr.install)
  luminancehdr/repos/community-i686/qt5_printsupport.diff
    (from rev 133433, luminancehdr/trunk/qt5_printsupport.diff)
Deleted:
  luminancehdr/repos/community-i686/PKGBUILD
  luminancehdr/repos/community-i686/luminancehdr.changelog
  luminancehdr/repos/community-i686/luminancehdr.install

------------------------+
 PKGBUILD               |   75 ++++++++++++++++--------------
 luminancehdr.changelog |  117 ++++++++++++++++++++++++-----------------------
 luminancehdr.install   |   24 ++++-----
 qt5_printsupport.diff  |   29 +++++++++++
 4 files changed, 143 insertions(+), 102 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-14 14:06:55 UTC (rev 133433)
+++ PKGBUILD	2015-05-14 14:26:59 UTC (rev 133434)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast at land.ru>
-
-pkgname=luminancehdr
-pkgver=2.4.0
-pkgrel=2
-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')
-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')
-
-build() {
-  cd "${srcdir}"/luminance-hdr-${pkgver}
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/luminance-hdr-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-}

Copied: luminancehdr/repos/community-i686/PKGBUILD (from rev 133433, luminancehdr/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2015-05-14 14:26:59 UTC (rev 133434)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: Dmitry N. Shilov <stormblast at land.ru>
+
+pkgname=luminancehdr
+pkgver=2.4.0
+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' '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
+        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}
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/luminance-hdr-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+}

Deleted: luminancehdr.changelog
===================================================================
--- luminancehdr.changelog	2015-05-14 14:06:55 UTC (rev 133433)
+++ luminancehdr.changelog	2015-05-14 14:26:59 UTC (rev 133434)
@@ -1,57 +0,0 @@
-2014-02-04 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* luminancehdr 2.4.0-1
-
-2014-01-20 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* luminancehdr 2.3.1-4 libraw rebuild
-
-2013-06-15 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* luminancehdr 2.3.1-3 libraw rebuild
-
-2013-04-20 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* luminancehdr 2.3.1-1
-
-2012-07-30 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* luminancehdr 2.3.0-2 exiv2-0.23 rebuild
-
-2012-07-07 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* luminancehdr 2.3.0-1
-
-2012-03-18 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* luminancehdr 2.2.1-1
-
-2012-01-27 Eric Belanger  <eric at archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-
-2011-08-21 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* luminancehdr 2.1.0-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* luminancehdr 2.0.2-1
-
-2010-10-19 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* exiv2 0.20 rebuild
-
-2010-10-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Update to major release 2.0.1
-
-2010-06-27 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Package renamed to LuminanceHDR
-	* Update to major release 2.0.0
-
-2010-03-09 Andrea Scarpino <andrea at archlinux.org>
-	* exiv2 0.19 rebuild
-
-2009-11-02 Biru Ionut <ionut at archlinux.ro>
-	* add translation and fix segfault on old i686 procesors
-
-2009-04-29 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Update to major release v1.9.3
-
-2009-04-04 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Minor version (v1.9.2-3) update caused by exiv2 upgrade.
-
-2008-11-04 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Minor version (v1.9.2-2) update caused by openexr upgrade.
-
-2008-09-17 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Package moved to [community]

Copied: luminancehdr/repos/community-i686/luminancehdr.changelog (from rev 133433, luminancehdr/trunk/luminancehdr.changelog)
===================================================================
--- luminancehdr.changelog	                        (rev 0)
+++ luminancehdr.changelog	2015-05-14 14:26:59 UTC (rev 133434)
@@ -0,0 +1,60 @@
+2015-05-14 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.4.0-3
+
+2014-02-04 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.4.0-1
+
+2014-01-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.3.1-4 libraw rebuild
+
+2013-06-15 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.3.1-3 libraw rebuild
+
+2013-04-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.3.1-1
+
+2012-07-30 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.3.0-2 exiv2-0.23 rebuild
+
+2012-07-07 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.3.0-1
+
+2012-03-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.2.1-1
+
+2012-01-27 Eric Belanger  <eric at archlinux.org>
+	* Rebuild against libpng 1.5 and libtiff 4.0
+
+2011-08-21 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.1.0-1
+
+2011-05-01 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* luminancehdr 2.0.2-1
+
+2010-10-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* exiv2 0.20 rebuild
+
+2010-10-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Update to major release 2.0.1
+
+2010-06-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Package renamed to LuminanceHDR
+	* Update to major release 2.0.0
+
+2010-03-09 Andrea Scarpino <andrea at archlinux.org>
+	* exiv2 0.19 rebuild
+
+2009-11-02 Biru Ionut <ionut at archlinux.ro>
+	* add translation and fix segfault on old i686 procesors
+
+2009-04-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Update to major release v1.9.3
+
+2009-04-04 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Minor version (v1.9.2-3) update caused by exiv2 upgrade.
+
+2008-11-04 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Minor version (v1.9.2-2) update caused by openexr upgrade.
+
+2008-09-17 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* Package moved to [community]

Deleted: luminancehdr.install
===================================================================
--- luminancehdr.install	2015-05-14 14:06:55 UTC (rev 133433)
+++ luminancehdr.install	2015-05-14 14:26:59 UTC (rev 133434)
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}

Copied: luminancehdr/repos/community-i686/luminancehdr.install (from rev 133433, luminancehdr/trunk/luminancehdr.install)
===================================================================
--- luminancehdr.install	                        (rev 0)
+++ luminancehdr.install	2015-05-14 14:26:59 UTC (rev 133434)
@@ -0,0 +1,12 @@
+post_install() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}

Copied: luminancehdr/repos/community-i686/qt5_printsupport.diff (from rev 133433, luminancehdr/trunk/qt5_printsupport.diff)
===================================================================
--- qt5_printsupport.diff	                        (rev 0)
+++ qt5_printsupport.diff	2015-05-14 14:26:59 UTC (rev 133434)
@@ -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 at 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)



More information about the arch-commits mailing list