Index: astro/libkgeomap/Makefile =================================================================== --- astro/libkgeomap/Makefile (revision 401754) +++ astro/libkgeomap/Makefile (working copy) @@ -17,6 +17,6 @@ post-patch: ${REINPLACE_CMD} -e '/pkgconfig/s|$${LIB_INSTALL_DIR}|libdata|' \ - ${WRKSRC}/CMakeLists.txt + ${WRKSRC}/${PORTNAME}/CMakeLists.txt .include Index: astro/libkgeomap/pkg-plist =================================================================== --- astro/libkgeomap/pkg-plist (revision 401754) +++ astro/libkgeomap/pkg-plist (working copy) @@ -13,8 +13,8 @@ include/libkgeomap/tracks.h include/libkgeomap/version.h lib/libkgeomap.so -lib/libkgeomap.so.1 -lib/libkgeomap.so.1.0.0 +lib/libkgeomap.so.2 +lib/libkgeomap.so.2.1.0 libdata/pkgconfig/libkgeomap.pc share/apps/cmake/modules/FindKGeoMap.cmake share/apps/libkgeomap/backend-googlemaps-js.js Index: graphics/digikam-kde4/Makefile =================================================================== --- graphics/digikam-kde4/Makefile (revision 401755) +++ graphics/digikam-kde4/Makefile (working copy) @@ -31,7 +31,7 @@ CMAKE_ARGS+= -DWITH_Sqlite2:BOOL=OFF WRKSRC= ${WRKDIR}/${DISTNAME}/core -SHEBANG_FILES= utilities/scripts/digitaglinktree/digitaglinktree +SHEBANG_FILES= data/scripts/digitaglinktree/digitaglinktree OPTIONS_DEFINE= DOCS NLS GPHOTO2 PIMLIBS MYSQL OPTIONS_DEFAULT= GPHOTO2 PIMLIBS @@ -44,10 +44,11 @@ GPHOTO2_DESC= Gphoto2 camera support GPHOTO2_LIB_DEPENDS= libgphoto2.so:${PORTSDIR}/graphics/libgphoto2 +GPHOTO2_CMAKE_ON= -DWITH_Gphoto2:BOOL=ON GPHOTO2_CMAKE_OFF= -DWITH_Gphoto2:BOOL=OFF PIMLIBS_DESC= Address book support -PIMLIBS_USE= KDE4=pimlibs +PIMLIBS_USE= KDE4=pimlibs baloo PIMLIBS_CMAKE_ON= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=ON PIMLIBS_CMAKE_OFF= -DENABLE_KDEPIMLIBSSUPPORT:BOOL=OFF @@ -54,7 +55,10 @@ MYSQL_USE= MYSQL=server QT4=sql-mysql_run MYSQL_BUILD_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqld.a:${PORTSDIR}/${_MYSQL_SERVER} MYSQL_CMAKE_ON= -DMYSQLD_PATH:PATH=${LOCALBASE}/libexec \ - -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin -MYSQL_CMAKE_OFF= -DENABLE_INTERNALMYSQL:BOOL=OFF + -DMYSQL_TOOLS_PATH:PATH=${LOCALBASE}/bin \ + -DENABLE_INTERNALMYSQL:BOOL=ON \ + -DENABLE_MYSQLSUPPORT:BOOL=ON +MYSQL_CMAKE_OFF= -DENABLE_INTERNALMYSQL:BOOL=OFF \ + -DENABLE_MYSQLSUPPORT:BOOL=OFF .include Index: graphics/digikam-kde4/Makefile.common =================================================================== --- graphics/digikam-kde4/Makefile.common (revision 401755) +++ graphics/digikam-kde4/Makefile.common (working copy) @@ -12,7 +12,7 @@ # net/libkvkontakte # net/libmediawiki -DIGIKAM_VER= 4.2.0 +DIGIKAM_VER= 4.14.0 MASTER_SITES= KDE/stable/digikam KIPI_PLUGINS_ALL= acquireimages \ Index: graphics/digikam-kde4/distinfo =================================================================== --- graphics/digikam-kde4/distinfo (revision 401755) +++ graphics/digikam-kde4/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (digikam-4.2.0.tar.bz2) = e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08 -SIZE (digikam-4.2.0.tar.bz2) = 68849613 +SHA256 (digikam-4.14.0.tar.bz2) = 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad +SIZE (digikam-4.14.0.tar.bz2) = 59805228 Index: graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h =================================================================== --- graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h (revision 401755) +++ graphics/digikam-kde4/files/patch-libs_3rdparty_cimg_CImg.h (working copy) @@ -1,6 +1,6 @@ ---- libs/3rdparty/cimg/CImg.h.orig 2010-01-31 15:22:15.000000000 +0200 -+++ libs/3rdparty/cimg/CImg.h 2010-03-29 10:42:42.741492686 +0300 -@@ -29449,7 +29449,7 @@ +--- libs/3rdparty/cimg/CImg.h.orig 2015-02-26 07:57:56 UTC ++++ libs/3rdparty/cimg/CImg.h +@@ -29453,7 +29453,7 @@ namespace cimg_library { new_bit_depth = 8; } if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){ Index: graphics/digikam-kde4/pkg-plist =================================================================== --- graphics/digikam-kde4/pkg-plist (revision 401755) +++ graphics/digikam-kde4/pkg-plist (working copy) @@ -19,6 +19,13 @@ lib/libdigikamdatabase.so.%%SHLIB_VER%% man/man1/cleanup_digikamdb.1.gz man/man1/digitaglinktree.1.gz +share/appdata/digiKam-ImagePlugin_Color.metainfo.xml +share/appdata/digiKam-ImagePlugin_Decorate.metainfo.xml +share/appdata/digiKam-ImagePlugin_Enhance.metainfo.xml +share/appdata/digiKam-ImagePlugin_FxFilters.metainfo.xml +share/appdata/digiKam-ImagePlugin_Transform.metainfo.xml +share/appdata/digikam.appdata.xml +share/appdata/showfoto.appdata.xml share/applications/kde4/digikam.desktop share/applications/kde4/showfoto.desktop share/apps/digikam/about/digikam.css Index: graphics/digikam-kde4-l10n/pkg-plist =================================================================== --- graphics/digikam-kde4-l10n/pkg-plist (revision 401754) +++ graphics/digikam-kde4-l10n/pkg-plist (working copy) @@ -2,6 +2,7 @@ share/locale/ar/LC_MESSAGES/kipiplugin_jpeglossless.mo share/locale/ar/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/ar/LC_MESSAGES/kipiplugins.mo +share/locale/ar/LC_MESSAGES/libkgeomap.mo share/locale/be/LC_MESSAGES/digikam.mo share/locale/be/LC_MESSAGES/kipiplugin_acquireimages.mo share/locale/be/LC_MESSAGES/kipiplugin_advancedslideshow.mo @@ -336,7 +337,6 @@ share/locale/fi/LC_MESSAGES/kipiplugin_batchprocessimages.mo share/locale/fi/LC_MESSAGES/kipiplugin_calendar.mo share/locale/fi/LC_MESSAGES/kipiplugin_dngconverter.mo -share/locale/fi/LC_MESSAGES/kipiplugin_expoblending.mo share/locale/fi/LC_MESSAGES/kipiplugin_facebook.mo share/locale/fi/LC_MESSAGES/kipiplugin_flashexport.mo share/locale/fi/LC_MESSAGES/kipiplugin_flickrexport.mo @@ -352,11 +352,7 @@ share/locale/fi/LC_MESSAGES/kipiplugin_piwigoexport.mo share/locale/fi/LC_MESSAGES/kipiplugin_printimages.mo share/locale/fi/LC_MESSAGES/kipiplugin_rawconverter.mo -share/locale/fi/LC_MESSAGES/kipiplugin_removeredeyes.mo share/locale/fi/LC_MESSAGES/kipiplugin_sendimages.mo -share/locale/fi/LC_MESSAGES/kipiplugin_shwup.mo -share/locale/fi/LC_MESSAGES/kipiplugin_smug.mo -share/locale/fi/LC_MESSAGES/kipiplugin_timeadjust.mo share/locale/fi/LC_MESSAGES/kipiplugins.mo share/locale/fi/LC_MESSAGES/libkgeomap.mo share/locale/fr/LC_MESSAGES/digikam.mo Index: graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt =================================================================== --- graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt (revision 401754) +++ graphics/kipi-plugins-kde4/files/extrapatch-CMakeLists.txt (working copy) @@ -1,15 +1,19 @@ ---- ./CMakeLists.txt.orig 2013-03-11 08:24:11.000000000 +0000 -+++ ./CMakeLists.txt 2013-04-05 19:33:30.200669787 +0000 -@@ -410,7 +410,6 @@ +--- ./CMakeLists.txt.orig 2015-02-25 22:15:14.659030000 +0100 ++++ ./CMakeLists.txt 2015-02-25 22:17:07.071209000 +0100 +@@ -356,7 +356,6 @@ - # Plugins which will be always compiled + # Plugins which will be always compiled -- ADD_SUBDIRECTORY(common) - ADD_SUBDIRECTORY(timeadjust) - ADD_SUBDIRECTORY(jpeglossless) - ADD_SUBDIRECTORY(rawconverter) -@@ -515,3 +514,4 @@ - ENDIF(NOT WIN32) +- add_subdirectory(common) + add_subdirectory(timeadjust) + add_subdirectory(jpeglossless) + add_subdirectory(rawconverter) +@@ -468,7 +467,7 @@ + endif() - ENDIF(KIPIPLUGINS_CAN_BE_COMPILED) -+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/common/libkipiplugins/tools/kpversion.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins/kpversion.h) + endif() +- ++ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/common/libkipiplugins/tools/kpversion.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins/kpversion.h) + else() + + message(STATUS "") Index: graphics/libkface/pkg-plist =================================================================== --- graphics/libkface/pkg-plist (revision 401754) +++ graphics/libkface/pkg-plist (working copy) @@ -4,11 +4,14 @@ include/libkface/libkface_export.h include/libkface/recognitiondatabase.h include/libkface/version.h +lib/cmake/Kface-3.5.0/Kface-export-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/Kface-3.5.0/Kface-export.cmake +lib/cmake/Kface-3.5.0/kface-config-version.cmake +lib/cmake/Kface-3.5.0/kface-config.cmake lib/libkface.so -lib/libkface.so.2 -lib/libkface.so.2.0.0 +lib/libkface.so.3 +lib/libkface.so.3.0.0 libdata/pkgconfig/libkface.pc -share/apps/cmake/modules/FindKface.cmake share/apps/libkface/alignment-congealing/face-funnel.data share/apps/libkface/database/dbconfig.xml share/apps/libkface/haarcascades/haarcascade_frontalface_alt.xml