- updated to 2.4.0 (Qt 5 now)

- removed qt4pld patch
- added qprinter patch (Qt5PrintSupport related fixes)

diff --git a/luminance-hdr-qprinter.patch b/luminance-hdr-qprinter.patch
new file mode 100644 (file)
index 0000000..cb076c9
--- /dev/null
+++ b/luminance-hdr-qprinter.patch
@@ -0,0 +1,96 @@
+From 07e36ef892343b01bf13545866823e6a55044382 Mon Sep 17 00:00:00 2001
+From: Davide Anastasia <davide.anastasia@gmail.com>
+Date: Mon, 29 Sep 2014 08:06:15 +0100
+Subject: [PATCH] Fix QPrinter support
+
+---
+ CMakeLists.txt                  | 25 +++++++++++++------------
+ src/HelpBrowser/CMakeLists.txt  |  3 +--
+ src/HelpBrowser/helpbrowser.cpp |  8 +++++---
+ 3 files changed, 19 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1b07692..8a60ad4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,19 +18,20 @@ include(cmake/Internationalization.cmake)
+   # to always look for includes there:
+   #set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ 
+-find_package(Qt5Core)
+-find_package(Qt5Concurrent)
+-find_package(Qt5Widgets)
+-find_package(Qt5Gui)
+-find_package(Qt5Declarative)
+-find_package(Qt5WebKit)
+-find_package(Qt5WebKitWidgets)
+-find_package(Qt5Xml)
+-find_package(Qt5Sql)
+-find_package(Qt5Network)
+-find_package(Qt5LinguistTools)
++find_package(Qt5Core REQUIRED)
++find_package(Qt5Concurrent REQUIRED)
++find_package(Qt5Widgets REQUIRED)
++find_package(Qt5Gui REQUIRED)
++find_package(Qt5Declarative REQUIRED)
++find_package(Qt5WebKit REQUIRED)
++find_package(Qt5WebKitWidgets REQUIRED)
++find_package(Qt5Xml REQUIRED)
++find_package(Qt5Sql REQUIRED)
++find_package(Qt5Network REQUIRED)
++find_package(Qt5LinguistTools REQUIRED)
++find_package(Qt5PrintSupport REQUIRED)
+ IF(WIN32)
+-      find_package(Qt5WinExtras)
++    find_package(Qt5WinExtras)
+ ENDIF()
+ 
+ # Include the qtmain lib if we are on the windows platform
+diff --git a/src/HelpBrowser/CMakeLists.txt b/src/HelpBrowser/CMakeLists.txt
+index 04319a8..2f4916a 100644
+--- a/src/HelpBrowser/CMakeLists.txt
++++ b/src/HelpBrowser/CMakeLists.txt
+@@ -27,9 +27,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ QT5_WRAP_CPP(FILES_MOC ${FILES_H})
+ 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)
+diff --git a/src/HelpBrowser/helpbrowser.cpp b/src/HelpBrowser/helpbrowser.cpp
+index bfd2820..ce7f984 100644
+--- a/src/HelpBrowser/helpbrowser.cpp
++++ b/src/HelpBrowser/helpbrowser.cpp
+@@ -30,6 +30,7 @@ for which a new license (GPL+exception) is in place.
+ #include "ui_HelpBrowser.h"
+ #include "ui_HelpSideBar.h"
+ 
++#include <QDebug>
+ #include <QAction>
+ #include <QBuffer>
+ #include <QDir>
+@@ -45,8 +46,6 @@ for which a new license (GPL+exception) is in place.
+ #include <QModelIndex>
+ #include <QModelIndexList>
+ #include <QPainter>
+-#include <QPrinter>
+-#include <QPrintDialog>
+ #include <QProcess>
+ #include <QPushButton>
+ #include <QString>
+@@ -56,7 +55,10 @@ for which a new license (GPL+exception) is in place.
+ #include <QXmlDefaultHandler>
+ #include <QDesktopServices>
+ 
+-#include <QDebug>
++#include <QtPrintSupport/QPrinter>
++#include <QtPrintSupport/QPrintDialog>
++
++
+ 
+ #include "Common/global.h"
+ #include "HelpBrowser/schelptreemodel.h"

