radhermit 15/07/10 02:39:50
Modified: luminance-hdr-2.3.1-docs.patch
luminance-hdr-2.3.1-no-git.patch
luminance-hdr-2.3.1-openmp-automagic.patch
Added: luminance-hdr-2.4.0-fits-automagic.patch
luminance-hdr-2.4.0-qtquick.patch
luminance-hdr-2.4.0-qtprinter.patch
Log:
Version bump (bug #516864, patches by José María Fernández González). Add
fits use flag, update HOMEPAGE, and add ilmbase dep (bug #543314).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
4AB3E85B4F064CA3)
Revision Changes Path
1.2
media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch?r1=1.1&r2=1.2
Index: luminance-hdr-2.3.1-docs.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-docs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- luminance-hdr-2.3.1-docs.patch 27 Sep 2013 07:19:58 -0000 1.1
+++ luminance-hdr-2.3.1-docs.patch 10 Jul 2015 02:39:49 -0000 1.2
@@ -1,3 +1,5 @@
+Don't install extra docs and fix install dir.
+
--- luminance-hdr-2.3.1/CMakeLists.txt
+++ luminance-hdr-2.3.1/CMakeLists.txt
@@ -250,12 +250,6 @@
1.2
media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch?r1=1.1&r2=1.2
Index: luminance-hdr-2.3.1-no-git.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-no-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- luminance-hdr-2.3.1-no-git.patch 27 Sep 2013 07:19:58 -0000 1.1
+++ luminance-hdr-2.3.1-no-git.patch 10 Jul 2015 02:39:49 -0000 1.2
@@ -1,3 +1,5 @@
+Don't try to define the git version of the release.
+
--- luminance-hdr-2.3.1/CMakeLists.txt
+++ luminance-hdr-2.3.1/CMakeLists.txt
@@ -32,12 +32,6 @@
1.2
media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch?r1=1.1&r2=1.2
Index: luminance-hdr-2.3.1-openmp-automagic.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.3.1-openmp-automagic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- luminance-hdr-2.3.1-openmp-automagic.patch 27 Sep 2013 07:19:58 -0000
1.1
+++ luminance-hdr-2.3.1-openmp-automagic.patch 10 Jul 2015 02:39:49 -0000
1.2
@@ -1,3 +1,5 @@
+Only use openmp support if explicitly enabled.
+
--- luminance-hdr-2.3.1/cmake/CompilerSettings.cmake
+++ luminance-hdr-2.3.1/cmake/CompilerSettings.cmake
@@ -8,6 +8,8 @@
1.1
media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-fits-automagic.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-fits-automagic.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-fits-automagic.patch?rev=1.1&content-type=text/plain
Index: luminance-hdr-2.4.0-fits-automagic.patch
===================================================================
Only use FITS support if explicitly enabled.
--- luminance-hdr-2.4.0/CMakeLists.txt
+++ luminance-hdr-2.4.0/CMakeLists.txt
@@ -10,6 +10,8 @@
include(cmake/CompilerSettings.cmake)
include(cmake/Internationalization.cmake)
+OPTION(USE_FITS "Enable FITS support." ON)
+
# find and setup Qt5 for this project
# Tell CMake to run moc when necessary:
@@ -122,13 +124,15 @@
INCLUDE_DIRECTORIES(${JPEGLIB_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${LCMS2_INCLUDE_DIR})
-FIND_PACKAGE(CCfits)
-IF(CCFITS_FOUND)
- INCLUDE_DIRECTORIES(${CCFITS_INCLUDE_DIRS})
- SET(LIBS ${LIBS} ${CCFITS_LIBRARIES})
- ADD_DEFINITIONS(-DHAVE_CCFITS)
-ELSE()
- message(WARNING "CCfits not found! Building without FITS support!")
+IF(USE_FITS)
+ FIND_PACKAGE(CCfits REQUIRED)
+ IF(CCFITS_FOUND)
+ INCLUDE_DIRECTORIES(${CCFITS_INCLUDE_DIRS})
+ SET(LIBS ${LIBS} ${CCFITS_LIBRARIES})
+ ADD_DEFINITIONS(-DHAVE_CCFITS)
+ ELSE()
+ MESSAGE(FATAL_ERROR "CCfits not found!")
+ ENDIF()
ENDIF()
SET(LIBS ${LIBS} ${OPENEXR_LIBRARIES})
1.1
media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtquick.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtquick.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtquick.patch?rev=1.1&content-type=text/plain
Index: luminance-hdr-2.4.0-qtquick.patch
===================================================================
Gentoo has a Qt5Quick cmake module instead of a Qt5Declarative one.
--- luminance-hdr-2.4.0/CMakeLists.txt
+++ luminance-hdr-2.4.0/CMakeLists.txt
@@ -22,7 +22,7 @@
find_package(Qt5Concurrent REQUIRED)
find_package(Qt5Widgets REQUIRED)
find_package(Qt5Gui REQUIRED)
-find_package(Qt5Declarative REQUIRED)
+find_package(Qt5Quick REQUIRED)
find_package(Qt5WebKit REQUIRED)
find_package(Qt5WebKitWidgets REQUIRED)
find_package(Qt5Xml REQUIRED)
1.1
media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtprinter.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtprinter.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/luminance-hdr/files/luminance-hdr-2.4.0-qtprinter.patch?rev=1.1&content-type=text/plain
Index: luminance-hdr-2.4.0-qtprinter.patch
===================================================================
>From 07e36ef892343b01bf13545866823e6a55044382 Mon Sep 17 00:00:00 2001
From: Davide Anastasia <[email protected]>
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"
--
2.2.2
