From 1f17ff9c2f747198586eec0a5f1114bfc39f3480 Mon Sep 17 00:00:00 2001 From: makc Date: Sat, 9 Jun 2012 13:54:02 +0000 Subject: Update to 2.6.0. Port changes: - add LICENSE (GPLv2) - convert to new options framework - make NLS optional - add MYSQL option to build MySQL database support - remove LENSFUN option (graphics/lensfun is now required) - remove MARBLE option (libkgeomap provides this and is required) - remove no longer needed patches Submitted by: Jason E. Hale via area51 commit --- graphics/digikam-kde4/Makefile | 78 +++-- graphics/digikam-kde4/distinfo | 4 +- graphics/digikam-kde4/files/patch-CMakeLists.txt | 107 ++---- .../files/patch-digikam__CMakeLists.txt | 13 + .../files/patch-libs_3rdparty_libpgf_PGFplatform.h | 11 - ..._3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp | 12 + .../files/patch-libs__database__databasewatch.cpp | 10 - graphics/digikam-kde4/files/qt3to4headers.txt | 19 -- graphics/digikam-kde4/pkg-plist | 357 ++++++++++++++++----- 9 files changed, 369 insertions(+), 242 deletions(-) create mode 100644 graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt delete mode 100644 graphics/digikam-kde4/files/patch-libs_3rdparty_libpgf_PGFplatform.h create mode 100644 graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp delete mode 100644 graphics/digikam-kde4/files/patch-libs__database__databasewatch.cpp delete mode 100644 graphics/digikam-kde4/files/qt3to4headers.txt (limited to 'graphics') diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile index 2de2dbd62a15..47d81e8c5c7c 100644 --- a/graphics/digikam-kde4/Makefile +++ b/graphics/digikam-kde4/Makefile @@ -6,8 +6,7 @@ # PORTNAME= digikam -DISTVERSION= 1.9.0 -PORTREVISION= 3 +DISTVERSION= 2.6.0 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= SF @@ -15,65 +14,74 @@ MASTER_SITES= SF MAINTAINER= kde@FreeBSD.org COMMENT= An advanced digital photo management application for KDE4 -LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - lcms.1:${PORTSDIR}/graphics/lcms \ +LICENSE= GPLv2 + +LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ + lcms:${PORTSDIR}/graphics/lcms \ png15:${PORTSDIR}/graphics/png \ - jasper.4:${PORTSDIR}/graphics/jasper \ - lqr-1.3:${PORTSDIR}/graphics/liblqr-1 \ - kipi.8:${PORTSDIR}/graphics/libkipi-kde4 \ - kexiv2.10:${PORTSDIR}/graphics/libkexiv2-kde4 \ - kdcraw.20:${PORTSDIR}/graphics/libkdcraw-kde4 + jasper:${PORTSDIR}/graphics/jasper \ + lensfun:${PORTSDIR}/graphics/lensfun \ + lqr-1:${PORTSDIR}/graphics/liblqr-1 \ + kface:${PORTSDIR}/graphics/libkface \ + kgeomap:${PORTSDIR}/astro/libkgeomap LATEST_LINK= ${PORTNAME}-kde4 +OPTIONS_DEFINE= NLS GPHOTO2 PIMLIBS MYSQL +OPTIONS_DEFAULT= GPHOTO2 PIMLIBS + +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 -USE_QT4= gui dbus network qt3support sql svg xml \ +USE_KDE4= automoc4 kdehier kdeprefix kdelibs libkdcraw libkexiv2 libkipi +USE_QT4= sql-sqlite3_run \ qmake_build moc_build rcc_build uic_build -USE_GNOME= pkgconfig USE_CMAKE= yes -USE_GETTEXT= yes USE_LDCONFIG= yes MAN1= digitaglinktree.1 \ cleanup_digikamdb.1 -OPTIONS= GPHOTO2 "Compile with gphoto2 support" on \ - LENSFUN "Compile lens auto-correction image editor plugin" off \ - MARBLE "Geolocation support (requires astro/marble, broken)" off \ - PIMLIBS "Address book support" on +WRKSRC= ${WRKDIR}/${DISTNAME}/core .include -.if defined(WITHOUT_GPHOTO2) -CMAKE_ARGS+= -DENABLE_GPHOTO2:BOOL=OFF +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" .else -LIB_DEPENDS+= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 +CMAKE_ARGS+= -DWITH_NLS:BOOL=OFF +PLIST_SUB+= NLS="@comment " .endif -.if defined(WITH_LENSFUN) -LIB_DEPENDS+= lensfun.2:${PORTSDIR}/graphics/lensfun +.if ${PORT_OPTIONS:MGPHOTO2} +LIB_DEPENDS+= gphoto2:${PORTSDIR}/graphics/libgphoto2 .else -CMAKE_ARGS+= -DWITH_LensFun:BOOL=OFF +CMAKE_ARGS+= -DWITH_Gphoto2:BOOL=OFF .endif -#.if defined(WITH_MARBLE) -#LIB_DEPENDS+= marblewidget.12:${PORTSDIR}/astro/marble -#PLIST_SUB+= MARBLE="" -#.else -CMAKE_ARGS+= -DWITH_MarbleWidget:BOOL=OFF -PLIST_SUB+= MARBLE="@comment " -#.endif - -.if defined(WITHOUT_PIMLIBS) +.if ${PORT_OPTIONS:MPIMLIBS} +USE_KDE4+= pimlibs +.else CMAKE_ARGS+= -DWITH_KdepimLibs:BOOL=OFF +.endif + +.if ${PORT_OPTIONS:MMYSQL} +USE_MYSQL= server +USE_QT4+= sql-mysql_run +CMAKE_ARGS+= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \ + -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin +PLIST_SUB+= MYSQL="" .else -USE_KDE4+= pimlibs +CMAKE_ARGS+= -DENABLE_INTERNALMYSQL:BOOL=OFF +PLIST_SUB+= MYSQL="@comment " .endif post-patch: - ${GREP} -H -r "#include diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo index 2eea7b387a07..afb200f08f48 100644 --- a/graphics/digikam-kde4/distinfo +++ b/graphics/digikam-kde4/distinfo @@ -1,2 +1,2 @@ -SHA256 (digikam-1.9.0.tar.bz2) = e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 -SIZE (digikam-1.9.0.tar.bz2) = 22866660 +SHA256 (digikam-2.6.0.tar.bz2) = 411ceaa3a489d9c9a5566d43c167927a07fb08fb4f613b0dbf1dec65b95736df +SIZE (digikam-2.6.0.tar.bz2) = 55362029 diff --git a/graphics/digikam-kde4/files/patch-CMakeLists.txt b/graphics/digikam-kde4/files/patch-CMakeLists.txt index 48ccab68d213..4da9d2b0975e 100644 --- a/graphics/digikam-kde4/files/patch-CMakeLists.txt +++ b/graphics/digikam-kde4/files/patch-CMakeLists.txt @@ -1,86 +1,31 @@ ---- CMakeLists.txt.orig 2010-03-29 01:26:06.000000000 +0300 -+++ CMakeLists.txt 2010-03-30 09:42:27.978741828 +0300 -@@ -137,9 +137,6 @@ - FIND_PACKAGE(PNG) - FIND_PACKAGE(TIFF) - FIND_PACKAGE(Jasper) --FIND_PACKAGE(Kdcraw) --FIND_PACKAGE(Kexiv2) --FIND_PACKAGE(Kipi) - FIND_PACKAGE(PGF) - FIND_PACKAGE(CLAPACK) +--- ./CMakeLists.txt.orig 2012-01-02 19:32:49.000000000 -0500 ++++ ./CMakeLists.txt 2012-05-14 20:29:54.000000000 -0400 +@@ -160,6 +160,11 @@ + FIND_LIBRARY(MATH_LIBRARY m) + ENDIF(NOT WIN32) -@@ -163,31 +160,50 @@ - SET(DIGIKAM_LIBJPEG_DIR libjpeg-80) - ENDIF ("${jpeglib_version}" LESS 80) - --# Check KDcraw version installed to compile fine. --IF(NOT WIN32) -- FIND_PACKAGE(PkgConfig) -- PKG_CHECK_MODULES(Kdcraw libkdcraw>=1.1.0) -- IF(Kdcraw_FOUND) -- SET(KDCRAW_FOR_DIGIKAM TRUE) -- ELSE(Kdcraw_FOUND) -- SET(KDCRAW_FOR_DIGIKAM FALSE) -- ENDIF(Kdcraw_FOUND) --ELSE(NOT WIN32) -- SET(KDCRAW_FOR_DIGIKAM TRUE) --ENDIF(NOT WIN32) -+INCLUDE(FindPkgConfig) -+# Check for KExiv2 -+PKG_CHECK_MODULES(LIBKEXIV2 libkexiv2-kde4>=0.5.0) -+FIND_PATH(KEXIV2_INCLUDE_DIR NAMES libkexiv2/version.h -+ PATHS ${LIBKEXIV2_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH) -+FIND_LIBRARY(KEXIV2_LIBRARY NAMES kexiv2 -+ PATHS ${LIBKEXIV2_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH) ++STRING(TOLOWER ${CMAKE_SYSTEM_NAME} node_platform) ++IF(${node_platform} MATCHES freebsd) ++ FIND_LIBRARY(KVM_LIBRARY NAMES kvm) ++ENDIF(${node_platform} MATCHES freebsd) + -+INCLUDE(FindPackageHandleStandardArgs) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KEXIV2 DEFAULT_MSG KEXIV2_LIBRARY KEXIV2_INCLUDE_DIR) + IF(Boost_FOUND) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) + ENDIF(Boost_FOUND) +@@ -1624,6 +1629,16 @@ + MACRO_OPTIONAL_ADD_SUBDIRECTORY(tests) + ENDIF(KDE4_BUILD_TESTS) --# Check KExiv2 version installed to compile fine. --IF(NOT WIN32) -- FIND_PACKAGE(PkgConfig) -- PKG_CHECK_MODULES(Kexiv2 libkexiv2>=1.1.0) -- IF(Kexiv2_FOUND) -- SET(KEXIV2_FOR_DIGIKAM TRUE) -- ELSE(Kexiv2_FOUND) -- SET(KEXIV2_FOR_DIGIKAM FALSE) -- ENDIF(Kexiv2_FOUND) --ELSE(NOT WIN32) -+IF(KEXIV2_FOUND) -+ SET(KEXIV2_LIBRARIES ${KEXIV2_LIBRARY}) - SET(KEXIV2_FOR_DIGIKAM TRUE) --ENDIF(NOT WIN32) -+ENDIF(KEXIV2_FOUND) -+ -+# Check for Kdcraw -+PKG_CHECK_MODULES(LIBKDCRAW libkdcraw-kde4>=0.4.0) -+FIND_PATH(KDCRAW_INCLUDE_DIR NAMES libkdcraw/version.h -+ PATHS ${LIBKDCRAW_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH) -+FIND_LIBRARY(KDCRAW_LIBRARY NAMES kdcraw -+ PATHS ${LIBKDCRAW_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH) -+ -+INCLUDE(FindPackageHandleStandardArgs) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KDCRAW DEFAULT_MSG KDCRAW_LIBRARY KDCRAW_INCLUDE_DIR) ++ OPTION(WITH_NLS "NLS Support" ON) ++ IF(WITH_NLS) ++ FIND_PACKAGE(Msgfmt REQUIRED) ++ FIND_PACKAGE(Gettext REQUIRED) ++ ADD_SUBDIRECTORY(po) ++ ENDIF(WITH_NLS) + -+IF(KDCRAW_FOUND) -+ SET(KDCRAW_LIBRARIES ${KDCRAW_LIBRARY}) -+ SET(KDCRAW_FOR_DIGIKAM TRUE) -+ENDIF(KDCRAW_FOUND) ++ ADD_SUBDIRECTORY(doc/digikam/digikam) ++ ADD_SUBDIRECTORY(doc/digikam/showfoto) + -+# Check for Kipi -+PKG_CHECK_MODULES(LIBKIPI libkipi-kde4>=0.2.0) -+FIND_PATH(KIPI_INCLUDE_DIR NAMES libkipi/version.h -+ PATHS ${LIBKIPI_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH) -+FIND_LIBRARY(KIPI_LIBRARY NAMES kipi -+ PATHS ${LIBKIPI_LIBRARY_DIRS} ${KDE4_LIB_DIR} NO_DEFAULT_PATH) -+ -+INCLUDE(FindPackageHandleStandardArgs) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KIPI DEFAULT_MSG KIPI_LIBRARY KIPI_INCLUDE_DIR) -+ -+IF(KIPI_FOUND) -+ SET(KIPI_LIBRARIES ${KIPI_LIBRARY}) -+ENDIF(KIPI_FOUND) - - # Check MySQL executables - FIND_PROGRAM( SERVERCMD_MYSQL mysqld + IF(NOT WIN32) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/digikam.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/digikam.lsm) + ENDIF(NOT WIN32) diff --git a/graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt b/graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt new file mode 100644 index 000000000000..7e36dc4a69d5 --- /dev/null +++ b/graphics/digikam-kde4/files/patch-digikam__CMakeLists.txt @@ -0,0 +1,13 @@ +--- ./digikam/CMakeLists.txt.orig 2012-01-02 19:32:42.000000000 -0500 ++++ ./digikam/CMakeLists.txt 2012-05-14 20:28:25.000000000 -0400 +@@ -118,6 +118,10 @@ + TARGET_LINK_LIBRARIES(digikamcore ${X11_LIBRARIES}) + ENDIF(Q_WS_X11) + ++IF(${node_platform} MATCHES freebsd) ++ TARGET_LINK_LIBRARIES(digikamcore ${KVM_LIBRARY}) ++ENDIF(${node_platform} MATCHES freebsd) ++ + # For Contents Aware Resizer and Lens auto-correction tools. + IF(GLIB2_FOUND) + TARGET_LINK_LIBRARIES(digikamcore ${GLIB2_LIBRARIES} ${liblqr_LIBS} ${liblensfun_LIBS}) diff --git a/graphics/digikam-kde4/files/patch-libs_3rdparty_libpgf_PGFplatform.h b/graphics/digikam-kde4/files/patch-libs_3rdparty_libpgf_PGFplatform.h deleted file mode 100644 index e82de49c9b36..000000000000 --- a/graphics/digikam-kde4/files/patch-libs_3rdparty_libpgf_PGFplatform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/3rdparty/libpgf/PGFplatform.h.orig 2009-10-06 19:25:31.000000000 -0500 -+++ libs/3rdparty/libpgf/PGFplatform.h 2009-10-06 19:25:43.000000000 -0500 -@@ -306,7 +306,7 @@ - //------------------------------------------------------------------------------- - // NetBSD - //------------------------------------------------------------------------------- --#ifdef __NetBSD__ -+#if defined(__NetBSD__) || defined(__FreeBSD__) - #ifndef __POSIX__ - #define __POSIX__ - #endif diff --git a/graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp b/graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp new file mode 100644 index 000000000000..8d9b5342703b --- /dev/null +++ b/graphics/digikam-kde4/files/patch-libs__3rdparty__kmemoryinfo__kmemoryinfo_backend.cpp @@ -0,0 +1,12 @@ +--- ./libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp.orig 2012-01-02 19:32:23.000000000 -0500 ++++ ./libs/3rdparty/kmemoryinfo/kmemoryinfo_backend.cpp 2012-05-14 20:28:25.000000000 -0400 +@@ -53,6 +53,9 @@ + #include + #include + #include ++#include ++#include ++#include + #endif + #if defined(Q_OS_NETBSD) + #include diff --git a/graphics/digikam-kde4/files/patch-libs__database__databasewatch.cpp b/graphics/digikam-kde4/files/patch-libs__database__databasewatch.cpp deleted file mode 100644 index 6b5d26c798d8..000000000000 --- a/graphics/digikam-kde4/files/patch-libs__database__databasewatch.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- libs/database/databasewatch.cpp.orig 2009-03-17 01:28:48.000000000 +1000 -+++ libs/database/databasewatch.cpp 2009-11-07 02:29:54.000000000 +1000 -@@ -39,6 +39,7 @@ - // Local includes - - #include "collectionmanager.h" -+#include - - Digikam_DatabaseWatchAdaptor::Digikam_DatabaseWatchAdaptor(Digikam::DatabaseWatch *watch) - : QDBusAbstractAdaptor(watch) diff --git a/graphics/digikam-kde4/files/qt3to4headers.txt b/graphics/digikam-kde4/files/qt3to4headers.txt deleted file mode 100644 index d4f66271f845..000000000000 --- a/graphics/digikam-kde4/files/qt3to4headers.txt +++ /dev/null @@ -1,19 +0,0 @@ -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g -s///g diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist index 9f6a18889cc8..e81bfe2436f7 100644 --- a/graphics/digikam-kde4/pkg-plist +++ b/graphics/digikam-kde4/pkg-plist @@ -2,64 +2,6 @@ bin/cleanup_digikamdb bin/digikam bin/digitaglinktree bin/showfoto -include/digikam/albumdb.h -include/digikam/bcgfilter.h -include/digikam/bcgsettings.h -include/digikam/blurfilter.h -include/digikam/cbfilter.h -include/digikam/cbsettings.h -include/digikam/cietonguewidget.h -include/digikam/colorgradientwidget.h -include/digikam/dcolor.h -include/digikam/dcolorblend.h -include/digikam/dcolorcomposer.h -include/digikam/dcolorpixelaccess.h -include/digikam/dcursortracker.h -include/digikam/dgradientslider.h -include/digikam/dimg.h -include/digikam/dimgthreadedfilter.h -include/digikam/dlogoaction.h -include/digikam/dmetadata.h -include/digikam/dpopupmenu.h -include/digikam/dprogressdlg.h -include/digikam/dzoombar.h -include/digikam/exifwidget.h -include/digikam/hslfilter.h -include/digikam/iccpreviewwidget.h -include/digikam/iccprofileinfodlg.h -include/digikam/iccprofilewidget.h -include/digikam/icctransform.h -include/digikam/imagecurves.h -include/digikam/imagedialog.h -include/digikam/imageiface.h -include/digikam/imagelevels.h -include/digikam/imageplugin.h -include/digikam/iptcwidget.h -include/digikam/knotificationwrapper.h -include/digikam/libsinfodlg.h -include/digikam/makernotewidget.h -include/digikam/mdkeylistviewitem.h -include/digikam/metadatalistview.h -include/digikam/metadatalistviewitem.h -include/digikam/metadatawidget.h -include/digikam/nrfilter.h -include/digikam/nrsettings.h -include/digikam/paniconwidget.h -include/digikam/photoinfocontainer.h -include/digikam/previewwidget.h -include/digikam/rawcameradlg.h -include/digikam/refocusfilter.h -include/digikam/rexpanderboxexclusive.h -include/digikam/searchtextbar.h -include/digikam/sharpenfilter.h -include/digikam/sidebar.h -include/digikam/statusled.h -include/digikam/statusnavigatebar.h -include/digikam/statusprogressbar.h -include/digikam/template.h -include/digikam/unsharpmaskfilter.h -include/digikam/xmpwidget.h -include/digikam_export.h lib/kde4/digikamimageplugin_color.so lib/kde4/digikamimageplugin_decorate.so lib/kde4/digikamimageplugin_enhance.so @@ -68,16 +10,16 @@ lib/kde4/digikamimageplugin_transform.so lib/kde4/digikamnepomukservice.so lib/kde4/kio_digikamalbums.so lib/kde4/kio_digikamdates.so +lib/kde4/kio_digikammapimages.so lib/kde4/kio_digikamsearch.so lib/kde4/kio_digikamtags.so -lib/kde4/libexec/digikamdatabaseserver -%%MARBLE%%lib/kde4/plugins/marble/ExternalDraw.so +%%MYSQL%%lib/kde4/libexec/digikamdatabaseserver lib/libdigikamcore.so -lib/libdigikamcore.so.1 -lib/libdigikamcore.so.1.0.0 +lib/libdigikamcore.so.2 +lib/libdigikamcore.so.2.0.0 lib/libdigikamdatabase.so -lib/libdigikamdatabase.so.1 -lib/libdigikamdatabase.so.1.0.0 +lib/libdigikamdatabase.so.2 +lib/libdigikamdatabase.so.2.0.0 share/applications/kde4/digikam.desktop share/applications/kde4/showfoto.desktop share/apps/digikam/about/digikam.css @@ -119,9 +61,6 @@ share/apps/digikam/data/histogram-log.png share/apps/digikam/data/ice-pattern.png share/apps/digikam/data/image-full.png share/apps/digikam/data/image-selection.png -share/apps/digikam/data/indicator-gray.png -share/apps/digikam/data/indicator-green.png -share/apps/digikam/data/indicator-red.png share/apps/digikam/data/leaf-pattern.png share/apps/digikam/data/logo-cimg.png share/apps/digikam/data/logo-digikam.png @@ -536,6 +475,7 @@ share/apps/digikam/icons/hicolor/scalable/actions/bqm-update.svgz share/apps/digikam/icons/hicolor/scalable/actions/bwtonal.svgz share/apps/digikam/icons/hicolor/scalable/actions/channelmixer.svgz share/apps/digikam/icons/hicolor/scalable/actions/colormanagement.svgz +share/apps/digikam/icons/hicolor/scalable/actions/colorneg.svgz share/apps/digikam/icons/hicolor/scalable/actions/contrast.svgz share/apps/digikam/icons/hicolor/scalable/actions/depth16to8.svgz share/apps/digikam/icons/hicolor/scalable/actions/depth8to16.svgz @@ -574,6 +514,9 @@ share/apps/digikam/lensfun/compact-ricoh.xml share/apps/digikam/lensfun/compact-sigma.xml share/apps/digikam/lensfun/compact-sony.xml share/apps/digikam/lensfun/generic.xml +share/apps/digikam/lensfun/mil-olympus.xml +share/apps/digikam/lensfun/mil-panasonic.xml +share/apps/digikam/lensfun/mil-samsung.xml share/apps/digikam/lensfun/rf-leica.xml share/apps/digikam/lensfun/slr-canon.xml share/apps/digikam/lensfun/slr-contax.xml @@ -592,32 +535,275 @@ share/apps/digikam/lensfun/slr-tokina.xml share/apps/digikam/lensfun/slr-ussr.xml share/apps/digikam/lighttablewindowui.rc share/apps/digikam/queuemgrwindowui.rc -share/apps/digikam/themes/Blue -share/apps/digikam/themes/Clean -share/apps/digikam/themes/DLR -share/apps/digikam/themes/Dark -share/apps/digikam/themes/DarkRoom -share/apps/digikam/themes/Dessert -share/apps/digikam/themes/Digikasa -share/apps/digikam/themes/Dreary -share/apps/digikam/themes/Gray -share/apps/digikam/themes/Marine -share/apps/digikam/themes/OrangeCrush -share/apps/digikam/themes/Rose -share/apps/digikam/themes/Sandy share/apps/digikam/tips share/apps/digikam/utils/digikam-camera +share/apps/kconf_update/adjustlevelstool.upd share/apps/showfoto/data/banner-showfoto.png share/apps/showfoto/data/logo-showfoto.png share/apps/showfoto/data/splash-showfoto.png share/apps/showfoto/showfotoui.rc share/apps/solid/actions/digikam-opencamera.desktop +share/doc/HTML/en/digikam/2Greens.png +share/doc/HTML/en/digikam/542px-CIExy1931_sRGB_svg.png +share/doc/HTML/en/digikam/DAM-Metadata.png +share/doc/HTML/en/digikam/DAM-Workflow.png +share/doc/HTML/en/digikam/DAM-errors.png +share/doc/HTML/en/digikam/DAM-pyramid.png +share/doc/HTML/en/digikam/DAM-story.png +share/doc/HTML/en/digikam/DAM-transmission.png +share/doc/HTML/en/digikam/ICCworkflowlogic.png +share/doc/HTML/en/digikam/addinglibraries.png +share/doc/HTML/en/digikam/adjustcurvesdialog.png +share/doc/HTML/en/digikam/adjustcurvespreview.png +share/doc/HTML/en/digikam/adjustlevelsdialog.png +share/doc/HTML/en/digikam/adjustlevelspreview.png +share/doc/HTML/en/digikam/antivignettingdialog.png +share/doc/HTML/en/digikam/antivignettingpreview.png +share/doc/HTML/en/digikam/blowupdialog.png +share/doc/HTML/en/digikam/blowuppreview.png +share/doc/HTML/en/digikam/blowupsettings1.png +share/doc/HTML/en/digikam/blowupsettings2.png +share/doc/HTML/en/digikam/blurfx_farblur.png +share/doc/HTML/en/digikam/blurfx_focusblur.png +share/doc/HTML/en/digikam/blurfx_frostglass.png +share/doc/HTML/en/digikam/blurfx_mosaic.png +share/doc/HTML/en/digikam/blurfx_motionblur.png +share/doc/HTML/en/digikam/blurfx_radialblur.png +share/doc/HTML/en/digikam/blurfx_shakeblur.png +share/doc/HTML/en/digikam/blurfx_smartblur.png +share/doc/HTML/en/digikam/blurfx_softenerblur.png +share/doc/HTML/en/digikam/blurfx_zoomblur.png +share/doc/HTML/en/digikam/blurfxpreview.png +share/doc/HTML/en/digikam/borderpreview.png +share/doc/HTML/en/digikam/cameraclient.png +share/doc/HTML/en/digikam/cameraclientdownload.png +share/doc/HTML/en/digikam/cameraclientidentity.png +share/doc/HTML/en/digikam/cameraclientitemproperties.png +share/doc/HTML/en/digikam/cameraclientsetting1.png +share/doc/HTML/en/digikam/cameraclientsetting2.png +share/doc/HTML/en/digikam/cameraclientsetting3.png +share/doc/HTML/en/digikam/camerafolderselectiondialog.png +share/doc/HTML/en/digikam/cameratargetalbumdialog.png +share/doc/HTML/en/digikam/channelmixerdialog.png +share/doc/HTML/en/digikam/channelmixerpreview.png +share/doc/HTML/en/digikam/charcoalpreview.png +share/doc/HTML/en/digikam/cimg-logo.png +share/doc/HTML/en/digikam/color-management.docbook +share/doc/HTML/en/digikam/colormanagement.png +share/doc/HTML/en/digikam/common +share/doc/HTML/en/digikam/credits-annex.docbook +share/doc/HTML/en/digikam/digikamlogo.png +share/doc/HTML/en/digikam/distortionfx_blockwaves1.png +share/doc/HTML/en/digikam/distortionfx_blockwaves2.png +share/doc/HTML/en/digikam/distortionfx_caricature.png +share/doc/HTML/en/digikam/distortionfx_circularwaves1.png +share/doc/HTML/en/digikam/distortionfx_circularwaves2.png +share/doc/HTML/en/digikam/distortionfx_corners.png +share/doc/HTML/en/digikam/distortionfx_cylinderh.png +share/doc/HTML/en/digikam/distortionfx_cylinderhv.png +share/doc/HTML/en/digikam/distortionfx_cylinderv.png +share/doc/HTML/en/digikam/distortionfx_fisheyes.png +share/doc/HTML/en/digikam/distortionfx_polarcoord.png +share/doc/HTML/en/digikam/distortionfx_tiles.png +share/doc/HTML/en/digikam/distortionfx_twirl.png +share/doc/HTML/en/digikam/distortionfx_unpolarcoord.png +share/doc/HTML/en/digikam/distortionfx_wavesh.png +share/doc/HTML/en/digikam/distortionfx_wavesv.png +share/doc/HTML/en/digikam/distortionfxpreview.png +share/doc/HTML/en/digikam/distortions.png +share/doc/HTML/en/digikam/duplicates_albumsfilter.png +share/doc/HTML/en/digikam/editor-color.docbook +share/doc/HTML/en/digikam/editor-decorate.docbook +share/doc/HTML/en/digikam/editor-enhance.docbook +share/doc/HTML/en/digikam/editor-filters.docbook +share/doc/HTML/en/digikam/editor-redeyes-correction.png +share/doc/HTML/en/digikam/editor-transform.docbook +share/doc/HTML/en/digikam/editorautolevels.png +share/doc/HTML/en/digikam/editorautosizebutton.png +share/doc/HTML/en/digikam/editorbcgadjust.png +share/doc/HTML/en/digikam/editorblurplugin.png +share/doc/HTML/en/digikam/editorbwfilter.png +share/doc/HTML/en/digikam/editorcolorbalance.png +share/doc/HTML/en/digikam/editorcommondialogtools.png +share/doc/HTML/en/digikam/editorconvert_brown.png +share/doc/HTML/en/digikam/editorconvert_bw.png +share/doc/HTML/en/digikam/editorconvert_bwgreen.png +share/doc/HTML/en/digikam/editorconvert_bworange.png +share/doc/HTML/en/digikam/editorconvert_bwred.png +share/doc/HTML/en/digikam/editorconvert_bwyellow.png +share/doc/HTML/en/digikam/editorconvert_cold.png +share/doc/HTML/en/digikam/editorconvert_original.png +share/doc/HTML/en/digikam/editorconvert_platinium.png +share/doc/HTML/en/digikam/editorconvert_selenium.png +share/doc/HTML/en/digikam/editorconvert_sepia.png +share/doc/HTML/en/digikam/editorcropbutton.png +share/doc/HTML/en/digikam/editorequalize.png +share/doc/HTML/en/digikam/editorgoldensectionsexample.png +share/doc/HTML/en/digikam/editorgoldenspiralexample.png +share/doc/HTML/en/digikam/editorgoldenspiralsectionsexample.png +share/doc/HTML/en/digikam/editorgoldentrianglesexample.png +share/doc/HTML/en/digikam/editorharmonioustrianglesexample.png +share/doc/HTML/en/digikam/editorhistogramdescription.png +share/doc/HTML/en/digikam/editorhistogramsample1.png +share/doc/HTML/en/digikam/editorhistogramsample2.png +share/doc/HTML/en/digikam/editorhistogramsample3.png +share/doc/HTML/en/digikam/editorhsladjust.png +share/doc/HTML/en/digikam/editoriccprofile.png +share/doc/HTML/en/digikam/editorimageselection.png +share/doc/HTML/en/digikam/editorneon.png +share/doc/HTML/en/digikam/editornoisereductionplugin.png +share/doc/HTML/en/digikam/editornormalize.png +share/doc/HTML/en/digikam/editorpreview.png +share/doc/HTML/en/digikam/editorraindropsplugin.png +share/doc/HTML/en/digikam/editorratiocroptool.png +share/doc/HTML/en/digikam/editorresizetool.png +share/doc/HTML/en/digikam/editorrevertbutton.png +share/doc/HTML/en/digikam/editorrulethirdlinesexample.png +share/doc/HTML/en/digikam/editorsharpenplugin.png +share/doc/HTML/en/digikam/editorstretchcontrast.png +share/doc/HTML/en/digikam/editortoolbar.png +share/doc/HTML/en/digikam/editorunsharpedmaskplugin.png +share/doc/HTML/en/digikam/editorvivid.png +share/doc/HTML/en/digikam/editorzoombuttons.png +share/doc/HTML/en/digikam/embosspreview.png +share/doc/HTML/en/digikam/file-formats.docbook +share/doc/HTML/en/digikam/filmgrainpreview.png +share/doc/HTML/en/digikam/firstrunassistant_step1.png +share/doc/HTML/en/digikam/firstrunassistant_step2.png +share/doc/HTML/en/digikam/firstrunassistant_step3.png +share/doc/HTML/en/digikam/firstrunassistant_step4.png +share/doc/HTML/en/digikam/firstrunassistant_step5.png +share/doc/HTML/en/digikam/firstrunassistant_step6.png +share/doc/HTML/en/digikam/firstrunassistant_step7.png +share/doc/HTML/en/digikam/firstrunassistant_step8.png +share/doc/HTML/en/digikam/freerotationpreview.png +share/doc/HTML/en/digikam/fuzzysearchsimilar.png +share/doc/HTML/en/digikam/handheld_gps.png +share/doc/HTML/en/digikam/hotpixelsdialog.png +share/doc/HTML/en/digikam/hotpixelspreview.png +share/doc/HTML/en/digikam/ie-menu.docbook +share/doc/HTML/en/digikam/index.cache.bz2 +share/doc/HTML/en/digikam/index.docbook +share/doc/HTML/en/digikam/infraredpreview.png +share/doc/HTML/en/digikam/inpaintingdialog.png +share/doc/HTML/en/digikam/inpaintingpreview.png +share/doc/HTML/en/digikam/inpaintingsettings1.png +share/doc/HTML/en/digikam/inpaintingsettings2.png +share/doc/HTML/en/digikam/inserttextpreview.png +share/doc/HTML/en/digikam/introductionfirewireconnector.png +share/doc/HTML/en/digikam/introductionfirstrundialog.png +share/doc/HTML/en/digikam/introductionfoldericon.png +share/doc/HTML/en/digikam/introductionplugininterfaces.png +share/doc/HTML/en/digikam/introductionscandialog.png +share/doc/HTML/en/digikam/introductionserialconnector.png +share/doc/HTML/en/digikam/introductionusbconnector.png +share/doc/HTML/en/digikam/lensdistortiondialog.png +share/doc/HTML/en/digikam/lensdistortionpreview.png +share/doc/HTML/en/digikam/lighttable.png +share/doc/HTML/en/digikam/logo.png +share/doc/HTML/en/digikam/maininterfacealbumproperties.png +share/doc/HTML/en/digikam/maininterfaceassigntags.png +share/doc/HTML/en/digikam/maininterfacedateview.png +share/doc/HTML/en/digikam/maininterfacepreview.png +share/doc/HTML/en/digikam/maininterfacequicksearch.png +share/doc/HTML/en/digikam/maininterfacesearchview.png +share/doc/HTML/en/digikam/maininterfacetagsview.png +share/doc/HTML/en/digikam/maininterfacetoolbar.png +share/doc/HTML/en/digikam/maininterfaceview.png +share/doc/HTML/en/digikam/menu-descriptions.docbook +share/doc/HTML/en/digikam/menualbum.png +share/doc/HTML/en/digikam/menucamera.png +share/doc/HTML/en/digikam/menuexport.png +share/doc/HTML/en/digikam/menuhelp.png +share/doc/HTML/en/digikam/menuimage.png +share/doc/HTML/en/digikam/menuimagemetadata.png +share/doc/HTML/en/digikam/menuimport.png +share/doc/HTML/en/digikam/menuselect.png +share/doc/HTML/en/digikam/menusettings.png +share/doc/HTML/en/digikam/menutag.png +share/doc/HTML/en/digikam/menutools.png +share/doc/HTML/en/digikam/menutoolsbatch.png +share/doc/HTML/en/digikam/menuview.png +share/doc/HTML/en/digikam/noisereductiondialog.png +share/doc/HTML/en/digikam/noisereductionpreview.png +share/doc/HTML/en/digikam/noiseremovaltool.png +share/doc/HTML/en/digikam/oilpaintpreview.png +share/doc/HTML/en/digikam/perspectivepreview.png +share/doc/HTML/en/digikam/photo-editing.docbook +share/doc/HTML/en/digikam/raindropspreview.png +share/doc/HTML/en/digikam/rawcamerasupport.png +share/doc/HTML/en/digikam/refocus-notsharpened.png +share/doc/HTML/en/digikam/refocus-refocus.png +share/doc/HTML/en/digikam/refocus-sharped.png +share/doc/HTML/en/digikam/refocus-unsharpmask.png +share/doc/HTML/en/digikam/refocusdialog.png +share/doc/HTML/en/digikam/restorationdialog.png +share/doc/HTML/en/digikam/restorationpreview.png +share/doc/HTML/en/digikam/restorationpreview2.png +share/doc/HTML/en/digikam/restorationsettings1.png +share/doc/HTML/en/digikam/restorationsettings2.png +share/doc/HTML/en/digikam/searchinterface.png +share/doc/HTML/en/digikam/setupaddcamera.png +share/doc/HTML/en/digikam/setupalbum.png +share/doc/HTML/en/digikam/setupcamera.png +share/doc/HTML/en/digikam/setupcollections.png +share/doc/HTML/en/digikam/setupembeddedinfo.png +share/doc/HTML/en/digikam/setupiccprofiles.png +share/doc/HTML/en/digikam/setupimageeditor.png +share/doc/HTML/en/digikam/setupimageplugins.png +share/doc/HTML/en/digikam/setupkipiplugins.png +share/doc/HTML/en/digikam/setuplighttable.png +share/doc/HTML/en/digikam/setupmimetypes.png +share/doc/HTML/en/digikam/setupmisc.png +share/doc/HTML/en/digikam/setuprawfiledecoding.png +share/doc/HTML/en/digikam/setupsaveimages.png +share/doc/HTML/en/digikam/setupslideshow.png +share/doc/HTML/en/digikam/setupthemeclean.png +share/doc/HTML/en/digikam/setupthemedark.png +share/doc/HTML/en/digikam/setupthemedefault.png +share/doc/HTML/en/digikam/setupthemedessert.png +share/doc/HTML/en/digikam/setupthemedigicasa.png +share/doc/HTML/en/digikam/setupthemedreary.png +share/doc/HTML/en/digikam/setupthememarine.png +share/doc/HTML/en/digikam/setupthemeorangecrush.png +share/doc/HTML/en/digikam/setupthemesandy.png +share/doc/HTML/en/digikam/setuptooltip.png +share/doc/HTML/en/digikam/sheartoolpreview.png +share/doc/HTML/en/digikam/sidebar.docbook +share/doc/HTML/en/digikam/sidebarcolorshistogramviewer.png +share/doc/HTML/en/digikam/sidebarcommentstags.png +share/doc/HTML/en/digikam/sidebarfileproperties.png +share/doc/HTML/en/digikam/sidebargeolocation.png +share/doc/HTML/en/digikam/sidebarmetadata.png +share/doc/HTML/en/digikam/sidebarmetadataexif.png +share/doc/HTML/en/digikam/sidebarmetadatagps.png +share/doc/HTML/en/digikam/sidebarmetadataiptc.png +share/doc/HTML/en/digikam/sidebarmetadatamakernote.png +share/doc/HTML/en/digikam/sidebartagfilters.png +share/doc/HTML/en/digikam/solarizepreview.png +share/doc/HTML/en/digikam/superimposepreview.png +share/doc/HTML/en/digikam/texturedialog.png +share/doc/HTML/en/digikam/texturepreview.png +share/doc/HTML/en/digikam/timeline.png +share/doc/HTML/en/digikam/unsharpdialog.png +share/doc/HTML/en/digikam/unsharppreview.png +share/doc/HTML/en/digikam/vignettingcorrectiondialog.png +share/doc/HTML/en/digikam/whitebalancedialog.png +share/doc/HTML/en/showfoto/common +share/doc/HTML/en/showfoto/index.cache.bz2 +share/doc/HTML/en/showfoto/index.docbook +share/doc/HTML/en/showfoto/introductionplugininterfaces.png +share/doc/HTML/en/showfoto/setupgeneral.png +share/doc/HTML/en/showfoto/setupplugins.png +share/doc/HTML/en/showfoto/setupslideshow.png share/icons/hicolor/128x128/apps/digikam.png share/icons/hicolor/128x128/apps/showfoto.png share/icons/hicolor/16x16/apps/digikam.png share/icons/hicolor/16x16/apps/showfoto.png share/icons/hicolor/22x22/apps/digikam.png share/icons/hicolor/22x22/apps/showfoto.png +share/icons/hicolor/256x256/apps/digikam.png +share/icons/hicolor/256x256/apps/showfoto.png share/icons/hicolor/32x32/apps/digikam.png share/icons/hicolor/32x32/apps/showfoto.png share/icons/hicolor/48x48/apps/digikam.png @@ -633,6 +819,7 @@ share/kde4/services/digikamimageplugin_decorate.desktop share/kde4/services/digikamimageplugin_enhance.desktop share/kde4/services/digikamimageplugin_fxfilters.desktop share/kde4/services/digikamimageplugin_transform.desktop +share/kde4/services/digikammapimages.protocol share/kde4/services/digikamnepomukservice.desktop share/kde4/services/digikamsearch.protocol share/kde4/services/digikamtags.protocol @@ -640,8 +827,8 @@ share/kde4/servicetypes/digikamimageplugin.desktop share/locale/ar/LC_MESSAGES/digikam.mo share/locale/be/LC_MESSAGES/digikam.mo share/locale/bg/LC_MESSAGES/digikam.mo +share/locale/bs/LC_MESSAGES/digikam.mo share/locale/ca/LC_MESSAGES/digikam.mo -share/locale/ca@valencia/LC_MESSAGES/digikam.mo share/locale/cs/LC_MESSAGES/digikam.mo share/locale/da/LC_MESSAGES/digikam.mo share/locale/de/LC_MESSAGES/digikam.mo @@ -658,7 +845,6 @@ share/locale/ga/LC_MESSAGES/digikam.mo share/locale/gl/LC_MESSAGES/digikam.mo share/locale/he/LC_MESSAGES/digikam.mo share/locale/hi/LC_MESSAGES/digikam.mo -share/locale/hne/LC_MESSAGES/digikam.mo share/locale/hr/LC_MESSAGES/digikam.mo share/locale/hu/LC_MESSAGES/digikam.mo share/locale/is/LC_MESSAGES/digikam.mo @@ -683,6 +869,7 @@ share/locale/ru/LC_MESSAGES/digikam.mo share/locale/se/LC_MESSAGES/digikam.mo share/locale/sk/LC_MESSAGES/digikam.mo share/locale/sl/LC_MESSAGES/digikam.mo +share/locale/sq/LC_MESSAGES/digikam.mo share/locale/sv/LC_MESSAGES/digikam.mo share/locale/th/LC_MESSAGES/digikam.mo share/locale/tr/LC_MESSAGES/digikam.mo @@ -690,10 +877,13 @@ share/locale/uk/LC_MESSAGES/digikam.mo share/locale/vi/LC_MESSAGES/digikam.mo share/locale/zh_CN/LC_MESSAGES/digikam.mo share/locale/zh_TW/LC_MESSAGES/digikam.mo +@dirrmtry share/icons/hicolor/256x256/apps +@dirrmtry share/icons/hicolor/256x256 +@dirrm share/doc/HTML/en/showfoto +@dirrm share/doc/HTML/en/digikam @dirrm share/apps/showfoto/data @dirrm share/apps/showfoto @dirrm share/apps/digikam/utils -@dirrm share/apps/digikam/themes @dirrm share/apps/digikam/lensfun @dirrm share/apps/digikam/icons/hicolor/scalable/actions @dirrm share/apps/digikam/icons/hicolor/scalable @@ -719,4 +909,3 @@ share/locale/zh_TW/LC_MESSAGES/digikam.mo @dirrm share/apps/digikam/data @dirrm share/apps/digikam/about @dirrm share/apps/digikam -@dirrm include/digikam -- cgit