diff options
author | fluffy <fluffy@FreeBSD.org> | 2010-09-19 16:00:47 +0800 |
---|---|---|
committer | fluffy <fluffy@FreeBSD.org> | 2010-09-19 16:00:47 +0800 |
commit | 41ee12476d70c7dda08a368743ae89a3a0c5ca3f (patch) | |
tree | eae06c647c6833a80c85ac4547695a2dd1d2cc58 /graphics | |
parent | 9673b7019157bb7561546d22b927fa38e0423a97 (diff) | |
download | freebsd-ports-gnome-41ee12476d70c7dda08a368743ae89a3a0c5ca3f.tar.gz freebsd-ports-gnome-41ee12476d70c7dda08a368743ae89a3a0c5ca3f.tar.zst freebsd-ports-gnome-41ee12476d70c7dda08a368743ae89a3a0c5ca3f.zip |
- Update DigiKam to 1.4.0 release
- Full support for KDE SC 4.5.x libraries
Approved by: maintainer (implicit)
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/digikam-kde4/Makefile | 3 | ||||
-rw-r--r-- | graphics/digikam-kde4/distinfo | 6 | ||||
-rw-r--r-- | graphics/digikam-kde4/files/patch-CMakeLists.txt | 57 | ||||
-rw-r--r-- | graphics/digikam-kde4/pkg-plist | 32 |
4 files changed, 62 insertions, 36 deletions
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile index 101830ce1e73..58200327e265 100644 --- a/graphics/digikam-kde4/Makefile +++ b/graphics/digikam-kde4/Makefile @@ -6,8 +6,7 @@ # PORTNAME= digikam -DISTVERSION= 1.2.0 -PORTREVISION= 3 +DISTVERSION= 1.4.0 PORTEPOCH= 1 CATEGORIES= graphics kde MASTER_SITES= SF diff --git a/graphics/digikam-kde4/distinfo b/graphics/digikam-kde4/distinfo index 35e31997dfe0..b7dfc1831661 100644 --- a/graphics/digikam-kde4/distinfo +++ b/graphics/digikam-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (digikam-1.2.0.tar.bz2) = 8f68022008cf1650924cc8688f176572 -SHA256 (digikam-1.2.0.tar.bz2) = 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206 -SIZE (digikam-1.2.0.tar.bz2) = 13970098 +MD5 (digikam-1.4.0.tar.bz2) = 748518d6b24cc2c44acad5cb9df8d21a +SHA256 (digikam-1.4.0.tar.bz2) = d37afaad8808f78ecda93d7498c64b72eee3bb61911fbeff87d3a528a7247eba +SIZE (digikam-1.4.0.tar.bz2) = 14907229 diff --git a/graphics/digikam-kde4/files/patch-CMakeLists.txt b/graphics/digikam-kde4/files/patch-CMakeLists.txt index 05c7dbec1384..5cedd5a8c47b 100644 --- a/graphics/digikam-kde4/files/patch-CMakeLists.txt +++ b/graphics/digikam-kde4/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ --- CMakeLists.txt.orig 2010-03-29 01:26:06.000000000 +0300 +++ CMakeLists.txt 2010-03-30 09:42:27.978741828 +0300 -@@ -116,9 +116,6 @@ +@@ -134,9 +134,6 @@ FIND_PACKAGE(PNG) FIND_PACKAGE(TIFF) FIND_PACKAGE(Jasper) @@ -10,14 +10,14 @@ # Extract version of libjpeg so that we can use the appropriate dir # See bug #227313, #228483 -@@ -132,31 +129,51 @@ +@@ -150,31 +147,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>=0.4.0) +- PKG_CHECK_MODULES(Kdcraw libkdcraw>=1.1.0) - IF(Kdcraw_FOUND) - SET(KDCRAW_FOR_DIGIKAM TRUE) - ELSE(Kdcraw_FOUND) @@ -26,64 +26,61 @@ -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) ++ ++INCLUDE(FindPackageHandleStandardArgs) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(KEXIV2 DEFAULT_MSG KEXIV2_LIBRARY KEXIV2_INCLUDE_DIR) + -# Check KExiv2 version installed to compile fine. -IF(NOT WIN32) - FIND_PACKAGE(PkgConfig) -- PKG_CHECK_MODULES(Kexiv2 libkexiv2>=0.5.0) +- 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) -- SET(KEXIV2_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) -+ -+INCLUDE(FindPackageHandleStandardArgs) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KEXIV2 DEFAULT_MSG KEXIV2_LIBRARY KEXIV2_INCLUDE_DIR) -+ +IF(KEXIV2_FOUND) -+ SET(KEXIV2_LIBRARIES ${KEXIV2_LIBRARY}) -+ SET(KEXIV2_FOR_DIGIKAM TRUE) ++ 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) ++ 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) ++ 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) + +IF(KDCRAW_FOUND) -+ SET(KDCRAW_LIBRARIES ${KDCRAW_LIBRARY}) -+ SET(KDCRAW_FOR_DIGIKAM TRUE) ++ SET(KDCRAW_LIBRARIES ${KDCRAW_LIBRARY}) ++ SET(KDCRAW_FOR_DIGIKAM TRUE) +ENDIF(KDCRAW_FOUND) + +# 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) ++ 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) ++ 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}) ++ SET(KIPI_LIBRARIES ${KIPI_LIBRARY}) +ENDIF(KIPI_FOUND) - # ================================================================================================== - # Optional dependencies + # Check MySQL executables + FIND_PROGRAM( SERVERCMD_MYSQL mysqld diff --git a/graphics/digikam-kde4/pkg-plist b/graphics/digikam-kde4/pkg-plist index d6cac9cdad35..18e304a187b4 100644 --- a/graphics/digikam-kde4/pkg-plist +++ b/graphics/digikam-kde4/pkg-plist @@ -55,6 +55,7 @@ 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 @@ -75,6 +76,7 @@ lib/kde4/kio_digikamalbums.so lib/kde4/kio_digikamdates.so lib/kde4/kio_digikamsearch.so lib/kde4/kio_digikamtags.so +lib/kde4/libexec/digikamdatabaseserver %%MARBLE%%lib/kde4/plugins/marble/ExternalDraw.so lib/libdigikamcore.so lib/libdigikamcore.so.1 @@ -96,8 +98,14 @@ share/apps/digikam/data/assistant-rawimport.png share/apps/digikam/data/assistant-scancollection.png share/apps/digikam/data/assistant-tooltips.png share/apps/digikam/data/banner-digikam.png +share/apps/digikam/data/bluejean-texture.png share/apps/digikam/data/bothhorz.png share/apps/digikam/data/bothvert.png +share/apps/digikam/data/bricks-texture.png +share/apps/digikam/data/bricks2-texture.png +share/apps/digikam/data/burlap-texture.png +share/apps/digikam/data/canvas-texture.png +share/apps/digikam/data/cellwood-texture.png share/apps/digikam/data/centerheight.png share/apps/digikam/data/centerwidth.png share/apps/digikam/data/chalk-pattern.png @@ -110,6 +118,7 @@ share/apps/digikam/data/curvemooth.png share/apps/digikam/data/dried-pattern.png share/apps/digikam/data/duplicatebothhorz.png share/apps/digikam/data/duplicatebothvert.png +share/apps/digikam/data/fabric-texture.png share/apps/digikam/data/granit-pattern.png share/apps/digikam/data/histogram-lin.png share/apps/digikam/data/histogram-log.png @@ -126,8 +135,15 @@ share/apps/digikam/data/logo-exiv2.png share/apps/digikam/data/logo-gphoto.png share/apps/digikam/data/logo-lcms.png share/apps/digikam/data/marble-pattern.png +share/apps/digikam/data/marble-texture.png +share/apps/digikam/data/marble2-texture.png +share/apps/digikam/data/metalwire-texture.png +share/apps/digikam/data/modern-texture.png +share/apps/digikam/data/moss-texture.png share/apps/digikam/data/original.png share/apps/digikam/data/paper-pattern.png +share/apps/digikam/data/paper-texture.png +share/apps/digikam/data/paper2-texture.png share/apps/digikam/data/parque-pattern.png share/apps/digikam/data/pine-pattern.png share/apps/digikam/data/pink-pattern.png @@ -135,11 +151,14 @@ share/apps/digikam/data/rain-pattern.png share/apps/digikam/data/rock-pattern.png share/apps/digikam/data/splash-digikam.png share/apps/digikam/data/stone-pattern.png +share/apps/digikam/data/stone-texture.png share/apps/digikam/data/target.png share/apps/digikam/data/togglemouseover.png -share/apps/digikam/data/topicset.iptc-subjectcode.xml share/apps/digikam/data/wall-pattern.png +share/apps/digikam/data/wall-texture.png share/apps/digikam/data/wood-pattern.png +share/apps/digikam/database/dbconfig.xml +share/apps/digikam/database/mysql-global.conf share/apps/digikam/digikam.notifyrc share/apps/digikam/digikamimageplugin_color_ui.rc share/apps/digikam/digikamimageplugin_decorate_ui.rc @@ -593,6 +612,7 @@ share/kde4/services/digikamsearch.protocol share/kde4/services/digikamtags.protocol 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/ca/LC_MESSAGES/digikam.mo share/locale/ca@valencia/LC_MESSAGES/digikam.mo @@ -600,20 +620,28 @@ share/locale/cs/LC_MESSAGES/digikam.mo share/locale/da/LC_MESSAGES/digikam.mo share/locale/de/LC_MESSAGES/digikam.mo share/locale/el/LC_MESSAGES/digikam.mo +share/locale/en_GB/LC_MESSAGES/digikam.mo share/locale/eo/LC_MESSAGES/digikam.mo share/locale/es/LC_MESSAGES/digikam.mo share/locale/et/LC_MESSAGES/digikam.mo share/locale/eu/LC_MESSAGES/digikam.mo +share/locale/fa/LC_MESSAGES/digikam.mo share/locale/fi/LC_MESSAGES/digikam.mo share/locale/fr/LC_MESSAGES/digikam.mo +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 share/locale/it/LC_MESSAGES/digikam.mo share/locale/ja/LC_MESSAGES/digikam.mo share/locale/km/LC_MESSAGES/digikam.mo share/locale/ko/LC_MESSAGES/digikam.mo share/locale/lt/LC_MESSAGES/digikam.mo +share/locale/lv/LC_MESSAGES/digikam.mo share/locale/nb/LC_MESSAGES/digikam.mo share/locale/nds/LC_MESSAGES/digikam.mo share/locale/ne/LC_MESSAGES/digikam.mo @@ -623,6 +651,7 @@ share/locale/pa/LC_MESSAGES/digikam.mo share/locale/pl/LC_MESSAGES/digikam.mo share/locale/pt/LC_MESSAGES/digikam.mo share/locale/pt_BR/LC_MESSAGES/digikam.mo +share/locale/ro/LC_MESSAGES/digikam.mo share/locale/ru/LC_MESSAGES/digikam.mo share/locale/se/LC_MESSAGES/digikam.mo share/locale/sk/LC_MESSAGES/digikam.mo @@ -658,6 +687,7 @@ share/locale/zh_TW/LC_MESSAGES/digikam.mo @dirrm share/apps/digikam/icons/hicolor/128x128 @dirrm share/apps/digikam/icons/hicolor @dirrm share/apps/digikam/icons +@dirrm share/apps/digikam/database @dirrm share/apps/digikam/data @dirrm share/apps/digikam/about @dirrm share/apps/digikam |