cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

digikam-kde4 -dcraw, -libkipi, -sane

Browse Source 
Replace x11/kde4/{libkipi,libkdcraw,libksane} by digikam-kde4 -dcraw, -libkipi,
-sane to avoid bulk conflicts with KDE4 and 5 applications.

With this move we have to go without ksaneplugin and drop support in
graphics-thumbnailers and ksnapshot.

Help from jca@ with packages adjustments.

Spotted by many over months, thanks!
This commit is contained in:
rsadowski 2019-03-28 19:28:47 +00:00
parent 6145315d70
commit a9fc9f4fbf
14 changed files with 136 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
graphics/digikam-kde4/Makefile
View File

@ -1,8 +1,11 @@
# $OpenBSD: Makefile,v 1.32 2019/03/24 13:45:20 rsadowski Exp $
# $OpenBSD: Makefile,v 1.33 2019/03/28 19:28:47 rsadowski Exp $
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_nonfree lib/opencv2/opencv_objdetect
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_PACKAGE_Doxygen=Yes \
-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

2
graphics/digikam-kde4/pkg/DESCR-dcraw Normal file
View File

@ -0,0 +1,2 @@
libkdcraw is a C++ interface around the LibRaw library
used to decode RAW picture files.

5
graphics/digikam-kde4/pkg/DESCR-libkipi Normal file
View File

@ -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.

6
graphics/digikam-kde4/pkg/DESCR-sane Normal file
View File

@ -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).

17
graphics/digikam-kde4/pkg/PLIST-dcraw Normal file
View File

@ -0,0 +1,17 @@
@comment $OpenBSD:
@pkgpath x11/kde4/libkdcraw,-main
@pkgpath x11/kde4/libkdcraw,-icons
@pkgpath x11/kde4/libkdcraw
@conflict kde4-libkdcraw-icons-<=4.14.3p3
@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

7
graphics/digikam-kde4/pkg/PLIST-kipi
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-kipi,v 1.6 2019/03/22 22:09:37 rsadowski Exp $
@comment $OpenBSD: PLIST-kipi,v 1.7 2019/03/28 19:28:47 rsadowski Exp $
@option no-default-conflict
@conflict digikam-<3
@conflict kipi-plugins-*
@ -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_jpeglosslessui.rc
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

20
graphics/digikam-kde4/pkg/PLIST-libkipi Normal file
View File

@ -0,0 +1,20 @@
@comment $OpenBSD:
@pkgpath x11/kde4/libkipi
@pkgpath x11/kde4/libkipi,-main
@pkgpath x11/kde4/libkipi,-icons
@conflict kde4-libkipi-icons-<=4.14.3p3
@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

3
graphics/digikam-kde4/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.6 2019/03/22 22:09:37 rsadowski Exp $
@comment $OpenBSD: PLIST-main,v 1.7 2019/03/28 19:28:47 rsadowski Exp $
@conflict digikam-doc-*
bin/cleanup_digikamdb
@bin bin/digikam
@ -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

7
graphics/digikam-kde4/pkg/PLIST-sane Normal file
View File

@ -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

10
meta/kde4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.61 2019/03/24 13:45:20 rsadowski Exp $
# $OpenBSD: Makefile,v 1.62 2019/03/28 19:28:47 rsadowski Exp $
PKGNAME = kde4-${MODKDE4_VERSION}
@ -32,9 +32,9 @@ REVISION-sdk = 3
REVISION-edu = 5
REVISION-multimedia = 0
REVISION-extras = 10
REVISION-main = 22
REVISION-main = 23
REVISION-admin = 0
REVISION-graphics = 2
REVISION-graphics = 3
MAINTAINER = KDE porting team <openbsd-kde@googlegroups.com>
@ -97,12 +97,8 @@ KDE4-graphics = \
${MODKDE4_DEP_DIR}/kgamma \
${MODKDE4_DEP_DIR}/kolourpaint \
${MODKDE4_DEP_DIR}/kruler \
${MODKDE4_DEP_DIR}/ksaneplugin \
${MODKDE4_DEP_DIR}/ksnapshot \
${MODKDE4_DEP_DIR}/libkdcraw \
${MODKDE4_DEP_DIR}/libkexiv2 \
${MODKDE4_DEP_DIR}/libkipi \
${MODKDE4_DEP_DIR}/libksane \
${MODKDE4_DEP_DIR}/svgpart
RUN_DEPENDS-games = \

