To avoid bulk build conflicts with marble-kf5, let's get rid marble
support in KDE4 digikam. When I tested digikam a few years ago, it was
broken. Digikam4 always getting segmentation faults when I click on
"Maps" in the menu-bar. I don't think anyone wants to fix that, do they?
BTW Digikam KDE5 works quit well with maps and opencv.
Also a quirks diff attached.
Objections?
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/digikam-kde4/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile 29 Mar 2019 17:20:06 -0000 1.34
+++ Makefile 2 May 2019 15:57:42 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.34 2019/03/29 17:20:06 ajacoutot 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
@@ -21,7 +20,6 @@ PKGSPEC-dcraw = libkdcraw-${MODKDE4_SPE
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}
@@ -29,7 +27,7 @@ PKGNAME-kipi = kipi-plugins-${VERSION}
PKGNAME-main = ${PKGNAME}
PKGNAME-mediawiki = libmediawiki-1.0.0
-REVISION-main = 8
+REVISION-main = 9
REVISION-kipi = 9
REVISION-libkface = 3
REVISION-dcraw = 3
@@ -37,7 +35,6 @@ REVISION-libkipi = 3
REVISION-sane = 4
REVISION-mediawiki = 8
REVISION-face = 4
-REVISION-geomap = 6
# LGPL, GPL and many others
PERMIT_PACKAGE_CDROM = Yes
@@ -47,12 +44,11 @@ SHARED_LIBS += digikamcore 0.1
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 -sane -dcraw -libkipi -geomap -kipi
-mediawiki
+MULTI_PACKAGES = -main -face -sane -dcraw -libkipi -kipi -mediawiki
MASTER_SITES = ${MASTER_SITE_KDE:=Attic/digikam/}
EXTRACT_SUFX = .tar.bz2
@@ -122,13 +118,6 @@ WANTLIB-face += lib/opencv2/opencv_nonfr
WANTLIB-face += lib/opencv2/opencv_ocl lib/opencv2/opencv_photo
WANTLIB-face += lib/opencv2/opencv_video
-
-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
-
WANTLIB-mediawiki = ${WANTLIB-common}
WANTLIB-mediawiki += lib/qt4/QtNetwork lib/qt4/QtXml
WANTLIB-mediawiki += ${KDE4LIB}/kio
@@ -187,11 +176,6 @@ LIB_DEPENDS-kipi = ${LIB_DEPENDS-common}
LIB_DEPENDS-face = ${LIB_DEPENDS-common} \
graphics/opencv2
-LIB_DEPENDS-geomap = ${LIB_DEPENDS-common} \
- ${MODKDE4_DEP_DIR}/libkexiv2 \
- ${MODKDE4_DEP_DIR}/marble
-
-
LIB_DEPENDS-main = ${LIB_DEPENDS-common} \
${MODPHONON_LIB_DEPENDS} \
databases/sqlite \
@@ -219,8 +203,7 @@ LIB_DEPENDS-dcraw = ${LIB_DEPENDS-common
LIB_DEPENDS-mediawiki = ${LIB_DEPENDS-common}
-RUN_DEPENDS-main = ${BASE_PKGPATH},-geomap \
- ${BASE_PKGPATH},-libkipi \
+RUN_DEPENDS-main = ${BASE_PKGPATH},-libkipi \
${BASE_PKGPATH},-sane \
${BASE_PKGPATH},-dcraw \
${BASE_PKGPATH},-face
@@ -229,7 +212,7 @@ CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PA
-DCMAKE_DISABLE_FIND_PACKAGE_Hupnp=Yes \
-DCMAKE_DISABLE_FIND_PACKAGE_QtSoap=Yes \
-DDIGIKAMSC_COMPILE_LIBKFACE=Yes \
- -DDIGIKAMSC_COMPILE_LIBKGEOMAP=Yes \
+ -DDIGIKAMSC_COMPILE_LIBKGEOMAP=No \
-DDIGIKAMSC_COMPILE_LIBKSANE=Yes \
-DDIGIKAMSC_COMPILE_LIBKIPI=Yes \
-DDIGIKAMSC_COMPILE_LIBKDCRAW=Yes \
Index: pkg/DESCR-geomap
===================================================================
RCS file: pkg/DESCR-geomap
diff -N pkg/DESCR-geomap
--- pkg/DESCR-geomap 22 Mar 2019 22:09:37 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-Libkgeomap is a wrapper around different world-map components, to browse and
-arrange photos over a map. Currently supported map engine are:
- - Marble,
- - OpenstreetMap (via Marble),
- - GoogleMap,
-This library is used by kipi-plugins, digiKam and other Kipi host programs.
Index: pkg/PLIST-dcraw
===================================================================
RCS file: /cvs/ports/graphics/digikam-kde4/pkg/PLIST-dcraw,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST-dcraw
--- pkg/PLIST-dcraw 28 Mar 2019 19:28:47 -0000 1.1
+++ pkg/PLIST-dcraw 2 May 2019 15:57:42 -0000
@@ -1,8 +1,8 @@
-@comment $OpenBSD:
+@comment $OpenBSD: PLIST-dcraw,v$
+@conflict kde4-libkdcraw-icons-<=4.14.3p3
@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/
Index: pkg/PLIST-geomap
===================================================================
RCS file: pkg/PLIST-geomap
diff -N pkg/PLIST-geomap
--- pkg/PLIST-geomap 22 Mar 2019 22:09:37 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-@comment $OpenBSD: PLIST-geomap,v 1.4 2019/03/22 22:09:37 rsadowski Exp $
-@pkgpath x11/kde-applications/libkgeomap
-@bin bin/libkgeomap_demo
-@lib lib/libkgeomap.so.${LIBkgeomap_VERSION}
-share/apps/libkgeomap/
-share/apps/libkgeomap/backend-googlemaps-js.js
-share/apps/libkgeomap/backend-googlemaps.html
-share/apps/libkgeomap/backend-osm-js.js
-share/apps/libkgeomap/backend-osm.html
-share/apps/libkgeomap/cluster-circle-00ff00-selected.png
-share/apps/libkgeomap/cluster-circle-00ff00-someselected.png
-share/apps/libkgeomap/cluster-circle-00ff00.png
-share/apps/libkgeomap/cluster-circle-00ffff-selected.png
-share/apps/libkgeomap/cluster-circle-00ffff-someselected.png
-share/apps/libkgeomap/cluster-circle-00ffff.png
-share/apps/libkgeomap/cluster-circle-ff0000-selected.png
-share/apps/libkgeomap/cluster-circle-ff0000-someselected.png
-share/apps/libkgeomap/cluster-circle-ff0000.png
-share/apps/libkgeomap/cluster-circle-ff7f00-selected.png
-share/apps/libkgeomap/cluster-circle-ff7f00-someselected.png
-share/apps/libkgeomap/cluster-circle-ff7f00.png
-share/apps/libkgeomap/cluster-circle-ffff00-selected.png
-share/apps/libkgeomap/cluster-circle-ffff00-someselected.png
-share/apps/libkgeomap/cluster-circle-ffff00.png
-share/apps/libkgeomap/marker-00ff00-selected.png
-share/apps/libkgeomap/marker-00ff00-someselected.png
-share/apps/libkgeomap/marker-00ff00.png
-share/apps/libkgeomap/marker-00ffff-selected.png
-share/apps/libkgeomap/marker-00ffff-someselected.png
-share/apps/libkgeomap/marker-00ffff.png
-share/apps/libkgeomap/marker-ff0000-selected.png
-share/apps/libkgeomap/marker-ff0000-someselected.png
-share/apps/libkgeomap/marker-ff0000.png
-share/apps/libkgeomap/marker-ff7f00-selected.png
-share/apps/libkgeomap/marker-ff7f00-someselected.png
-share/apps/libkgeomap/marker-ff7f00.png
-share/apps/libkgeomap/marker-ffff00-selected.png
-share/apps/libkgeomap/marker-ffff00-someselected.png
-share/apps/libkgeomap/marker-ffff00.png
-share/apps/libkgeomap/marker-icon-16x16.png
Index: pkg/PLIST-kipi
===================================================================
RCS file: /cvs/ports/graphics/digikam-kde4/pkg/PLIST-kipi,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST-kipi
--- pkg/PLIST-kipi 28 Mar 2019 19:28:47 -0000 1.7
+++ pkg/PLIST-kipi 2 May 2019 15:57:42 -0000
@@ -20,7 +20,6 @@ lib/kde4/kipiplugin_flashexport.so
lib/kde4/kipiplugin_flickrexport.so
lib/kde4/kipiplugin_galleryexport.so
lib/kde4/kipiplugin_googleservices.so
-lib/kde4/kipiplugin_gpssync.so
lib/kde4/kipiplugin_htmlexport.so
lib/kde4/kipiplugin_imageshackexport.so
lib/kde4/kipiplugin_imageviewer.so
@@ -52,10 +51,6 @@ share/applications/kde4/dngconverter.des
share/applications/kde4/expoblending.desktop
share/applications/kde4/kipiplugins.desktop
share/applications/kde4/panoramagui.desktop
-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
@@ -73,7 +68,6 @@ share/apps/kipi/kipiplugin_flashexportui
share/apps/kipi/kipiplugin_flickrexportui.rc
share/apps/kipi/kipiplugin_galleryexportui.rc
share/apps/kipi/kipiplugin_googleservicesui.rc
-share/apps/kipi/kipiplugin_gpssyncui.rc
share/apps/kipi/kipiplugin_htmlexportui.rc
share/apps/kipi/kipiplugin_imageshackexportui.rc
share/apps/kipi/kipiplugin_imageviewerui.rc
@@ -311,7 +305,6 @@ share/icons/hicolor/16x16/apps/kipi-flas
share/icons/hicolor/16x16/apps/kipi-flickr.png
share/icons/hicolor/16x16/apps/kipi-gallery.png
share/icons/hicolor/16x16/apps/kipi-googledrive.png
-share/icons/hicolor/16x16/apps/kipi-gpsimagetag.png
share/icons/hicolor/16x16/apps/kipi-hq.png
share/icons/hicolor/16x16/apps/kipi-imgur.png
share/icons/hicolor/16x16/apps/kipi-jalbum.png
@@ -362,7 +355,6 @@ share/icons/hicolor/32x32/apps/kipi-flas
share/icons/hicolor/32x32/apps/kipi-flickr.png
share/icons/hicolor/32x32/apps/kipi-gallery.png
share/icons/hicolor/32x32/apps/kipi-googledrive.png
-share/icons/hicolor/32x32/apps/kipi-gpsimagetag.png
share/icons/hicolor/32x32/apps/kipi-hq.png
share/icons/hicolor/32x32/apps/kipi-imageshack.png
share/icons/hicolor/32x32/apps/kipi-imgur.png
@@ -450,7 +442,6 @@ share/kde4/services/kipiplugin_flashexpo
share/kde4/services/kipiplugin_flickrexport.desktop
share/kde4/services/kipiplugin_galleryexport.desktop
share/kde4/services/kipiplugin_googleservices.desktop
-share/kde4/services/kipiplugin_gpssync.desktop
share/kde4/services/kipiplugin_htmlexport.desktop
share/kde4/services/kipiplugin_imageshackexport.desktop
share/kde4/services/kipiplugin_imageviewer.desktop
Index: pkg/PLIST-libkipi
===================================================================
RCS file: /cvs/ports/graphics/digikam-kde4/pkg/PLIST-libkipi,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST-libkipi
--- pkg/PLIST-libkipi 28 Mar 2019 19:28:47 -0000 1.1
+++ pkg/PLIST-libkipi 2 May 2019 15:57:42 -0000
@@ -1,8 +1,8 @@
-@comment $OpenBSD:
+@comment $OpenBSD: PLIST-libkipi,v$
+@conflict kde4-libkipi-icons-<=4.14.3p3
@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/
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/graphics/digikam-kde4/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 28 Mar 2019 19:28:47 -0000 1.7
+++ pkg/PLIST-main 2 May 2019 15:57:42 -0000
@@ -14,10 +14,12 @@ lib/kde4/kio_digikamdates.so
lib/kde4/kio_digikammapimages.so
lib/kde4/kio_digikamsearch.so
lib/kde4/kio_digikamtags.so
+lib/kde4/kipiplugin_kxmlhelloworld.so
@lib lib/libdigikamcore.so.${LIBdigikamcore_VERSION}
@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: /cvs/ports/graphics/digikam-kde4/pkg/PLIST-sane,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST-sane
--- pkg/PLIST-sane 28 Mar 2019 19:28:47 -0000 1.1
+++ pkg/PLIST-sane 2 May 2019 15:57:42 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD:
+@comment $OpenBSD: PLIST-sane,v$
@pkgpath x11/kde4/libksane
@lib lib/libksane.so.${LIBksane_VERSION}
share/icons/hicolor/16x16/actions/black-white.png
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.742
diff -u -p -u -p -r1.742 Makefile
--- Makefile 1 May 2019 13:49:52 -0000 1.742
+++ Makefile 2 May 2019 16:08:51 -0000
@@ -8,6 +8,7 @@ DISTFILES =
PKGNAME = quirks-3.135
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
+REVISION = 0
# BSD
PERMIT_PACKAGE_CDROM = Yes
Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.759
diff -u -p -u -p -r1.759 Quirks.pm
--- files/Quirks.pm 1 May 2019 13:49:52 -0000 1.759
+++ files/Quirks.pm 2 May 2019 16:08:51 -0000
@@ -1222,6 +1222,7 @@ my $obsolete_reason = {
'gnome-code-assistance' => 3,
'gedit-code-assistance' => 3,
'py3-backports-abc' => 5,
+ 'libkgeomap' => 0,
};
# reasons for obsolete packages
