To avoid bulk build conflicts with marble-kf5, let's get rid marble
support in KDE4 plasma. It's a sacrifice we have to make.
To be save I remove the all cmake bits.
Objections?
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/plasma-addons/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 1 Jul 2018 18:33:38 -0000 1.20
+++ Makefile 1 May 2019 16:52:46 -0000
@@ -2,7 +2,7 @@
COMMENT = extra KDE plasmoids
DISTNAME = kdeplasma-addons-${MODKDE4_VERSION}
-REVISION = 9
+REVISION = 10
SHARED_LIBS = lancelot-datamodels 51.1 # 1.7
SHARED_LIBS += lancelot 51.1 # 1.9
@@ -27,7 +27,7 @@ WANTLIB += ${KDE4LIB}/kfile ${KDE4LIB}/k
WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kpimutils ${KDE4LIB}/kprintutils
WANTLIB += ${KDE4LIB}/kresources
WANTLIB += ${KDE4LIB}/krosscore ${KDE4LIB}/kunitconversion ${KDE4LIB}/kutils
-WANTLIB += ${KDE4LIB}/kworkspace ${KDE4LIB}/marblewidget ${KDE4LIB}/nepomuk
+WANTLIB += ${KDE4LIB}/kworkspace ${KDE4LIB}/nepomuk
WANTLIB += ${KDE4LIB}/nepomukutils ${KDE4LIB}/plasma
WANTLIB += ${KDE4LIB}/plasmaclock ${KDE4LIB}/solid
WANTLIB += ${KDE4LIB}/taskmanager
@@ -56,7 +56,6 @@ LIB_DEPENDS = devel/qjson \
security/qoauth \
x11/dbusmenu-qt \
qwt-*-!qt5:x11/qwt \
- ${MODKDE4_DEP_DIR}/libkexiv2>=${MODKDE4_DEP_VERSION} \
- ${MODKDE4_DEP_DIR}/marble>=${MODKDE4_DEP_VERSION}
+ ${MODKDE4_DEP_DIR}/libkexiv2>=${MODKDE4_DEP_VERSION}
.include <bsd.port.mk>
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/x11/kde4/plasma-addons/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 24 Apr 2013 18:40:19 -0000 1.1.1.1
+++ patches/patch-CMakeLists_txt 1 May 2019 16:52:46 -0000
@@ -1,7 +1,23 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2013/04/24 18:40:19 zhuk Exp $
---- CMakeLists.txt.orig Sun Oct 21 22:04:46 2012
-+++ CMakeLists.txt Sun Oct 21 22:05:48 2012
-@@ -52,6 +52,7 @@ endif (NEPOMUK_FOUND)
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -35,13 +35,7 @@ macro_log_feature(QJSON_FOUND "QJSon" "Used for variou
+ macro_optional_find_package(QtOAuth)
+ macro_log_feature(QTOAUTH_FOUND "QtOAuth" "QtOAuth Library - required to
build the Plasma Microblog DataEngine" "https://github.com/ayoy/qoauth"; FALSE
"" "Needed for building Plasma Microblog DataEngine")
+
+-macro_optional_depend_package(Marble "Marble")
+-if (DEPEND_PACKAGE_Marble)
+- macro_optional_find_package(Marble)
+-else (DEPEND_PACKAGE_Marble)
+- set (MARBLE_FOUND FALSE)
+-endif (DEPEND_PACKAGE_Marble)
+-macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe"
"http://marble.kde.org"; FALSE "" "RECOMMENDED: Marble is used to provide a
desktop globe wallpaper for Plasma.")
++set (MARBLE_FOUND FALSE)
+
+ macro_optional_find_package(DBusMenuQt)
+ macro_log_feature(DBUSMENUQT_FOUND "DBusMenuQt" "DBusMenu Qt"
"https://launchpad.net/libdbusmenu-qt/"; FALSE "" "Needed for Unity support in
IconTasks.")
+@@ -52,6 +46,7 @@ endif (NEPOMUK_FOUND)
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/plasma-addons/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 1 Jul 2018 18:33:38 -0000 1.6
+++ pkg/PLIST 1 May 2019 16:52:46 -0000
@@ -198,7 +198,6 @@ lib/kde4/plasma_potd_wcpotdprovider.so
lib/kde4/plasma_runner_datetime.so
lib/kde4/plasma_runner_events.so
lib/kde4/plasma_wallpaper_mandelbrot.so
-lib/kde4/plasma_wallpaper_marble.so
lib/kde4/plasma_wallpaper_pattern.so
lib/kde4/plasma_wallpaper_potd.so
lib/kde4/plasma_wallpaper_qml.so
@@ -672,7 +671,6 @@ share/kde4/services/plasma-runner-wikipe
share/kde4/services/plasma-runner-wikitravel.desktop
share/kde4/services/plasma-runner-youtube.desktop
share/kde4/services/plasma-wallpaper-mandelbrot.desktop
-share/kde4/services/plasma-wallpaper-marble.desktop
share/kde4/services/plasma-wallpaper-pattern.desktop
share/kde4/services/plasma-wallpaper-potd.desktop
share/kde4/services/plasma-wallpaper-qml.desktop