diff --git a/luminance-hdr-qt4pld.patch b/luminance-hdr-qt4pld.patch
deleted file mode 100644 (file)
index df59a85..0000000
--- a/luminance-hdr-qt4pld.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- luminance-hdr-2.3.1/src/Common/TranslatorManager.cpp.orig  2013-04-07 20:41:14.000000000 +0200
-+++ luminance-hdr-2.3.1/src/Common/TranslatorManager.cpp       2016-09-09 18:49:00.625142009 +0200
-@@ -83,7 +83,7 @@
- 
-     if ( qtTranslator->load(QString("qt_") + lang, QString("i18n")) ||
-          // qtTranslator->load(QString("qt_") + lang, I18NDIR) )
--         qtTranslator->load(QString("qt_") + lang, QLibraryInfo::location(
-+         qtTranslator->load(QString("qt4_") + lang, QLibraryInfo::location(
-                                 QLibraryInfo::TranslationsPath)) )
-     {
-         QCoreApplication::installTranslator(qtTranslator.data());

diff --git a/luminance-hdr.spec b/luminance-hdr.spec
index b36d2199476c97fa14cba771fdda4021a11f0138..ee1068c40fa7fda405db0ccf988efb1bae13a517 100644 (file)
--- a/luminance-hdr.spec
+++ b/luminance-hdr.spec
@@ -12,24 +12,30 @@
 Summary:       Luminance HDR - HDR Image compositor
 Summary(pl.UTF-8):     Luminance HDR - narzędzie do składania obrazów HDR
 Name:          luminance-hdr
-Version:       2.3.1
+Version:       2.4.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://downloads.sourceforge.net/qtpfsgui/%{name}-%{version}.tar.bz2
-# Source0-md5: 86499294fb9a6dc211a54cbaa9af2b8a
-Patch0:                %{name}-qt4pld.patch
+# Source0-md5: b22c9bca0330d80bdec38d37fc94ad93
+Patch0:                %{name}-qprinter.patch
 URL:           http://qtpfsgui.sourceforge.net/
-BuildRequires: OpenEXR-devel
-BuildRequires: QtCore-devel >= 4.3
-BuildRequires: QtGui-devel >= 4.3
-BuildRequires: QtNetwork-devel >= 4.3
-BuildRequires: QtSql-devel >= 4.3
-BuildRequires: QtWebKit-devel >= 4.3
-BuildRequires: QtXml-devel >= 4.3
+BuildRequires: CCfits-devel
+BuildRequires: OpenEXR-devel >= 2.0.1
+BuildRequires: Qt5Concurrent-devel >= 5
+BuildRequires: Qt5Core-devel >= 5
+BuildRequires: Qt5Declarative-devel >= 5
+BuildRequires: Qt5Gui-devel >= 5
+BuildRequires: Qt5Network-devel >= 5
+BuildRequires: Qt5PrintSupport-devel >= 5
+BuildRequires: Qt5Sql-devel >= 5
+BuildRequires: Qt5WebKit-devel >= 5
+BuildRequires: Qt5Widgets-devel >= 5
+BuildRequires: Qt5Xml-devel >= 5
 BuildRequires: boost-devel
-BuildRequires: cmake >= 2.6.0
-BuildRequires: exiv2-devel >= 0.12
+BuildRequires: cfitsio-devel
+BuildRequires: cmake >= 2.8.11
+BuildRequires: exiv2-devel >= 0.21
 BuildRequires: fftw3-single-devel >= 3
 BuildRequires: gcc-c++ >= 6:4.3
 BuildRequires: gsl-devel
@@ -40,20 +46,15 @@ BuildRequires:      libpng-devel
 BuildRequires: libraw-devel
 BuildRequires: libstdc++-devel >= 6:4.3
 BuildRequires: libtiff-devel
-BuildRequires: qt4-build >= 4.3.3-3
-BuildRequires: qt4-linguist >= 4.3.3-3
-BuildRequires: qt4-qmake >= 4.3.3-3
+BuildRequires: qt5-build >= 5
+BuildRequires: qt5-linguist >= 5
+BuildRequires: qt5-qmake >= 5
 BuildRequires: rpmbuild(macros) >= 1.605
 BuildRequires: sed >= 4.0
 Requires(post,postun): gtk-update-icon-cache
-Requires:      QtCore >= 4.3
-Requires:      QtGui >= 4.3
-Requires:      QtNetwork >= 4.3
-Requires:      QtSql >= 4.3
-Requires:      QtSql-sqlite3 >= 4.3
-Requires:      QtWebKit >= 4.3
-Requires:      QtXml >= 4.3
-Requires:      exiv2 >= 0.12
+Requires:      OpenEXR >= 2.0.1
+Requires:      Qt5Sql-sqldriver-sqlite3
+Requires:      exiv2-libs >= 0.21
 Requires:      hicolor-icon-theme
 Obsoletes:     qtpfsgui
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/luminance-hdr/{AUTHORS,Changelog,LICENSE,README}
-# use Qt translations packaged with qt4
+# use Qt translations packaged with qt5
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/luminance-hdr/i18n/qt_*.qm
 
 %clean
@@ -119,14 +120,13 @@ rm -rf $RPM_BUILD_ROOT
 %lang(es) %{_datadir}/luminance-hdr/i18n/lang_es.qm
 %lang(fi) %{_datadir}/luminance-hdr/i18n/lang_fi.qm
 %lang(fr) %{_datadir}/luminance-hdr/i18n/lang_fr.qm
-%lang(hi) %{_datadir}/luminance-hdr/i18n/lang_hi.qm
 %lang(hu) %{_datadir}/luminance-hdr/i18n/lang_hu.qm
 %lang(id) %{_datadir}/luminance-hdr/i18n/lang_id.qm
 %lang(it) %{_datadir}/luminance-hdr/i18n/lang_it.qm
 %lang(pl) %{_datadir}/luminance-hdr/i18n/lang_pl.qm
+%lang(pt_BR) %{_datadir}/luminance-hdr/i18n/lang_pt_BR.qm
 %lang(ro) %{_datadir}/luminance-hdr/i18n/lang_ro.qm
 %lang(ru) %{_datadir}/luminance-hdr/i18n/lang_ru.qm
-%lang(sk) %{_datadir}/luminance-hdr/i18n/lang_sk.qm
 %lang(tr) %{_datadir}/luminance-hdr/i18n/lang_tr.qm
 %lang(zh_CN) %{_datadir}/luminance-hdr/i18n/lang_zh.qm
 %{_desktopdir}/luminance-hdr.desktop