diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/digikam/Makefile | 12 | ||||
| -rw-r--r-- | graphics/digikam/PLIST | 95 | ||||
| -rw-r--r-- | graphics/digikam/distinfo | 10 | ||||
| -rw-r--r-- | graphics/digikam/patches/patch-aa | 32 | ||||
| -rw-r--r-- | graphics/digikam/patches/patch-ab | 16 |
5 files changed, 29 insertions, 136 deletions
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index a4f6afd04b5..6b2d09cccb0 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.40 2008/01/18 05:06:38 tnn Exp $ +# $NetBSD: Makefile,v 1.41 2008/11/10 09:26:52 wiz Exp $ -DISTNAME= digikam-0.9.3 -PKGREVISION= 2 +DISTNAME= digikam-0.9.5-beta1 +PKGNAME= digikam-0.9.5beta1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=digikam/} EXTRACT_SUFX= .tar.bz2 @@ -15,15 +15,19 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --without-included-sqlite3 + REPLACE_PERL+= digikam/utilities/scripts/digitaglinktree BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2 BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.5.2 BUILDLINK_API_DEPENDS.libkexiv2+= libkexiv2>=0.1.6 -BUILDLINK_API_DEPENDS.libkdcraw+= libkdcraw>=0.1.2 +BUILDLINK_API_DEPENDS.libkdcraw+= libkdcraw>=0.1.6 BUILDLINK_DEPMETHOD.libXt?= build +PLIST_SUBST= HTMLDIR=${DISTNAME} + .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" diff --git a/graphics/digikam/PLIST b/graphics/digikam/PLIST index 91a5d9e2a61..caf035953a8 100644 --- a/graphics/digikam/PLIST +++ b/graphics/digikam/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2008/01/14 23:19:52 wiz Exp $ +@comment $NetBSD: PLIST,v 1.17 2008/11/10 09:26:52 wiz Exp $ bin/digikam bin/digikamthemedesigner bin/digitaglinktree @@ -7,7 +7,6 @@ include/digikam/bcgmodifier.h include/digikam/cietonguewidget.h include/digikam/colorgradientwidget.h include/digikam/colormodifier.h -include/digikam/ctrlpaneldlg.h include/digikam/curveswidget.h include/digikam/dcolor.h include/digikam/dcolorblend.h @@ -34,14 +33,13 @@ include/digikam/iccprofileinfodlg.h include/digikam/iccprofilewidget.h include/digikam/icctransform.h include/digikam/imagecurves.h -include/digikam/imagedlgbase.h -include/digikam/imageguidedlg.h +include/digikam/imagedialog.h include/digikam/imageguidewidget.h include/digikam/imagehistogram.h include/digikam/imageiface.h include/digikam/imagelevels.h +include/digikam/imagepanelwidget.h include/digikam/imagepaniconwidget.h -include/digikam/imagepannelwidget.h include/digikam/imageplugin.h include/digikam/imageregionwidget.h include/digikam/imagewidget.h @@ -49,9 +47,11 @@ include/digikam/listboxpreviewitem.h include/digikam/paniconwidget.h include/digikam/photoinfocontainer.h include/digikam/previewwidget.h +include/digikam/rawcameradlg.h include/digikam/searchtextbar.h include/digikam/sidebar.h include/digikam/squeezedcombobox.h +include/digikam/statusled.h include/digikam/statusnavigatebar.h include/digikam/statusprogressbar.h include/digikam/statuszoombar.h @@ -132,6 +132,7 @@ share/kde/apps/digikam/about/main.html share/kde/apps/digikam/about/top-left.png share/kde/apps/digikam/about/top-middle.png share/kde/apps/digikam/about/top-right-digikam.png +share/kde/apps/digikam/data/banner-digikam.png share/kde/apps/digikam/data/bluejean-texture.png share/kde/apps/digikam/data/bothhorz.png share/kde/apps/digikam/data/bothvert.png @@ -159,9 +160,11 @@ share/kde/apps/digikam/data/histogram-log.png share/kde/apps/digikam/data/ice-pattern.png share/kde/apps/digikam/data/image-full.png share/kde/apps/digikam/data/image-selection.png +share/kde/apps/digikam/data/indicator-gray.png +share/kde/apps/digikam/data/indicator-green.png +share/kde/apps/digikam/data/indicator-red.png share/kde/apps/digikam/data/leaf-pattern.png share/kde/apps/digikam/data/logo-cimg.png -share/kde/apps/digikam/data/logo-digikam.png share/kde/apps/digikam/data/logo-exiv2.png share/kde/apps/digikam/data/logo-gphoto.png share/kde/apps/digikam/data/logo-lcms.png @@ -643,64 +646,23 @@ share/kde/apps/digikam/themes/Dreary share/kde/apps/digikam/themes/Gray share/kde/apps/digikam/themes/Marine share/kde/apps/digikam/themes/OrangeCrush +share/kde/apps/digikam/themes/Rose share/kde/apps/digikam/themes/Sandy share/kde/apps/digikam/tips share/kde/apps/digikam/utils/digikam-camera share/kde/apps/konqueror/servicemenus/digikam-download.desktop share/kde/apps/konqueror/servicemenus/digikam-gphoto2-camera.desktop share/kde/apps/konqueror/servicemenus/digikam-mount-and-download.desktop -share/kde/apps/showfoto/icons/crystalsvg/128x128/actions/crop.png -share/kde/apps/showfoto/icons/crystalsvg/128x128/actions/rotate_cw.png -share/kde/apps/showfoto/icons/crystalsvg/16x16/actions/crop.png -share/kde/apps/showfoto/icons/crystalsvg/16x16/actions/rotate_cw.png -share/kde/apps/showfoto/icons/crystalsvg/22x22/actions/crop.png -share/kde/apps/showfoto/icons/crystalsvg/22x22/actions/rotate_cw.png -share/kde/apps/showfoto/icons/crystalsvg/32x32/actions/crop.png -share/kde/apps/showfoto/icons/crystalsvg/32x32/actions/rotate_cw.png -share/kde/apps/showfoto/icons/crystalsvg/48x48/actions/crop.png -share/kde/apps/showfoto/icons/crystalsvg/48x48/actions/rotate_cw.png -share/kde/apps/showfoto/icons/crystalsvg/64x64/actions/crop.png -share/kde/apps/showfoto/icons/crystalsvg/64x64/actions/rotate_cw.png -share/kde/apps/showfoto/icons/crystalsvg/scalable/actions/crop.svgz -share/kde/apps/showfoto/icons/crystalsvg/scalable/actions/rotate_cw.svgz -share/kde/apps/showfoto/icons/hicolor/128x128/actions/flip.png -share/kde/apps/showfoto/icons/hicolor/128x128/actions/histogram.png -share/kde/apps/showfoto/icons/hicolor/128x128/actions/resize_image.png -share/kde/apps/showfoto/icons/hicolor/128x128/actions/slideshow.png share/kde/apps/showfoto/icons/hicolor/128x128/apps/showfoto.png -share/kde/apps/showfoto/icons/hicolor/16x16/actions/flip.png -share/kde/apps/showfoto/icons/hicolor/16x16/actions/histogram.png -share/kde/apps/showfoto/icons/hicolor/16x16/actions/resize_image.png -share/kde/apps/showfoto/icons/hicolor/16x16/actions/slideshow.png share/kde/apps/showfoto/icons/hicolor/16x16/apps/showfoto.png -share/kde/apps/showfoto/icons/hicolor/22x22/actions/flip.png -share/kde/apps/showfoto/icons/hicolor/22x22/actions/histogram.png -share/kde/apps/showfoto/icons/hicolor/22x22/actions/resize_image.png -share/kde/apps/showfoto/icons/hicolor/22x22/actions/slideshow.png share/kde/apps/showfoto/icons/hicolor/22x22/apps/showfoto.png share/kde/apps/showfoto/icons/hicolor/22x22/mimetypes/raw.png -share/kde/apps/showfoto/icons/hicolor/32x32/actions/flip.png -share/kde/apps/showfoto/icons/hicolor/32x32/actions/histogram.png -share/kde/apps/showfoto/icons/hicolor/32x32/actions/resize_image.png -share/kde/apps/showfoto/icons/hicolor/32x32/actions/slideshow.png share/kde/apps/showfoto/icons/hicolor/32x32/apps/showfoto.png share/kde/apps/showfoto/icons/hicolor/32x32/mimetypes/raw.png -share/kde/apps/showfoto/icons/hicolor/48x48/actions/flip.png -share/kde/apps/showfoto/icons/hicolor/48x48/actions/histogram.png -share/kde/apps/showfoto/icons/hicolor/48x48/actions/resize_image.png -share/kde/apps/showfoto/icons/hicolor/48x48/actions/slideshow.png share/kde/apps/showfoto/icons/hicolor/48x48/apps/showfoto.png share/kde/apps/showfoto/icons/hicolor/48x48/mimetypes/raw.png -share/kde/apps/showfoto/icons/hicolor/64x64/actions/flip.png -share/kde/apps/showfoto/icons/hicolor/64x64/actions/histogram.png -share/kde/apps/showfoto/icons/hicolor/64x64/actions/resize_image.png -share/kde/apps/showfoto/icons/hicolor/64x64/actions/slideshow.png share/kde/apps/showfoto/icons/hicolor/64x64/apps/showfoto.png share/kde/apps/showfoto/icons/hicolor/64x64/mimetypes/raw.png -share/kde/apps/showfoto/icons/hicolor/scalable/actions/flip.svgz -share/kde/apps/showfoto/icons/hicolor/scalable/actions/histogram.svgz -share/kde/apps/showfoto/icons/hicolor/scalable/actions/resize_image.svgz -share/kde/apps/showfoto/icons/hicolor/scalable/actions/slideshow.svgz share/kde/apps/showfoto/menusidepixmap.png share/kde/apps/showfoto/showfoto-splash.png share/kde/apps/showfoto/showfotoui.rc @@ -788,46 +750,23 @@ share/locale/zh_CN/LC_MESSAGES/digikam.mo share/locale/zh_TW/LC_MESSAGES/digikam.mo @comment in kde: @dirrm share/kde/servicetypes @comment in kde: @dirrm share/kde/services -@dirrm share/kde/apps/showfoto/icons/hicolor/scalable/actions -@dirrm share/kde/apps/showfoto/icons/hicolor/scalable @dirrm share/kde/apps/showfoto/icons/hicolor/64x64/mimetypes @dirrm share/kde/apps/showfoto/icons/hicolor/64x64/apps -@dirrm share/kde/apps/showfoto/icons/hicolor/64x64/actions @dirrm share/kde/apps/showfoto/icons/hicolor/64x64 @dirrm share/kde/apps/showfoto/icons/hicolor/48x48/mimetypes @dirrm share/kde/apps/showfoto/icons/hicolor/48x48/apps -@dirrm share/kde/apps/showfoto/icons/hicolor/48x48/actions @dirrm share/kde/apps/showfoto/icons/hicolor/48x48 @dirrm share/kde/apps/showfoto/icons/hicolor/32x32/mimetypes @dirrm share/kde/apps/showfoto/icons/hicolor/32x32/apps -@dirrm share/kde/apps/showfoto/icons/hicolor/32x32/actions @dirrm share/kde/apps/showfoto/icons/hicolor/32x32 @dirrm share/kde/apps/showfoto/icons/hicolor/22x22/mimetypes @dirrm share/kde/apps/showfoto/icons/hicolor/22x22/apps -@dirrm share/kde/apps/showfoto/icons/hicolor/22x22/actions @dirrm share/kde/apps/showfoto/icons/hicolor/22x22 @dirrm share/kde/apps/showfoto/icons/hicolor/16x16/apps -@dirrm share/kde/apps/showfoto/icons/hicolor/16x16/actions @dirrm share/kde/apps/showfoto/icons/hicolor/16x16 @dirrm share/kde/apps/showfoto/icons/hicolor/128x128/apps -@dirrm share/kde/apps/showfoto/icons/hicolor/128x128/actions @dirrm share/kde/apps/showfoto/icons/hicolor/128x128 @dirrm share/kde/apps/showfoto/icons/hicolor -@dirrm share/kde/apps/showfoto/icons/crystalsvg/scalable/actions -@dirrm share/kde/apps/showfoto/icons/crystalsvg/scalable -@dirrm share/kde/apps/showfoto/icons/crystalsvg/64x64/actions -@dirrm share/kde/apps/showfoto/icons/crystalsvg/64x64 -@dirrm share/kde/apps/showfoto/icons/crystalsvg/48x48/actions -@dirrm share/kde/apps/showfoto/icons/crystalsvg/48x48 -@dirrm share/kde/apps/showfoto/icons/crystalsvg/32x32/actions -@dirrm share/kde/apps/showfoto/icons/crystalsvg/32x32 -@dirrm share/kde/apps/showfoto/icons/crystalsvg/22x22/actions -@dirrm share/kde/apps/showfoto/icons/crystalsvg/22x22 -@dirrm share/kde/apps/showfoto/icons/crystalsvg/16x16/actions -@dirrm share/kde/apps/showfoto/icons/crystalsvg/16x16 -@dirrm share/kde/apps/showfoto/icons/crystalsvg/128x128/actions -@dirrm share/kde/apps/showfoto/icons/crystalsvg/128x128 -@dirrm share/kde/apps/showfoto/icons/crystalsvg @dirrm share/kde/apps/showfoto/icons @dirrm share/kde/apps/showfoto @comment in kde: @dirrm share/kde/apps/konqueror/servicemenus @@ -882,13 +821,13 @@ share/locale/zh_TW/LC_MESSAGES/digikam.mo @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps @comment in hicolor-icon-theme: @dirrm share/icons/hicolor -@exec ${MKDIR} %D/share/doc/kde/HTML/en/${PKGNAME}-apidocs/digikam/html -@dirrm share/doc/kde/HTML/en/${PKGNAME}-apidocs/digikam/html -@exec ${MKDIR} %D/share/doc/kde/HTML/en/${PKGNAME}-apidocs/digikam/digikam/html -@dirrm share/doc/kde/HTML/en/${PKGNAME}-apidocs/digikam/digikam/html -@dirrm share/doc/kde/HTML/en/${PKGNAME}-apidocs/digikam/digikam -@dirrm share/doc/kde/HTML/en/${PKGNAME}-apidocs/digikam -@dirrm share/doc/kde/HTML/en/${PKGNAME}-apidocs +@exec ${MKDIR} %D/share/doc/kde/HTML/en/${HTMLDIR}-apidocs/digikam/html +@dirrm share/doc/kde/HTML/en/${HTMLDIR}-apidocs/digikam/html +@exec ${MKDIR} %D/share/doc/kde/HTML/en/${HTMLDIR}-apidocs/digikam/digikam/html +@dirrm share/doc/kde/HTML/en/${HTMLDIR}-apidocs/digikam/digikam/html +@dirrm share/doc/kde/HTML/en/${HTMLDIR}-apidocs/digikam/digikam +@dirrm share/doc/kde/HTML/en/${HTMLDIR}-apidocs/digikam +@dirrm share/doc/kde/HTML/en/${HTMLDIR}-apidocs @comment in kde: @dirrm share/doc/kde/HTML/en @comment in kde: @dirrm share/applications/kde @comment in kde: @dirrm lib/kde3 diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo index 768cbc02947..c42aa503ccc 100644 --- a/graphics/digikam/distinfo +++ b/graphics/digikam/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.23 2008/06/26 14:40:47 wiz Exp $ +$NetBSD: distinfo,v 1.24 2008/11/10 09:26:52 wiz Exp $ -SHA1 (digikam-0.9.3.tar.bz2) = 5cea651e498ff8adffeb72cdf59a3364c9aac0cc -RMD160 (digikam-0.9.3.tar.bz2) = 006d535aa56f174de0153e07f66d4aea62fea89d -Size (digikam-0.9.3.tar.bz2) = 10911417 bytes -SHA1 (patch-aa) = 1820d0ec9e1523b0253e7a70d398911fb34bdbcc -SHA1 (patch-ab) = 13e1e3b96efe4aa6f9bb49296ffc23f020b681e3 +SHA1 (digikam-0.9.5-beta1.tar.bz2) = 52a7f10562348cc36361bf36f0ffba412e2ae597 +RMD160 (digikam-0.9.5-beta1.tar.bz2) = 8fe2b98a42592dd8b728161c82de20c3eeb300ef +Size (digikam-0.9.5-beta1.tar.bz2) = 11328028 bytes diff --git a/graphics/digikam/patches/patch-aa b/graphics/digikam/patches/patch-aa deleted file mode 100644 index ce10e693223..00000000000 --- a/graphics/digikam/patches/patch-aa +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2008/05/02 10:22:45 wiz Exp $ - ---- digikam/utilities/cameragui/gpcamera.cpp.orig 2007-12-22 17:19:47.000000000 +0000 -+++ digikam/utilities/cameragui/gpcamera.cpp -@@ -22,13 +22,6 @@ - * - * ============================================================ */ - --// C Ansi includes. -- --extern "C" --{ --#include <gphoto2.h> --} -- - // C++ includes. - - #include <cstdio> -@@ -47,6 +40,13 @@ extern "C" - - #include <klocale.h> - -+// C Ansi includes. -+ -+extern "C" -+{ -+#include <gphoto2.h> -+} -+ - // Local includes. - - #include "ddebug.h" diff --git a/graphics/digikam/patches/patch-ab b/graphics/digikam/patches/patch-ab deleted file mode 100644 index 5fb42150e5e..00000000000 --- a/graphics/digikam/patches/patch-ab +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ab,v 1.11 2008/06/26 14:40:47 wiz Exp $ - ---- digikam/utilities/cameragui/cameracontroller.cpp.orig 2007-12-22 19:19:47 +0200 -+++ digikam/utilities/cameragui/cameracontroller.cpp -@@ -22,6 +22,11 @@ - * - * ============================================================ */ - -+extern "C" -+{ -+#include <unistd.h> -+} -+ - // C++ includes. - - #include <typeinfo> |