svn commit: r304492 - in head: astro/libkgeomap graphics/digikam-kde4 graphics/digikam-kde4/files graphics/kipi-plugins-kde4 graphics/libkface net/libkvkontakte net/libmediawiki
Jason E. Hale
jhale at FreeBSD.org
Wed Sep 19 08:15:16 UTC 2012
Author: jhale
Date: Wed Sep 19 08:15:15 2012
New Revision: 304492
URL: http://svn.freebsd.org/changeset/ports/304492
Log:
- Update Digikam SC to 2.9.0
- Add patch to fix Digikam crashes with large photo collections
Approved by: makc (mentor)
Added:
head/graphics/digikam-kde4/Makefile.common (contents, props changed)
head/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp (contents, props changed)
Deleted:
head/astro/libkgeomap/distinfo
head/graphics/digikam-kde4/pkg-message
head/graphics/kipi-plugins-kde4/distinfo
head/graphics/libkface/distinfo
head/net/libkvkontakte/distinfo
head/net/libmediawiki/distinfo
Modified:
head/astro/libkgeomap/Makefile
head/astro/libkgeomap/pkg-plist (contents, props changed)
head/graphics/digikam-kde4/Makefile
head/graphics/digikam-kde4/distinfo (contents, props changed)
head/graphics/kipi-plugins-kde4/Makefile
head/graphics/kipi-plugins-kde4/pkg-plist (contents, props changed)
head/graphics/libkface/Makefile
head/net/libkvkontakte/Makefile
head/net/libmediawiki/Makefile
Modified: head/astro/libkgeomap/Makefile
==============================================================================
--- head/astro/libkgeomap/Makefile Wed Sep 19 08:14:10 2012 (r304491)
+++ head/astro/libkgeomap/Makefile Wed Sep 19 08:15:15 2012 (r304492)
@@ -6,26 +6,15 @@
#
PORTNAME= libkgeomap
-PORTVERSION= 2.7.0
+PORTVERSION= ${DIGIKAM_VER}
CATEGORIES= astro kde
-MASTER_SITES= SF/digikam/digikam/${PORTVERSION}
-DISTNAME= digikam-${PORTVERSION}
MAINTAINER= kde at FreeBSD.org
COMMENT= KDE4 library for browsing photos on a map
-LICENSE= GPLv2
+.include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common"
-OPTIONS_DEFINE= NLS
-
-USE_BZIP2= yes
-USE_CMAKE= yes
-USE_KDE4= automoc4 kdehier kdeprefix kdelibs libkexiv2 marble
-USE_QT4= qmake_build moc_build rcc_build uic_build
-USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME}
+USE_KDE4+= libkexiv2 marble
.include <bsd.port.options.mk>
Modified: head/astro/libkgeomap/pkg-plist
==============================================================================
--- head/astro/libkgeomap/pkg-plist Wed Sep 19 08:14:10 2012 (r304491)
+++ head/astro/libkgeomap/pkg-plist Wed Sep 19 08:15:15 2012 (r304492)
@@ -64,6 +64,7 @@ share/apps/libkgeomap/marker-icon-16x16.
%%NLS%%share/locale/fi/LC_MESSAGES/libkgeomap.mo
%%NLS%%share/locale/fr/LC_MESSAGES/libkgeomap.mo
%%NLS%%share/locale/ga/LC_MESSAGES/libkgeomap.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/libkgeomap.mo
%%NLS%%share/locale/hu/LC_MESSAGES/libkgeomap.mo
%%NLS%%share/locale/it/LC_MESSAGES/libkgeomap.mo
%%NLS%%share/locale/ja/LC_MESSAGES/libkgeomap.mo
Modified: head/graphics/digikam-kde4/Makefile
==============================================================================
--- head/graphics/digikam-kde4/Makefile Wed Sep 19 08:14:10 2012 (r304491)
+++ head/graphics/digikam-kde4/Makefile Wed Sep 19 08:15:15 2012 (r304492)
@@ -6,15 +6,14 @@
#
PORTNAME= digikam
-PORTVERSION= 2.7.0
+PORTVERSION= ${DIGIKAM_VER}
PORTEPOCH= 1
CATEGORIES= graphics kde
-MASTER_SITES= SF
MAINTAINER= kde at FreeBSD.org
-COMMENT= An advanced digital photo management application for KDE4
+COMMENT= KDE4 digital photo management application
-LICENSE= GPLv2
+.include "${.CURDIR}/Makefile.common"
LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \
lcms:${PORTSDIR}/graphics/lcms \
@@ -35,13 +34,9 @@ NO_OPTIONS_SORT= yes
GPHOTO2_DESC= Enable gphoto2 camera support
PIMLIBS_DESC= Enable address book support
-MAKE_JOBS_SAFE= yes
-USE_BZIP2= yes
-USE_KDE4= automoc4 kdehier kdeprefix kdelibs libkdcraw libkexiv2 libkipi
-USE_QT4= sql-sqlite3_run \
- qmake_build moc_build rcc_build uic_build
-USE_CMAKE= yes
-USE_LDCONFIG= yes
+USE_PKGCONFIG= build
+USE_KDE4+= libkdcraw libkexiv2 libkipi
+USE_QT4+= sql-sqlite3_run
MAN1= digitaglinktree.1 \
cleanup_digikamdb.1
@@ -86,7 +81,4 @@ post-patch:
${LN} -s ../po ${WRKSRC}/po
${RM} ${WRKSRC}/po/*/libkgeomap.po ${WRKSRC}/po/*/kipi*
-post-install:
- @${CAT} ${PKGMESSAGE}
-
.include <bsd.port.mk>
Added: head/graphics/digikam-kde4/Makefile.common
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/digikam-kde4/Makefile.common Wed Sep 19 08:15:15 2012 (r304492)
@@ -0,0 +1,26 @@
+# $FreeBSD$
+#
+# Make sure when DIGIKAM_VER is updated that the following ports are updated:
+# astro/libkgeomap
+# graphics/digikam-kde4
+# graphics/kipi-plugins-kde4
+# graphics/libkface
+# net/libkvkontakte
+# net/libmediawiki
+
+DIGIKAM_VER= 2.9.0
+MASTER_SITES= SF/digikam/digikam/${DIGIKAM_VER}
+DISTNAME= digikam-${DIGIKAM_VER}
+
+LICENSE?= GPLv2
+
+USE_BZIP2= yes
+USE_CMAKE= yes
+USE_KDE4+= automoc4 kdehier kdeprefix kdelibs
+USE_QT4+= qmake_build moc_build rcc_build uic_build
+USE_LDCONFIG= yes
+MAKE_JOBS_SAFE= yes
+
+WRKSRC?= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME}
+
+DISTINFO_FILE= ${.CURDIR}/../../graphics/digikam-kde4/distinfo
Modified: head/graphics/digikam-kde4/distinfo
==============================================================================
--- head/graphics/digikam-kde4/distinfo Wed Sep 19 08:14:10 2012 (r304491)
+++ head/graphics/digikam-kde4/distinfo Wed Sep 19 08:15:15 2012 (r304492)
@@ -1,2 +1,2 @@
-SHA256 (digikam-2.7.0.tar.bz2) = 2782b0f047cd0ae58af04095e2d03ea4a9d621fbef9d385f1465851fb62f5bab
-SIZE (digikam-2.7.0.tar.bz2) = 55696444
+SHA256 (digikam-2.9.0.tar.bz2) = 73dd0f3820fc44bba7b72c98cab73d0391e98687674da8be11ff07590c703ba0
+SIZE (digikam-2.9.0.tar.bz2) = 56765772
Added: head/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/digikam-kde4/files/patch-digikam__album__albumwatch.cpp Wed Sep 19 08:15:15 2012 (r304492)
@@ -0,0 +1,11 @@
+--- ./digikam/album/albumwatch.cpp.orig 2012-09-05 19:38:42.000000000 -0400
++++ ./digikam/album/albumwatch.cpp 2012-09-05 19:40:59.000000000 -0400
+@@ -221,7 +221,7 @@
+ #ifdef Q_WS_MAC
+ d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly);
+ #else
+- d->dirWatch->addDir(dir, KDirWatch::WatchFiles | KDirWatch::WatchDirOnly);
++ d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly);
+ #endif
+ }
+ }
Modified: head/graphics/kipi-plugins-kde4/Makefile
==============================================================================
--- head/graphics/kipi-plugins-kde4/Makefile Wed Sep 19 08:14:10 2012 (r304491)
+++ head/graphics/kipi-plugins-kde4/Makefile Wed Sep 19 08:15:15 2012 (r304492)
@@ -6,16 +6,14 @@
#
PORTNAME= kipi-plugins
-PORTVERSION= 2.7.0
+PORTVERSION= ${DIGIKAM_VER}
PORTEPOCH= 1
CATEGORIES= graphics kde
-MASTER_SITES= SF/digikam/digikam/${PORTVERSION}
-DISTNAME= digikam-${PORTVERSION}
MAINTAINER= kde at FreeBSD.org
COMMENT= KDE4 kipi graphics plugins
-LICENSE= GPLv2
+.include "${.CURDIR}/../digikam-kde4/Makefile.common"
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
qjson:${PORTSDIR}/devel/qjson
@@ -36,18 +34,12 @@ MEDIAWIKI_DESC= Enable MediaWiki plugin
OPENCV_DESC= Enable Red Eye Removal plugin
PIMLIBS_DESC= Enable Calendar plugins
-USE_BZIP2= yes
-USE_CMAKE= yes
+USE_PKGCONFIG= build
USE_GL= glu
-USE_KDE4= automoc4 kdehier kdeprefix kdelibs libkdcraw libkexiv2 libkipi
-USE_QT4= qmake_build moc_build rcc_build uic_build
-USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
+USE_KDE4+= libkdcraw libkexiv2 libkipi
CMAKE_ARGS= -DCMAKE_PREFIX_PATH:PATH=${KDE4_PREFIX}
-WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME}
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
Modified: head/graphics/kipi-plugins-kde4/pkg-plist
==============================================================================
--- head/graphics/kipi-plugins-kde4/pkg-plist Wed Sep 19 08:14:10 2012 (r304491)
+++ head/graphics/kipi-plugins-kde4/pkg-plist Wed Sep 19 08:15:15 2012 (r304492)
@@ -177,8 +177,15 @@ share/apps/kipiplugin_printimages/templa
%%OPENCV%%share/apps/kipiplugin_removeredeyes/removeredeyes_classifier_eye_20_20.xml
share/apps/photolayoutseditor/photolayoutseditorui.rc
share/config.kcfg/PLEConfigSkeleton.kcfgc
-share/doc/HTML/en/kipi-plugins/acquire-savetargetpreview.png
-share/doc/HTML/en/kipi-plugins/acquire-screenshotpreview.png
+share/doc/HTML/en/kipi-plugins/acquire-final-button.png
+share/doc/HTML/en/kipi-plugins/acquire-main-window.png
+share/doc/HTML/en/kipi-plugins/acquire-multiple-selections.png
+share/doc/HTML/en/kipi-plugins/acquire-no-scanner-found.png
+share/doc/HTML/en/kipi-plugins/acquire-other-options.png
+share/doc/HTML/en/kipi-plugins/acquire-preview-button.png
+share/doc/HTML/en/kipi-plugins/acquire-scanning.png
+share/doc/HTML/en/kipi-plugins/acquire-zoom-in.png
+share/doc/HTML/en/kipi-plugins/acquire-zoom-to-fit.png
share/doc/HTML/en/kipi-plugins/acquireimages.docbook
share/doc/HTML/en/kipi-plugins/colorimages.docbook
share/doc/HTML/en/kipi-plugins/common
@@ -679,14 +686,32 @@ share/kde4/servicetypes/photolayoutsedit
%%NLS%%share/locale/eu/LC_MESSAGES/kipiplugin_smug.mo
%%NLS%%share/locale/eu/LC_MESSAGES/kipiplugin_timeadjust.mo
%%NLS%%share/locale/eu/LC_MESSAGES/kipiplugins.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_acquireimages.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_advancedslideshow.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_batchprocessimages.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_calendar.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_dngconverter.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_expoblending.mo
%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_facebook.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_flashexport.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_flickrexport.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_galleryexport.mo
%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_gpssync.mo
%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_htmlexport.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_imageviewer.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_ipodexport.mo
%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_jpeglossless.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_kioexportimport.mo
%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_metadataedit.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_picasawebexport.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_piwigoexport.mo
%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_printimages.mo
%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_rawconverter.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_removeredeyes.mo
%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_sendimages.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_shwup.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_smug.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugin_timeadjust.mo
%%NLS%%share/locale/fi/LC_MESSAGES/kipiplugins.mo
%%NLS%%share/locale/fr/LC_MESSAGES/kipiplugin_acquireimages.mo
%%NLS%%share/locale/fr/LC_MESSAGES/kipiplugin_advancedslideshow.mo
@@ -807,6 +832,7 @@ share/kde4/servicetypes/photolayoutsedit
%%NLS%%share/locale/hr/LC_MESSAGES/kipiplugin_timeadjust.mo
%%NLS%%share/locale/hr/LC_MESSAGES/kipiplugins.mo
%%NLS%%share/locale/hu/LC_MESSAGES/kipiplugin_facebook.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kipiplugin_htmlexport.mo
%%NLS%%share/locale/hu/LC_MESSAGES/kipiplugin_imageviewer.mo
%%NLS%%share/locale/hu/LC_MESSAGES/kipiplugins.mo
%%NLS%%share/locale/is/LC_MESSAGES/kipiplugin_acquireimages.mo
@@ -1256,6 +1282,7 @@ share/kde4/servicetypes/photolayoutsedit
%%NLS%%share/locale/sl/LC_MESSAGES/kipiplugin_advancedslideshow.mo
%%NLS%%share/locale/sl/LC_MESSAGES/kipiplugin_calendar.mo
%%NLS%%share/locale/sl/LC_MESSAGES/kipiplugin_dngconverter.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/kipiplugin_facebook.mo
%%NLS%%share/locale/sl/LC_MESSAGES/kipiplugins.mo
%%NLS%%share/locale/sq/LC_MESSAGES/kipiplugin_acquireimages.mo
%%NLS%%share/locale/sq/LC_MESSAGES/kipiplugin_batchprocessimages.mo
Modified: head/graphics/libkface/Makefile
==============================================================================
--- head/graphics/libkface/Makefile Wed Sep 19 08:14:10 2012 (r304491)
+++ head/graphics/libkface/Makefile Wed Sep 19 08:15:15 2012 (r304492)
@@ -6,27 +6,16 @@
#
PORTNAME= libkface
-PORTVERSION= 2.7.0
+PORTVERSION= ${DIGIKAM_VER}
CATEGORIES= graphics kde
-MASTER_SITES= SF/digikam/digikam/${PORTVERSION}
-DISTNAME= digikam-${PORTVERSION}
MAINTAINER= kde at FreeBSD.org
COMMENT= KDE4 library for face recognition
-LICENSE= GPLv2
+.include "${.CURDIR}/../digikam-kde4/Makefile.common"
LIB_DEPENDS= opencv_legacy:${PORTSDIR}/graphics/opencv
-USE_BZIP2= yes
-USE_CMAKE= yes
-USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-USE_QT4= qmake_build moc_build rcc_build uic_build
-USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME}
-
post-patch:
${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
${WRKSRC}/CMakeLists.txt
Modified: head/net/libkvkontakte/Makefile
==============================================================================
--- head/net/libkvkontakte/Makefile Wed Sep 19 08:14:10 2012 (r304491)
+++ head/net/libkvkontakte/Makefile Wed Sep 19 08:15:15 2012 (r304492)
@@ -6,25 +6,14 @@
#
PORTNAME= libkvkontakte
-PORTVERSION= 2.7.0
+PORTVERSION= ${DIGIKAM_VER}
CATEGORIES= net kde
-MASTER_SITES= SF/digikam/digikam/${PORTVERSION}
-DISTNAME= digikam-${PORTVERSION}
MAINTAINER= kde at FreeBSD.org
COMMENT= KDE4 library for accessing vk.com
-LICENSE= GPLv2
+.include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common"
LIB_DEPENDS= qjson:${PORTSDIR}/devel/qjson
-USE_BZIP2= yes
-USE_CMAKE= yes
-USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-USE_QT4= qmake_build moc_build rcc_build uic_build
-USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME}
-
.include <bsd.port.mk>
Modified: head/net/libmediawiki/Makefile
==============================================================================
--- head/net/libmediawiki/Makefile Wed Sep 19 08:14:10 2012 (r304491)
+++ head/net/libmediawiki/Makefile Wed Sep 19 08:15:15 2012 (r304492)
@@ -6,24 +6,13 @@
#
PORTNAME= libmediawiki
-PORTVERSION= 2.7.0
+PORTVERSION= ${DIGIKAM_VER}
CATEGORIES= net kde
-MASTER_SITES= SF/digikam/digikam/${PORTVERSION}
-DISTNAME= digikam-${PORTVERSION}
MAINTAINER= kde at FreeBSD.org
COMMENT= KDE4 library for accessing MediaWiki sites
-LICENSE= GPLv2
-
-USE_BZIP2= yes
-USE_CMAKE= yes
-USE_KDE4= automoc4 kdehier kdeprefix kdelibs
-USE_QT4= qmake_build moc_build rcc_build uic_build
-USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/extra/${PORTNAME}
+.include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common"
post-patch:
${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \
More information about the svn-ports-head
mailing list