10
x11/kde4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2019/03/11 21:57:09 rsadowski Exp $
# $OpenBSD: Makefile,v 1.68 2019/03/28 19:28:47 rsadowski Exp $
# Build dependency tree of main building blocks:
# OUTSIDE: akonadi, attica, automoc, cagibi, phonon, qimageblitz,
@ -211,12 +211,12 @@ SUBDIR += kcolorchooser
SUBDIR += kgamma
SUBDIR += kolourpaint
SUBDIR += kruler
SUBDIR += ksaneplugin
#SUBDIR += ksaneplugin libksane is gone
SUBDIR += ksnapshot
SUBDIR += libkdcraw
#SUBDIR += libkdcraw x11/kde-application
SUBDIR += libkexiv2
SUBDIR += libkipi
SUBDIR += libksane
#SUBDIR += libkipi x11/kde-application
#SUBDIR += libksane x11/kde-application
#SUBDIR += okular x11/kde-applications
SUBDIR += svgpart

11
x11/kde4/graphics-thumbnailers/Makefile
View File

@ -1,17 +1,16 @@
# $OpenBSD: Makefile,v 1.11 2017/07/27 11:57:48 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2019/03/28 19:28:47 rsadowski Exp $
COMMENT = KDE thumbnail creation plugins
DISTNAME = kdegraphics-thumbnailers-${MODKDE4_VERSION}
REVISION = 1
REVISION = 2
WANTLIB = m pthread
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork
WANTLIB += lib/qt4/QtSvg lib/qt4/QtXml
WANTLIB += ${KDE4LIB}/kdcraw ${KDE4LIB}/kdeui ${KDE4LIB}/kexiv2
WANTLIB += ${KDE4LIB}/kio
WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio
LIB_DEPENDS = ${MODKDE4_DEP_DIR}/libkexiv2>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/libkdcraw>=${MODKDE4_DEP_VERSION}
CONFIGURE_ARGS += -DCMAKE_DISABLE_FIND_PACKAGE_Kexiv2=Yes \
-DCMAKE_DISABLE_FIND_PACKAGE_Kdcraw=Yes \
.include <bsd.port.mk>

4
x11/kde4/graphics-thumbnailers/pkg/PLIST
View File

@ -1,5 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2013/08/24 17:33:38 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.3 2019/03/28 19:28:47 rsadowski Exp $
lib/kde4/gsthumbnail.so
lib/kde4/rawthumbnail.so
share/kde4/services/gsthumbnail.desktop
share/kde4/services/rawthumbnail.desktop

8
x11/kde4/ksnapshot/Makefile
View File

@ -1,19 +1,19 @@
# $OpenBSD: Makefile,v 1.13 2018/06/29 22:16:30 espie Exp $
# $OpenBSD: Makefile,v 1.14 2019/03/28 19:28:47 rsadowski Exp $
COMMENT = screen capture program for KDE
DISTNAME = ksnapshot-${MODKDE4_VERSION}
REVISION = 4
REVISION = 5
WANTLIB = c m pthread
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += ICE SM X11 Xext Xfixes
WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork
WANTLIB += lib/qt4/QtSvg lib/qt4/QtXml
WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio ${KDE4LIB}/kipi
WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
LIB_DEPENDS = ${MODKDE4_DEP_DIR}/libkipi>=${MODKDE4_DEP_VERSION}
CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_Kipi=Yes
.include <bsd.port.mk>