Date: Fri, 4 Jul 2008 01:00:21 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/125234: Update port: graphics/qtpfsgui to 1.9.2 Message-ID: <20080704010021.f32192bd.tkato432@yahoo.com> Resent-Message-ID: <200807031610.m63GA3Uq029211@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125234
>Category: ports
>Synopsis: Update port: graphics/qtpfsgui to 1.9.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 03 16:10:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 6.3-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.9.2
New file:
files/patch-src__HdrCreation__HdrCreationManager.cpp
files/patch-src__TM_operators__mantiuk06__contrast_domain.cpp
Remove file:
files/patch-project.pro
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/qtpfsgui/Makefile graphics/qtpfsgui/Makefile
--- /usr/ports/graphics/qtpfsgui/Makefile 2008-06-07 00:23:40.000000000 +0900
+++ graphics/qtpfsgui/Makefile 2008-07-03 21:36:22.000000000 +0900
@@ -6,54 +6,48 @@
#
PORTNAME= qtpfsgui
-PORTVERSION= 1.9.1
-PORTREVISION= 2
+PORTVERSION= 1.9.2
CATEGORIES= graphics
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A graphical user interface that provides a workflow for HDR imaging
+BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
LIB_DEPENDS= exiv2.3:${PORTSDIR}/graphics/exiv2 \
- fftw3f.4:${PORTSDIR}/math/fftw3-float \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
tiff.4:${PORTSDIR}/graphics/tiff \
- jpeg.9:${PORTSDIR}/graphics/jpeg
-BUILD_DEPENDS= qmake-qt4:${PORTSDIR}/devel/qmake4 \
- uic-qt4:${PORTSDIR}/devel/qt4-uic \
- rcc:${PORTSDIR}/devel/qt4-rcc \
- moc-qt4:${PORTSDIR}/devel/qt4-moc \
- lrelease-qt4:${PORTSDIR}/devel/qt4-linguist \
- ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
+ fftw3f.4:${PORTSDIR}/math/fftw3-float
USE_QT_VER= 4
-QT_COMPONENTS= corelib gui imageformats
+QT_COMPONENTS= corelib gui imageformats \
+ linguist_build moc_build qmake_build rcc_build uic_build
LRELEASE= ${QT_PREFIX}/bin/lrelease-qt4
-INSTALL_TARGET= install_target install_menu install_icon
-.if !defined(WITHOUT_NLS)
-PLIST_SUB+= NLS=""
-INSTALL_TARGET+=install_i18n
-.else
-PLIST_SUB+= NLS="@comment "
-.endif
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET+=install_docs install_htmls
-.endif
-
post-patch:
- ${REINPLACE_CMD} -e 's|PREFIX = /usr/local|PREFIX = ${PREFIX}|g' \
- ${WRKSRC}/project.pro
-
-pre-build:
- @${LRELEASE} ${BUILD_WRKSRC}/project.pro
- @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} -spec ${QMAKESPEC}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 600000
-BROKEN= Does not compile (compiler segfault)
+ @${REINPLACE_CMD} '/^QMAKE_CXXFLAGS/d ; \
+ /^INSTALLS/s|docs||g' ${WRKSRC}/project.pro
+.for file in src/MainWindow/mainWindow.cpp \
+ src/Preferences/preferencesDialog.cpp \
+ src/TransplantExif/transplant.cpp
+ @${REINPLACE_CMD} -e 's|/usr/local/share/qtpfsgui/|${DATADIR}/|g' \
+ ${WRKSRC}/${file}
+.endfor
+
+do-configure:
+ @${LRELEASE} ${WRKSRC}/project.pro
+ @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -spec ${QMAKESPEC}
+
+post-install:
+ @${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/qtpfsgui.png \
+ ${PREFIX}/share/pixmaps/qtpfsgui.png
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for file in AUTHORS Changelog README TODO
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/graphics/qtpfsgui/distinfo graphics/qtpfsgui/distinfo
--- /usr/ports/graphics/qtpfsgui/distinfo 2008-03-18 15:27:07.000000000 +0900
+++ graphics/qtpfsgui/distinfo 2008-07-02 02:40:52.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (qtpfsgui-1.9.1.tar.gz) = ab95c404992a666681434ae57983b295
-SHA256 (qtpfsgui-1.9.1.tar.gz) = 8d94afd824b005959a7222ab6c7ca371167b2a61fbbc3282b6a20f97ea63645c
-SIZE (qtpfsgui-1.9.1.tar.gz) = 1178024
+MD5 (qtpfsgui-1.9.2.tar.gz) = 8a037c1dc75f04752dc36a59e7237fc4
+SHA256 (qtpfsgui-1.9.2.tar.gz) = 4462ec3ea8cf17db7b1ebe624d378bf4e239b80e0de2b2c6bbdf8c00cce16c8e
+SIZE (qtpfsgui-1.9.2.tar.gz) = 1181880
diff -urN /usr/ports/graphics/qtpfsgui/files/patch-project.pro graphics/qtpfsgui/files/patch-project.pro
--- /usr/ports/graphics/qtpfsgui/files/patch-project.pro 2008-03-18 15:27:07.000000000 +0900
+++ graphics/qtpfsgui/files/patch-project.pro 1970-01-01 09:00:00.000000000 +0900
@@ -1,28 +0,0 @@
---- project.pro.orig 2008-02-16 11:43:24.000000000 +0100
-+++ project.pro 2008-03-17 17:18:14.000000000 +0100
-@@ -298,13 +298,13 @@
- menu.files = qtpfsgui.desktop
- menu.path = $${PREFIX}/share/applications
- icon.files = images/qtpfsgui.png
--icon.path = $${PREFIX}/share/icons/hicolor/48x48/apps
-+icon.path = $${PREFIX}/share/pixmaps
- htmls.files = html
--htmls.path = $${PREFIX}/share/qtpfsgui
-+htmls.path = $${PREFIX}/share/doc/qtpfsgui
- i18n.files = i18n/lang_de.qm i18n/lang_es.qm i18n/lang_it.qm i18n/lang_fr.qm i18n/lang_pl.qm i18n/lang_tr.qm i18n/lang_ru.qm i18n/lang_cs.qm
- i18n.path = $$I18NDIR
- docs.files = README LICENSE AUTHORS INSTALL Changelog
--docs.path = $${PREFIX}/share/qtpfsgui
-+docs.path = $${PREFIX}/share/doc/qtpfsgui
-
- INSTALLS += target menu icon htmls i18n docs
- message ( "" )
-@@ -320,7 +320,7 @@
- message ("qtpfsgui ==> $$target.path")
- message ("qtpfsgui.desktop ==> $$menu.path")
- message ("qtpfsgui.png ==> $$icon.path")
--message ("html and docs ==> $$htmls.path")
-+message ("html ==> $$docs.path")
- message ("i18n messages ==> $$i18n.path")
- message ("********************************************************************")
-
diff -urN /usr/ports/graphics/qtpfsgui/files/patch-src__HdrCreation__HdrCreationManager.cpp graphics/qtpfsgui/files/patch-src__HdrCreation__HdrCreationManager.cpp
--- /usr/ports/graphics/qtpfsgui/files/patch-src__HdrCreation__HdrCreationManager.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/qtpfsgui/files/patch-src__HdrCreation__HdrCreationManager.cpp 2008-07-02 03:26:53.000000000 +0900
@@ -0,0 +1,10 @@
+--- src/HdrCreation/HdrCreationManager.cpp.prig 2008-04-29 01:18:04.000000000 +0900
++++ src/HdrCreation/HdrCreationManager.cpp 2008-07-02 03:26:00.000000000 +0900
+@@ -28,6 +28,7 @@
+ #include "../Exif/exif_operations.h"
+ #include "mtb_alignment.h"
+ #include "../Threads/hdrInputLoader.h"
++#include "../arch/freebsd/math.h"
+
+ HdrCreationManager::HdrCreationManager() {
+ qtpfsgui_options=QtpfsguiOptions::getInstance();
diff -urN /usr/ports/graphics/qtpfsgui/files/patch-src__TM_operators__mantiuk06__contrast_domain.cpp graphics/qtpfsgui/files/patch-src__TM_operators__mantiuk06__contrast_domain.cpp
--- /usr/ports/graphics/qtpfsgui/files/patch-src__TM_operators__mantiuk06__contrast_domain.cpp 1970-01-01 09:00:00.000000000 +0900
+++ graphics/qtpfsgui/files/patch-src__TM_operators__mantiuk06__contrast_domain.cpp 2008-07-02 03:14:11.000000000 +0900
@@ -0,0 +1,11 @@
+--- src/TM_operators/mantiuk06/contrast_domain.cpp.orig 2008-04-29 01:15:22.000000000 +0900
++++ src/TM_operators/mantiuk06/contrast_domain.cpp 2008-07-02 03:13:31.000000000 +0900
+@@ -41,7 +41,7 @@
+ #include <string.h>
+ #include <math.h>
+
+-#ifdef WIN32
++#if defined(WIN32) || defined(__FreeBSD__)
+ #define exp10f( x ) exp( x * log (10))
+ #endif
+
diff -urN /usr/ports/graphics/qtpfsgui/pkg-plist graphics/qtpfsgui/pkg-plist
--- /usr/ports/graphics/qtpfsgui/pkg-plist 2008-03-18 15:27:07.000000000 +0900
+++ graphics/qtpfsgui/pkg-plist 2008-07-02 03:43:37.000000000 +0900
@@ -1,37 +1,41 @@
bin/qtpfsgui
share/applications/qtpfsgui.desktop
-share/pixmaps/qtpfsgui.png
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/Changelog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/html/dcraw.html
-%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/html/hints.html
-%%PORTDOCS%%%%DOCSDIR%%/html/images/batch-1.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/copy_exif.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/mainwin.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/projectiveTransformationDialog.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/raw_conversion.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/resize.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/snap-qt4_4.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/snap-qt4_5.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/snap-qt4_6.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/tonemapdialog.jpeg
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
-%%NLS%%%%DATADIR%%/i18n/lang_de.qm
-%%NLS%%%%DATADIR%%/i18n/lang_es.qm
-%%NLS%%%%DATADIR%%/i18n/lang_it.qm
-%%NLS%%%%DATADIR%%/i18n/lang_fr.qm
-%%NLS%%%%DATADIR%%/i18n/lang_pl.qm
-%%NLS%%%%DATADIR%%/i18n/lang_tr.qm
-%%NLS%%%%DATADIR%%/i18n/lang_ru.qm
-%%NLS%%%%DATADIR%%/i18n/lang_cs.qm
-%%NLS%%@dirrm %%DATADIR%%/i18n
-%%NLS%%@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+share/icons/hicolor/48x48/apps/qtpfsgui.png
+share/pixmaps/qtpfsgui.png
+%%DATADIR%%/html/dcraw.html
+%%DATADIR%%/html/faq.html
+%%DATADIR%%/html/hints.html
+%%DATADIR%%/html/images/batch-1.jpg
+%%DATADIR%%/html/images/copy_exif.jpeg
+%%DATADIR%%/html/images/mainwin.jpeg
+%%DATADIR%%/html/images/projectiveTransformationDialog.jpeg
+%%DATADIR%%/html/images/raw_conversion.jpg
+%%DATADIR%%/html/images/resize.jpeg
+%%DATADIR%%/html/images/snap-qt4_4.jpeg
+%%DATADIR%%/html/images/snap-qt4_5.jpeg
+%%DATADIR%%/html/images/snap-qt4_6.jpeg
+%%DATADIR%%/html/images/tonemapdialog.jpeg
+%%DATADIR%%/html/index.html
+%%DATADIR%%/html/manual.html
+%%DATADIR%%/i18n/lang_cs.qm
+%%DATADIR%%/i18n/lang_de.qm
+%%DATADIR%%/i18n/lang_es.qm
+%%DATADIR%%/i18n/lang_fr.qm
+%%DATADIR%%/i18n/lang_it.qm
+%%DATADIR%%/i18n/lang_pl.qm
+%%DATADIR%%/i18n/lang_ru.qm
+%%DATADIR%%/i18n/lang_tr.qm
+@dirrm %%DATADIR%%/html/images
+@dirrm %%DATADIR%%/html
+@dirrm %%DATADIR%%/i18n
+@dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080704010021.f32192bd.tkato432>