Index: head/graphics/luminance-qt5/Makefile =================================================================== --- head/graphics/luminance-qt5/Makefile (revision 371491) +++ head/graphics/luminance-qt5/Makefile (revision 371492) @@ -1,63 +1,64 @@ # Created by: Yinghong Liu # $FreeBSD$ PORTNAME= luminance-hdr DISTVERSION= 2.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/qtpfsgui/luminance/${DISTVERSION} PKGNAMESUFFIX= -qt5 MAINTAINER= h2+fbsdports@fsfe.org COMMENT= Complete open source solution for HDR photography LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 LIB_DEPENDS= libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libtiff.so:${PORTSDIR}/graphics/tiff \ libgsl.so:${PORTSDIR}/math/gsl \ libraw_r.so:${PORTSDIR}/graphics/libraw \ libboost_system.so:${PORTSDIR}/devel/boost-libs -USES= cmake:outsource tar:bzip2 -USE_QT5= buildtools_build gui sql webkit xml linguist_build \ - imageformats_run concurrent qmake_build +USES= cmake:outsource pkgconfig tar:bzip2 +USE_QT5= concurrent declarative gui printsupport sql webkit xml \ + buildtools_build linguist_build qmake_build \ + imageformats_run INSTALLS_ICONS= yes MAKE_JOBS_UNSAFE=yes CONFLICTS_INSTALL= luminance-hdr-[0-9]* OPTIONS_DEFINE= DOCS .include .if ${OSVERSION} < 1000024 USE_GCC= yes .endif post-patch: # Do not install yet another copy of GPL (we use license framework instead) # and fix installation path for docs (but not for internal help files) @${REINPLACE_CMD} -e '/LICENSE/d ; \ /#info files/s,share/luminance-hdr,${DOCSDIR_REL},' \ ${WRKSRC}/CMakeLists.txt # Point to the right location for program where to look for GPL text @${REINPLACE_CMD} -e 's,LICENSE,${LICENSE}, ; \ s,share/doc/luminance-hdr,share/licenses/${PKGNAME},' \ ${WRKSRC}/src/UI/UMessageBox.cpp # Allow builds from release distfile to display correct git hash in "About" # dialog window @${REINPLACE_CMD} -e \ 's,@GIT_SHA1@,be5409f2ed028b0a509d3f4cd44a970a09d2ef6c,' \ ${WRKSRC}/src/Common/GitSHA1.cpp.in pre-install: QT_BINDIR_REL=bin .include Index: head/graphics/luminance-qt5/files/patch-git_07e36ef8 =================================================================== --- head/graphics/luminance-qt5/files/patch-git_07e36ef8 (nonexistent) +++ head/graphics/luminance-qt5/files/patch-git_07e36ef8 (revision 371492) @@ -0,0 +1,87 @@ +This is a bug fix commit required to make the port work correctly with Qt 5.3. + +commit 07e36ef892343b01bf13545866823e6a55044382 +Author: Davide Anastasia +Date: Mon Sep 29 08:06:15 2014 +0100 + + Fix QPrinter support + +--- CMakeLists.txt ++++ 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 +--- src/HelpBrowser/CMakeLists.txt ++++ 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) +--- src/HelpBrowser/helpbrowser.cpp ++++ 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 + #include + #include + #include +@@ -45,8 +46,6 @@ for which a new license (GPL+exception) is in place. + #include + #include + #include +-#include +-#include + #include + #include + #include +@@ -56,7 +55,10 @@ for which a new license (GPL+exception) is in place. + #include + #include + +-#include ++#include ++#include ++ ++ + + #include "Common/global.h" + #include "HelpBrowser/schelptreemodel.h" Property changes on: head/graphics/luminance-qt5/files/patch-git_07e36ef8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property