Recently we had direct or indirect bulk issues with libkipi, libkdcraw, libksane. These ports have on consumers expect digikam-kde4.
However, digikam-kde4 gives us the opportunity to build-in this ports. With the diff below we can avoid most KDE bulk conflicts but I need help with -dcraw and -libkipi. The automatic update does not work, for example: 1) Install digikam-kde4 from packages: $ pkg_add digikam-kde4 digikam-kde4-4.13.0p6:libkexiv2-4.14.3p1: ok digikam-kde4-4.13.0p6:libkgeomap-15.08.3p4: ok digikam-kde4-4.13.0p6:libkdcraw-4.14.3p2: ok digikam-kde4-4.13.0p6:libkipi-4.14.3p2: ok digikam-kde4-4.13.0p6:libkface-15.08.3p3: ok digikam-kde4-4.13.0p6: ok 2.) Update digikam-kde4 and libk* $ env TRUSTED_PKG_PATH=/usr/ports/packages/amd64/all/ pkg_add -u digikam-kde4-4.13.0p8:libksane-4.14.3p4: ok digikam-kde4-4.13.0p8:libkface-15.08.3p3->15.08.3p4: ok digikam-kde4-4.13.0p8:libkgeomap-15.08.3p4->15.08.3p5: ok digikam-kde4-4.13.0p6->4.13.0p8: ok Running tags: ok We can see libkipi and libkdcraw will not update automatic? I don't quite understand why. pkgpath is set, REVISION bumped. I'm looking forward to helpful replies and hope that this solution will be accepted. RS Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v retrieving revision 1.32 diff -u -p -u -p -r1.32 Makefile --- Makefile 24 Mar 2019 13:45:20 -0000 1.32 +++ Makefile 25 Mar 2019 06:11:33 -0000 @@ -2,7 +2,10 @@ COMMENT-face = face detection library for KDE4 COMMENT-geomap = library for mapping photos on maps for KDE4 +COMMENT-libkipi = KDE4 image plugins infrastructure COMMENT-kipi = KDE4 image plugins collection +COMMENT-dcraw = KDE4 RAW picture decoding C++ library +COMMENT-sane = KDE4 SANE (scanner) wrapper library COMMENT-main = KDE4 photo management utility COMMENT-mediawiki = KIPI4 interface for MediaWiki @@ -13,19 +16,28 @@ DISTNAME = digikam-${VERSION} PKGSPEC-main = digikam-kde4->=1 PKGSPEC-kipi = kipi-plugins->=1 +PKGSPEC-libkipi = libkipi-${MODKDE4_SPEC} +PKGSPEC-dcraw = libkdcraw-${MODKDE4_SPEC} PKGNAME = digikam-kde4-${VERSION} PKGNAME-face = libkface-15.08.3 PKGNAME-geomap = libkgeomap-15.08.3 +PKGNAME-libkipi = libkipi-${MODKDE4_VERSION} +PKGNAME-dcraw = libkdcraw-${MODKDE4_VERSION} +PKGNAME-sane = libksane-${MODKDE4_VERSION} PKGNAME-kipi = kipi-plugins-${VERSION} PKGNAME-main = ${PKGNAME} PKGNAME-mediawiki = libmediawiki-1.0.0 -REVISION-main = 7 -REVISION-kipi = 8 +REVISION-main = 8 +REVISION-kipi = 9 +REVISION-libkface = 3 +REVISION-dcraw = 3 +REVISION-libkipi = 3 +REVISION-sane = 4 REVISION-mediawiki = 8 -REVISION-face= 4 -REVISION-geomap= 5 +REVISION-face = 4 +REVISION-geomap = 5 # LGPL, GPL and many others PERMIT_PACKAGE_CDROM = Yes @@ -36,8 +48,11 @@ SHARED_LIBS += digikamdatabase 0.1 SHARED_LIBS += mediawiki 0.1 SHARED_LIBS += kface 0.1 # 3.0 SHARED_LIBS += kgeomap 0.1 # 2.1 +SHARED_LIBS += kdcraw 51.0 # 23.0 +SHARED_LIBS += kipi 51.0 # 11.1 +SHARED_LIBS += ksane 51.0 # 0.2 -MULTI_PACKAGES = -main -face -geomap -kipi -mediawiki +MULTI_PACKAGES = -main -face -sane -dcraw -libkipi -geomap -kipi -mediawiki MASTER_SITES = ${MASTER_SITE_KDE:=Attic/digikam/} EXTRACT_SUFX = .tar.bz2 @@ -56,10 +71,9 @@ WANTLIB-kipi += ${MODPHONON_WANTLIB} WANTLIB-kipi += c GL GLU ICE SM X11 Xext Xrandr expat z WANTLIB-kipi += lib/qt4/QtNetwork lib/qt4/QtOpenGL lib/qt4/QtXmlPatterns WANTLIB-kipi += lib/qt4/QtTest lib/qt4/QtXml -WANTLIB-kipi += ${KDE4LIB}/kcalcore ${KDE4LIB}/kdcraw ${KDE4LIB}/kexiv2 +WANTLIB-kipi += ${KDE4LIB}/kcalcore ${KDE4LIB}/kexiv2 WANTLIB-kipi += ${KDE4LIB}/kfile ${KDE4LIB}/khtml -WANTLIB-kipi += ${KDE4LIB}/kio ${KDE4LIB}/kipi ${KDE4LIB}/kjs ${KDE4LIB}/kparts -WANTLIB-kipi += ${KDE4LIB}/ksane +WANTLIB-kipi += ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/kparts WANTLIB-kipi += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid WANTLIB-kipi += ${KDE4LIB}/threadweaver WANTLIB-kipi += lib/opencv2/opencv_core lib/opencv2/opencv_highgui @@ -75,10 +89,10 @@ WANTLIB-main += c ICE SM X11 Xext z WANTLIB-main += lib/qt4/QtNetwork lib/qt4/QtSql WANTLIB-main += lib/qt4/QtTest lib/qt4/QtXml WANTLIB-main += ${KDE4LIB}/kabc ${KDE4LIB}/kcalcore ${KDE4LIB}/kcmutils -WANTLIB-main += ${KDE4LIB}/kdcraw ${KDE4LIB}/kemoticons +WANTLIB-main += ${KDE4LIB}/kemoticons WANTLIB-main += ${KDE4LIB}/kexiv2 ${KDE4LIB}/kfile WANTLIB-main += ${KDE4LIB}/khtml ${KDE4LIB}/kidletime ${KDE4LIB}/kio -WANTLIB-main += ${KDE4LIB}/kipi ${KDE4LIB}/kjs ${KDE4LIB}/kmime +WANTLIB-main += ${KDE4LIB}/kjs ${KDE4LIB}/kmime WANTLIB-main += ${KDE4LIB}/knotifyconfig ${KDE4LIB}/kparts WANTLIB-main += ${KDE4LIB}/kpimutils ${KDE4LIB}/kprintutils WANTLIB-main += ${KDE4LIB}/kresources ${KDE4LIB}/kutils @@ -108,9 +122,10 @@ WANTLIB-face += lib/opencv2/opencv_nonfr WANTLIB-face += lib/opencv2/opencv_ocl lib/opencv2/opencv_photo WANTLIB-face += lib/opencv2/opencv_video -WANTLIB-geomap += ${COMPILER_LIBCXX} QtDBus QtGui QtNetwork QtSvg QtXml -WANTLIB-geomap += c ${KDE4LIB}/kdeui ${KDE4LIB}/khtml ${KDE4LIB}/kio -WANTLIB-geomap += ${KDE4LIB}/kjs ${KDE4LIB}/kparts m ${KDE4LIB}/nepomuk + +WANTLIB-geomap += ${WANTLIB-common} ${COMPILER_LIBCXX} QtNetwork QtXml +WANTLIB-geomap += c ${KDE4LIB}/khtml ${KDE4LIB}/kio +WANTLIB-geomap += ${KDE4LIB}/kjs ${KDE4LIB}/kparts ${KDE4LIB}/nepomuk WANTLIB-geomap += ${KDE4LIB}/nepomukutils soprano QtCore kdecore phonon_s WANTLIB-geomap += ${KDE4LIB}/kexiv2 ${KDE4LIB}/marblewidget @@ -118,6 +133,17 @@ WANTLIB-mediawiki = ${WANTLIB-common} WANTLIB-mediawiki += lib/qt4/QtNetwork lib/qt4/QtXml WANTLIB-mediawiki += ${KDE4LIB}/kio +WANTLIB-sane += ${WANTLIB-common} sane QtCore ${KDE4LIB}/kdecore + +WANTLIB-dcraw += ${WANTLIB-common} QtNetwork QtXml +WANTLIB-dcraw += ${KDE4LIB}/kio raw_r ${KDE4LIB}/solid +WANTLIB-dcraw += ${KDE4LIB}/threadweaver QtCore ${KDE4LIB}/kdecore + +WANTLIB-libkipi += ${WANTLIB-common} QtNetwork QtXml +WANTLIB-libkipi += c ${KDE4LIB}/kfile ${KDE4LIB}/kio +WANTLIB-libkipi += ${KDE4LIB}/kparts ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils +WANTLIB-libkipi += QtCore ${KDE4LIB}/kdecore soprano + # Define dependencies manually per subpackage # TODO: fix kde4.port.mk to allow such grained tuning @@ -155,10 +181,7 @@ LIB_DEPENDS-kipi = ${LIB_DEPENDS-common} net/libkvkontakte \ security/qca \ security/kqoauth \ - ${MODKDE4_DEP_DIR}/libkdcraw \ ${MODKDE4_DEP_DIR}/libkexiv2 \ - ${MODKDE4_DEP_DIR}/libkipi \ - ${MODKDE4_DEP_DIR}/libksane \ ${MODKDE4_DEP_DIR}/pimlibs LIB_DEPENDS-face = ${LIB_DEPENDS-common} \ @@ -183,14 +206,23 @@ LIB_DEPENDS-main = ${LIB_DEPENDS-common} graphics/png \ graphics/tiff \ ${MODKDE4_DEP_DIR}/baloo \ - ${MODKDE4_DEP_DIR}/libkdcraw>=4.13 \ ${MODKDE4_DEP_DIR}/libkexiv2>=4.13 \ - ${MODKDE4_DEP_DIR}/libkipi>=4.13 \ ${MODKDE4_DEP_DIR}/pimlibs +LIB_DEPENDS-libkipi= ${LIB_DEPENDS-common} + +LIB_DEPENDS-sane = ${LIB_DEPENDS-common} \ + graphics/sane-backends + +LIB_DEPENDS-dcraw = ${LIB_DEPENDS-common} \ + graphics/libraw + LIB_DEPENDS-mediawiki = ${LIB_DEPENDS-common} RUN_DEPENDS-main = ${BASE_PKGPATH},-geomap \ + ${BASE_PKGPATH},-libkipi \ + ${BASE_PKGPATH},-sane \ + ${BASE_PKGPATH},-dcraw \ ${BASE_PKGPATH},-face CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=Yes \ @@ -198,6 +230,9 @@ CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PA -DCMAKE_DISABLE_FIND_PACKAGE_QtSoap=Yes \ -DDIGIKAMSC_COMPILE_LIBKFACE=Yes \ -DDIGIKAMSC_COMPILE_LIBKGEOMAP=Yes \ + -DDIGIKAMSC_COMPILE_LIBKSANE=Yes \ + -DDIGIKAMSC_COMPILE_LIBKIPI=Yes \ + -DDIGIKAMSC_COMPILE_LIBKDCRAW=Yes \ -DENABLE_INTERNALMYSQL=No \ -DENABLE_KDEPIMLIBSSUPPORT=Yes \ -DENABLE_LCMS2=Yes Index: pkg/DESCR-dcraw =================================================================== RCS file: pkg/DESCR-dcraw diff -N pkg/DESCR-dcraw --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/DESCR-dcraw 25 Mar 2019 06:11:33 -0000 @@ -0,0 +1,2 @@ +libkdcraw is a C++ interface around the LibRaw library +used to decode RAW picture files. Index: pkg/DESCR-libkipi =================================================================== RCS file: pkg/DESCR-libkipi diff -N pkg/DESCR-libkipi --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/DESCR-libkipi 25 Mar 2019 06:11:33 -0000 @@ -0,0 +1,5 @@ +Kipi (KDE Image Plugin Interface) is an effort to develop a common +plugin structure for Digikam, KimDaBa, Showimg and Gwenview. Its +aim is to share image plugins among graphic applications. Kipi is +based on the old digiKam plugins implementation and is maintained +by digiKam team. Index: pkg/DESCR-sane =================================================================== RCS file: pkg/DESCR-sane diff -N pkg/DESCR-sane --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/DESCR-sane 25 Mar 2019 06:11:33 -0000 @@ -0,0 +1,6 @@ +A library for dealing with scanners. LibKSane is a KDE interface for +SANE library to control flat scanners. + +This library provides a widget to control a scanner, KSaneWidget. +Internally, it will use the SANE library (or directly use TWAIN on +Windows if SANE is not available). Index: pkg/PLIST-dcraw =================================================================== RCS file: pkg/PLIST-dcraw diff -N pkg/PLIST-dcraw --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PLIST-dcraw 25 Mar 2019 06:11:33 -0000 @@ -0,0 +1,14 @@ +@comment $OpenBSD: +@pkgpath x11/kde4/libkdcraw +@lib lib/libkdcraw.so.${LIBkdcraw_VERSION} +share/apps/libkdcraw/ +share/apps/libkdcraw/profiles/ +share/apps/libkdcraw/profiles/compatibleWithAdobeRGB1998.icc +share/apps/libkdcraw/profiles/prophoto.icm +share/apps/libkdcraw/profiles/srgb-d65.icm +share/apps/libkdcraw/profiles/widegamut.icm +share/icons/hicolor/128x128/apps/kdcraw.png +share/icons/hicolor/32x32/apps/kdcraw.png +share/icons/hicolor/48x48/apps/kdcraw.png +share/icons/hicolor/64x64/apps/kdcraw.png +@tag gtk-update-icon-cache %D/share/icons/hicolor Index: pkg/PLIST-kipi =================================================================== RCS file: /cvs/ports/graphics/digikam-kde4/pkg/PLIST-kipi,v retrieving revision 1.6 diff -u -p -u -p -r1.6 PLIST-kipi --- pkg/PLIST-kipi 22 Mar 2019 22:09:37 -0000 1.6 +++ pkg/PLIST-kipi 25 Mar 2019 06:11:33 -0000 @@ -56,6 +56,10 @@ share/apps/gpssync/ share/apps/gpssync/bookmarks-marker.png share/apps/gpssync/searchmarker-normal.png share/apps/gpssync/searchmarker-selected.png +share/apps/kipi/data/ +share/apps/kipi/data/kipi-icon.svg +share/apps/kipi/data/kipi-logo.svg +share/apps/kipi/data/kipi-plugins_logo.png share/apps/kipi/kipiplugin_acquireimagesui.rc share/apps/kipi/kipiplugin_advancedslideshowui.rc share/apps/kipi/kipiplugin_batchprocessimagesui.rc @@ -80,6 +84,7 @@ share/apps/kipi/kipiplugin_jpeglosslessu share/apps/kipi/kipiplugin_kioexportimportui.rc share/apps/kipi/kipiplugin_kmlexportui.rc share/apps/kipi/kipiplugin_kopeteui.rc +share/apps/kipi/kipiplugin_kxmlhelloworldui.rc share/apps/kipi/kipiplugin_metadataeditui.rc share/apps/kipi/kipiplugin_panoramaui.rc share/apps/kipi/kipiplugin_photolayoutseditorui.rc Index: pkg/PLIST-libkipi =================================================================== RCS file: pkg/PLIST-libkipi diff -N pkg/PLIST-libkipi --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PLIST-libkipi 25 Mar 2019 06:11:33 -0000 @@ -0,0 +1,17 @@ +@comment $OpenBSD: +@pkgpath x11/kde4/libkipi +@bin bin/kxmlkipicmd +@lib lib/libkipi.so.${LIBkipi_VERSION} +share/apps/kipi/ +share/apps/kxmlkipicmd/ +share/apps/kxmlkipicmd/kxmlkipicmd_defaultui.rc +share/apps/kxmlkipicmd/kxmlkipicmd_gwenviewui.rc +share/icons/hicolor/128x128/apps/kipi.png +share/icons/hicolor/16x16/apps/kipi.png +share/icons/hicolor/22x22/apps/kipi.png +share/icons/hicolor/32x32/apps/kipi.png +share/icons/hicolor/48x48/apps/kipi.png +share/kde4/services/kipiplugin_kxmlhelloworld.desktop +share/kde4/servicetypes/kipiplugin.desktop +@tag update-desktop-database +@tag gtk-update-icon-cache %D/share/icons/hicolor Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/graphics/digikam-kde4/pkg/PLIST-main,v retrieving revision 1.6 diff -u -p -u -p -r1.6 PLIST-main --- pkg/PLIST-main 22 Mar 2019 22:09:37 -0000 1.6 +++ pkg/PLIST-main 25 Mar 2019 06:11:33 -0000 @@ -18,7 +18,6 @@ lib/kde4/kio_digikamtags.so @lib lib/libdigikamdatabase.so.${LIBdigikamdatabase_VERSION} @man man/man1/cleanup_digikamdb.1 @man man/man1/digitaglinktree.1 -share/appdata/ share/appdata/digiKam-ImagePlugin_Color.metainfo.xml share/appdata/digiKam-ImagePlugin_Decorate.metainfo.xml share/appdata/digiKam-ImagePlugin_Enhance.metainfo.xml Index: pkg/PLIST-sane =================================================================== RCS file: pkg/PLIST-sane diff -N pkg/PLIST-sane --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/PLIST-sane 25 Mar 2019 06:11:33 -0000 @@ -0,0 +1,7 @@ +@comment $OpenBSD: +@pkgpath x11/kde4/libksane +@lib lib/libksane.so.${LIBksane_VERSION} +share/icons/hicolor/16x16/actions/black-white.png +share/icons/hicolor/16x16/actions/color.png +share/icons/hicolor/16x16/actions/gray-scale.png +@tag gtk-update-icon-cache %D/share/icons/hicolor