Hi All!
Coexistence between KDE4 and KDE4 is okay is good but only if it doesn't
harm bulk people. My INBOX is full for x11/kde-applications/dolphin*
build failures, so let's quit with KDE4 dolphin forever.
OK to remove dolphin from KDE4 and remove the conflict tags in
x11/kde-applications/dolphin*?
I hope this should help for the bulk, shouldn't it?
Rafael Sadowski
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/baseapps/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile 16 Nov 2018 06:26:12 -0000 1.17
+++ Makefile 23 Nov 2018 19:31:00 -0000
@@ -2,29 +2,21 @@
COMMENT = KDE base applications
DISTNAME = kde-baseapps-${MODKDE4_VERSION}
-REVISION = 6
+REVISION = 7
SHARED_LIBS = konq 51.0 # 6.0
SHARED_LIBS += konqsidebarplugin 51.0 # 4.0
-SHARED_LIBS += dolphinprivate 51.0 # 1.0
SHARED_LIBS += konquerorprivate 51.0 # 4.0
SHARED_LIBS += kbookmarkmodel_private 51.0 # 4.7
-WANTLIB = c m pthread z
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += ICE SM X11 Xext Xt Xrender
-WANTLIB += lib/qt4/Qt3Support lib/qt4/QtDBus lib/qt4/QtGui
-WANTLIB += lib/qt4/QtNetwork lib/qt4/QtScript lib/qt4/QtSql lib/qt4/QtSvg
-WANTLIB += lib/qt4/QtXml
-WANTLIB += ${KDE4LIB}/baloocore ${KDE4LIB}/baloofiles ${KDE4LIB}/baloopim
-WANTLIB += ${KDE4LIB}/balooqueryparser ${KDE4LIB}/baloowidgets
-WANTLIB += ${KDE4LIB}/kfilemetadata
+WANTLIB += ${COMPILER_LIBCXX} ICE lib/qt4/Qt3Support lib/qt4/QtDBus
+WANTLIB += lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtScript lib/qt4/QtSql
+WANTLIB += lib/qt4/QtSvg lib/qt4/QtXml SM X11 Xext Xt c glib-2.0
WANTLIB += ${KDE4LIB}/kactivities ${KDE4LIB}/kcmutils ${KDE4LIB}/kde3support
-WANTLIB += ${KDE4LIB}/kdesu ${KDE4LIB}/kdeui ${KDE4LIB}/kfile ${KDE4LIB}/khtml
-WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/knewstuff3
-WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
-WANTLIB += ${KDE4LIB}/plasma ${KDE4LIB}/solid
-WANTLIB += glib-2.0 soprano tidyp
+WANTLIB += ${KDE4LIB}/kdesu ${KDE4LIB}/kdeui ${KDE4LIB}/kfile
+WANTLIB += ${KDE4LIB}/khtml ${KDE4LIB}/kio ${KDE4LIB}/kjs ${KDE4LIB}/kparts
+WANTLIB += m ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils ${KDE4LIB}/plasma
+WANTLIB += ${KDE4LIB}/solid soprano tidyp z
MODULES = multimedia/phonon
@@ -36,8 +28,8 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = devel/glib2 \
www/tidyp \
- ${MODKDE4_DEP_DIR}/baloo>=${MODKDE4_VERSION} \
- ${MODKDE4_DEP_DIR}/baloo-widgets>=${MODKDE4_DEP_VERSION} \
${MODKDE4_DEP_DIR}/kactivities>=${MIN_ACTIVITIES_VERSION}
+
+TEST_IS_INTERACTIVE = X11
.include <bsd.port.mk>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/baseapps/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- pkg/PLIST 16 Nov 2018 06:26:12 -0000 1.9
+++ pkg/PLIST 23 Nov 2018 19:31:00 -0000
@@ -1,11 +1,7 @@
@comment $OpenBSD: PLIST,v 1.9 2018/11/16 06:26:12 rsadowski Exp $
@conflict kdeaddons-<4
@conflict kdebase-<4
-@conflict kf5-baloo-*
-@conflict dolphin-kf5-*
-@conflict dolphin-plugins-kf5-*
@newgroup _kdesud:583
-@bin bin/dolphin
@bin bin/fsview
@bin bin/kbookmarkmerger
@bin bin/kdepasswd
@@ -16,8 +12,6 @@
@bin bin/konqueror
@bin bin/nspluginscan
@bin bin/nspluginviewer
-bin/servicemenudeinstallation
-bin/servicemenuinstallation
include/kde4/knewmenu.h
include/kde4/konq_dndpopupmenuplugin.h
include/kde4/konq_events.h
@@ -39,13 +33,8 @@ lib/kde4/akregatorkonqfeedicon.so
lib/kde4/autorefresh.so
lib/kde4/babelfishplugin.so
lib/kde4/dirfilterplugin.so
-lib/kde4/dolphinpart.so
lib/kde4/domtreeviewerplugin.so
lib/kde4/fsviewpart.so
-lib/kde4/kcm_dolphingeneral.so
-lib/kde4/kcm_dolphinnavigation.so
-lib/kde4/kcm_dolphinservices.so
-lib/kde4/kcm_dolphinviewmodes.so
lib/kde4/kcm_history.so
lib/kde4/kcm_kio.so
lib/kde4/kcm_konq.so
@@ -58,7 +47,6 @@ lib/kde4/kded_konqy_preloader.so
lib/kde4/khtmlkttsdplugin.so
lib/kde4/khtmlsettingsplugin.so
lib/kde4/kimgallery.so
-lib/kde4/kio_filenamesearch.so
lib/kde4/konq_aboutpage.so
lib/kde4/konq_shellcmdplugin.so
lib/kde4/konq_sidebar.so
@@ -71,7 +59,6 @@ lib/kde4/konqsidebar_tree.so
lib/kde4/konqsidebar_web.so
lib/kde4/libkcminit_nsplugins.so
lib/kde4/libnsplugin.so
-@lib ${KDE4LIB}/libdolphinprivate.so.${LIBdolphinprivate_VERSION}
@lib
${KDE4LIB}/libkbookmarkmodel_private.so.${LIBkbookmarkmodel_private_VERSION}
@lib ${KDE4LIB}/libkonq.so.${LIBkonq_VERSION}
@lib ${KDE4LIB}/libkonqsidebarplugin.so.${LIBkonqsidebarplugin_VERSION}
@@ -84,9 +71,7 @@ lib/kde4/uachangerplugin.so
lib/kde4/validatorsplugin.so
lib/kde4/webarchiverplugin.so
lib/kde4/webarchivethumbnail.so
-@lib lib/libdolphinprivate.so.${LIBdolphinprivate_VERSION}
@lib lib/libkbookmarkmodel_private.so.${LIBkbookmarkmodel_private_VERSION}
-lib/libkdeinit4_dolphin.so
lib/libkdeinit4_keditbookmarks.so
lib/libkdeinit4_kfmclient.so
lib/libkdeinit4_konqueror.so
@@ -95,10 +80,7 @@ lib/libkdeinit4_konqueror.so
@lib lib/libkonquerorprivate.so.${LIBkonquerorprivate_VERSION}
@man man/man1/kbookmarkmerger.1
@man man/man1/kfind.1
-share/appdata/
-share/appdata/dolphin.appdata.xml
share/applications/kde4/Home.desktop
-share/applications/kde4/dolphin.desktop
share/applications/kde4/kdepasswd.desktop
share/applications/kde4/keditbookmarks.desktop
share/applications/kde4/kfind.desktop
@@ -111,10 +93,7 @@ share/applications/kde4/konquerorsu.desk
share/apps/akregator/
share/apps/akregator/pics/
share/apps/akregator/pics/feed.png
-share/apps/dolphin/
-share/apps/dolphin/dolphinui.rc
share/apps/dolphinpart/
-share/apps/dolphinpart/dolphinpart.rc
share/apps/dolphinpart/kpartplugins/
share/apps/dolphinpart/kpartplugins/dirfilterplugin.desktop
share/apps/dolphinpart/kpartplugins/dirfilterplugin.rc
@@ -271,19 +250,12 @@ share/apps/kwebkitpart/kpartplugins/uach
share/apps/nsplugin/
share/apps/nsplugin/nspluginpart.rc
share/autostart/konqy_preload.desktop
-share/config.kcfg/dolphin_compactmodesettings.kcfg
-share/config.kcfg/dolphin_detailsmodesettings.kcfg
-share/config.kcfg/dolphin_directoryviewpropertysettings.kcfg
-share/config.kcfg/dolphin_generalsettings.kcfg
-share/config.kcfg/dolphin_iconsmodesettings.kcfg
-share/config.kcfg/dolphin_versioncontrolsettings.kcfg
share/config.kcfg/kcm_useraccount.kcfg
share/config.kcfg/kcm_useraccount_pass.kcfg
share/config.kcfg/keditbookmarks.kcfg
share/config.kcfg/konqueror.kcfg
share/config.kcfg/validators.kcfg
share/config/konqsidebartngrc
-share/config/servicemenu.knsrc
share/config/translaterc
share/dbus-1/interfaces/org.kde.FavIcon.xml
share/dbus-1/interfaces/org.kde.Konqueror.Main.xml
@@ -361,43 +333,49 @@ share/icons/hicolor/48x48/apps/konqueror
share/icons/hicolor/64x64/apps/kfind.png
share/icons/hicolor/64x64/apps/konqueror.png
share/icons/hicolor/scalable/apps/konqueror.svgz
+share/icons/oxygen/16x16/
+share/icons/oxygen/16x16/actions/
share/icons/oxygen/16x16/actions/babelfish.png
share/icons/oxygen/16x16/actions/cssvalidator.png
share/icons/oxygen/16x16/actions/htmlvalidator.png
share/icons/oxygen/16x16/actions/imagegallery.png
share/icons/oxygen/16x16/actions/validators.png
share/icons/oxygen/16x16/actions/webarchiver.png
+share/icons/oxygen/22x22/
+share/icons/oxygen/22x22/actions/
share/icons/oxygen/22x22/actions/babelfish.png
share/icons/oxygen/22x22/actions/cssvalidator.png
share/icons/oxygen/22x22/actions/htmlvalidator.png
share/icons/oxygen/22x22/actions/imagegallery.png
share/icons/oxygen/22x22/actions/validators.png
share/icons/oxygen/22x22/actions/webarchiver.png
+share/icons/oxygen/32x32/
+share/icons/oxygen/32x32/actions/
share/icons/oxygen/32x32/actions/htmlvalidator.png
share/icons/oxygen/32x32/actions/validators.png
+share/icons/oxygen/48x48/
+share/icons/oxygen/48x48/actions/
share/icons/oxygen/48x48/actions/htmlvalidator.png
share/icons/oxygen/48x48/actions/validators.png
+share/icons/oxygen/64x64/
+share/icons/oxygen/64x64/actions/
share/icons/oxygen/64x64/actions/htmlvalidator.png
share/icons/oxygen/64x64/actions/validators.png
share/icons/oxygen/scalable/
share/icons/oxygen/scalable/actions/
share/icons/oxygen/scalable/actions/htmlvalidator.svgz
share/icons/oxygen/scalable/actions/validators.svgz
+share/kde4/
+share/kde4/services/
share/kde4/services/ServiceMenus/
share/kde4/services/ServiceMenus/imageconverter.desktop
share/kde4/services/bookmarks.desktop
share/kde4/services/cache.desktop
share/kde4/services/cookies.desktop
-share/kde4/services/dolphinpart.desktop
share/kde4/services/ebrowsing.desktop
share/kde4/services/filebehavior.desktop
-share/kde4/services/filenamesearch.protocol
share/kde4/services/fsview_part.desktop
share/kde4/services/kcm_useraccount.desktop
-share/kde4/services/kcmdolphingeneral.desktop
-share/kde4/services/kcmdolphinnavigation.desktop
-share/kde4/services/kcmdolphinservices.desktop
-share/kde4/services/kcmdolphinviewmodes.desktop
share/kde4/services/kcmhistory.desktop
share/kde4/services/kcmkonqyperformance.desktop
share/kde4/services/kcmperformance.desktop
@@ -459,7 +437,6 @@ share/kde4/services/useragentstrings/saf
share/kde4/services/useragentstrings/w3moncurrent.desktop
share/kde4/services/useragentstrings/wgetoncurrent.desktop
share/kde4/services/webarchivethumbnail.desktop
-share/kde4/servicetypes/fileviewversioncontrolplugin.desktop
share/kde4/servicetypes/konqaboutpage.desktop
share/kde4/servicetypes/konqdndpopupmenuplugin.desktop
share/kde4/servicetypes/konqpopupmenuplugin.desktop
