pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
kde-runtime4: update to 17.08.3. Disable some more bits.
Module Name: pkgsrc-wip
Committed By: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By: markd
Date: Sun Jan 28 12:48:36 2018 +1300
Changeset: 80a515f0d7a11564b8d688c7a750abc0c2d136a3
Modified Files:
kde-runtime4/Makefile
kde-runtime4/PLIST
kde-runtime4/distinfo
Added Files:
kde-runtime4/patches/patch-kioslave_thumbnail_CMakeLists.txt
kde-runtime4/patches/patch-plasma_declarativeimports_CMakeLists.txt
kde-runtime4/patches/patch-plasma_declarativeimports_graphicswidgets_graphicswidgetsbindingsplugin.cpp
kde-runtime4/patches/patch-plasma_scriptengines_javascript_simplebindings_uiloader.cpp
Log Message:
kde-runtime4: update to 17.08.3. Disable some more bits.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=80a515f0d7a11564b8d688c7a750abc0c2d136a3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
kde-runtime4/Makefile | 8 +++---
kde-runtime4/PLIST | 27 +------------------
kde-runtime4/distinfo | 12 ++++++---
.../patch-kioslave_thumbnail_CMakeLists.txt | 25 +++++++++++++++++
.../patch-plasma_declarativeimports_CMakeLists.txt | 12 +++++++++
...aphicswidgets_graphicswidgetsbindingsplugin.cpp | 22 +++++++++++++++
...tengines_javascript_simplebindings_uiloader.cpp | 31 ++++++++++++++++++++++
7 files changed, 104 insertions(+), 33 deletions(-)
diffs:
diff --git a/kde-runtime4/Makefile b/kde-runtime4/Makefile
index 7b2afa0128..c9d494fbd9 100644
--- a/kde-runtime4/Makefile
+++ b/kde-runtime4/Makefile
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.64 2016/04/22 08:04:23 jperkin Exp $
-DISTNAME= kde-runtime-16.04.0
+DISTNAME= kde-runtime-17.08.3
PKGNAME= ${DISTNAME:S/-1/4-1/}
CATEGORIES= x11
COMMENT= Runtime requirements for the KDE integrated X11 desktop
-MASTER_SITES= ${MASTER_SITE_KDE:=applications/16.04.0/src/}
+MASTER_SITES= ${MASTER_SITE_KDE:=applications/17.08.3/src/}
.include "../../meta-pkgs/kde4/Makefile.kde4"
@@ -18,9 +18,12 @@ CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.dylib
CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
.endif
+CMAKE_ARGS+= -DWITH_QNtrack=OFF
+CMAKE_ARGS+= -DWITH_NepomukCore=OFF
CMAKE_ARGS+= -DBUILD_khelpcenter=OFF
CMAKE_ARGS+= -DBUILD_kglobalaccel=OFF
CMAKE_ARGS+= -DBUILD_kuiserver=OFF
+CMAKE_ARGS+= -DBUILD_drkonqi=OFF
CMAKE_ARGS+= -DBUILD_doc=OFF
#DEPENDS+= htdig>=3.2.0:../../www/htdig
@@ -93,7 +96,6 @@ BUILDLINK_ABI_DEPENDS.attica?= attica>=0.1.4
.include "../../multimedia/xine-lib/buildlink3.mk"
.include "../../net/openslp/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/libkactivities4/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/kde-runtime4/PLIST b/kde-runtime4/PLIST
index 03d2e113cb..3b16e43d4c 100644
--- a/kde-runtime4/PLIST
+++ b/kde-runtime4/PLIST
@@ -36,7 +36,6 @@ ${PLIST.x11}lib/kde4/cursorthumbnail.so
lib/kde4/djvuthumbnail.so
lib/kde4/exrthumbnail.so
lib/kde4/fixhosturifilter.so
-lib/kde4/htmlthumbnail.so
lib/kde4/imagethumbnail.so
lib/kde4/imports/org/kde/dirmodel/libdirmodelplugin.so
lib/kde4/imports/org/kde/dirmodel/qmldir
@@ -92,21 +91,6 @@ lib/kde4/imports/org/kde/plasma/components/private/TextFieldFocus.qml
lib/kde4/imports/org/kde/plasma/components/qmldir
lib/kde4/imports/org/kde/plasma/core/libcorebindingsplugin.so
lib/kde4/imports/org/kde/plasma/core/qmldir
-lib/kde4/imports/org/kde/plasma/extras/App.qml
-lib/kde4/imports/org/kde/plasma/extras/ConditionalLoader.qml
-lib/kde4/imports/org/kde/plasma/extras/Heading.qml
-lib/kde4/imports/org/kde/plasma/extras/PageRow.qml
-lib/kde4/imports/org/kde/plasma/extras/Paragraph.qml
-lib/kde4/imports/org/kde/plasma/extras/ScrollArea.qml
-lib/kde4/imports/org/kde/plasma/extras/Title.qml
-lib/kde4/imports/org/kde/plasma/extras/animations/ActivateAnimation.qml
-lib/kde4/imports/org/kde/plasma/extras/animations/Animations.js
-lib/kde4/imports/org/kde/plasma/extras/animations/AppearAnimation.qml
-lib/kde4/imports/org/kde/plasma/extras/animations/DisappearAnimation.qml
-lib/kde4/imports/org/kde/plasma/extras/animations/PressedAnimation.qml
-lib/kde4/imports/org/kde/plasma/extras/animations/ReleasedAnimation.qml
-lib/kde4/imports/org/kde/plasma/extras/libplasmaextracomponentsplugin.so
-lib/kde4/imports/org/kde/plasma/extras/qmldir
lib/kde4/imports/org/kde/plasma/graphicslayouts/libgraphicslayoutsbindingsplugin.so
lib/kde4/imports/org/kde/plasma/graphicslayouts/qmldir
lib/kde4/imports/org/kde/plasma/graphicswidgets/libgraphicswidgetsbindingsplugin.so
@@ -164,7 +148,6 @@ lib/kde4/kio_trash.so
lib/kde4/kshorturifilter.so
lib/kde4/kuriikwsfilter.so
lib/kde4/kurisearchfilter.so
-lib/kde4/libexec/drkonqi
lib/kde4/libexec/kcmremotewidgetshelper
lib/kde4/libexec/kdeeject
lib/kde4/libexec/kdesu
@@ -250,7 +233,7 @@ lib/libkwalletbackend.so.${KDELIBSVER}
lib/libmolletnetwork.so
lib/libmolletnetwork.so.4
lib/libmolletnetwork.so.${KDELIBSVER}
-${PLIST.polkit}share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
+${PLIST.polkit}share/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy
share/applications/kde4/knetattach.desktop
share/dbus-1/interfaces/org.kde.KTimeZoned.xml
share/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml
@@ -486,13 +469,6 @@ share/kde/apps/desktoptheme/oxygen/widgets/toolbox.svgz
share/kde/apps/desktoptheme/oxygen/widgets/tooltip.svgz
share/kde/apps/desktoptheme/oxygen/widgets/translucentbackground.svgz
share/kde/apps/desktoptheme/oxygen/widgets/viewitem.svgz
-share/kde/apps/drkonqi/debuggers/external/gdbrc
-share/kde/apps/drkonqi/debuggers/external/kdbgrc
-share/kde/apps/drkonqi/debuggers/internal/dbxrc
-share/kde/apps/drkonqi/debuggers/internal/gdbrc
-share/kde/apps/drkonqi/debuggers/internal/kdbgwinrc
-share/kde/apps/drkonqi/mappings
-share/kde/apps/drkonqi/pics/crash.png
share/kde/apps/hardwarenotifications/hardwarenotifications.notifyrc
share/kde/apps/kcm_componentchooser/kcm_browser.desktop
share/kde/apps/kcm_componentchooser/kcm_filemanager.desktop
@@ -502,7 +478,6 @@ share/kde/apps/kcm_componentchooser/kcm_wm.desktop
share/kde/apps/kcm_phonon/listview-background.png
share/kde/apps/kcmlocale/pics/background.png
share/kde/apps/kconf_update/devicepreference.upd
-share/kde/apps/kconf_update/drkonqi-rename-config-section.upd
share/kde/apps/kconf_update/kuriikwsfilter.upd
share/kde/apps/kconf_update/kwallet-4.13.upd
share/kde/apps/kde/kde.notifyrc
diff --git a/kde-runtime4/distinfo b/kde-runtime4/distinfo
index 47ec667360..4e244053ee 100644
--- a/kde-runtime4/distinfo
+++ b/kde-runtime4/distinfo
@@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.14 2016/04/22 08:04:23 jperkin Exp $
-SHA1 (kde-runtime-16.04.0.tar.xz) = e49c748bcf569e52bf59354e2fffe17c1f40bc26
-RMD160 (kde-runtime-16.04.0.tar.xz) = f4123828f07cb486a9a962b032870a1a40533ea0
-SHA512 (kde-runtime-16.04.0.tar.xz) = 3785b6856e6efb2ba9e8ca0bccb184c68b72231d77a6c4f8762dc0472dccb30c54a2e98b5c412b77bc53ac433fa0c89d874bc17c1a1cf5797ad255f20c468124
-Size (kde-runtime-16.04.0.tar.xz) = 7903972 bytes
+SHA1 (kde-runtime-17.08.3.tar.xz) = 5932fd4653d6697351ea5ac28b09f876ad6f06df
+RMD160 (kde-runtime-17.08.3.tar.xz) = 2b380a7f44d9de018a6db90f0db60b8553f5acb5
+SHA512 (kde-runtime-17.08.3.tar.xz) = c79a78ee5695ba67230dffd57da46b5045bba72cb1153a3a818af00d9cdc4ed8dd3131363c72ee2dbdfc55e49ba3fcded189916c15964ec1bfa6deb5c3b3f608
+Size (kde-runtime-17.08.3.tar.xz) = 7904300 bytes
SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
SHA1 (patch-ac) = fadc0c0d3b7c8f893a9249724f26e2fc2c7f0f1e
SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
@@ -14,4 +14,8 @@ SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a
SHA1 (patch-ak) = 4fee3877613afddf179a7a8376586a6391b53c89
SHA1 (patch-doc_kcontrol_CMakeLists.txt) = c6300735d29c009322e4fdb4d58a606940fb0c62
SHA1 (patch-kioslave_nfs_rpc__nfs2__prot__xdr.c) = f1d8dc8224e68ef323f06602bf4b856c785f15e4
+SHA1 (patch-kioslave_thumbnail_CMakeLists.txt) = ce0ff3d346ebf093bbb35a7edbfc069809472d6f
SHA1 (patch-kwalletd_backend_blowfish.h) = 23bd9bf9671a770d203a10c46dc602145d2b9457
+SHA1 (patch-plasma_declarativeimports_CMakeLists.txt) = 0f5a7747cd207598ca92f5200b7d79ba537fcba5
+SHA1 (patch-plasma_declarativeimports_graphicswidgets_graphicswidgetsbindingsplugin.cpp) = 6b0852831f56207f7b55454a29ca95ad408fd120
+SHA1 (patch-plasma_scriptengines_javascript_simplebindings_uiloader.cpp) = 706aeeb0924691c8afe14258f107e397d8336924
diff --git a/kde-runtime4/patches/patch-kioslave_thumbnail_CMakeLists.txt b/kde-runtime4/patches/patch-kioslave_thumbnail_CMakeLists.txt
new file mode 100644
index 0000000000..995cfd206b
--- /dev/null
+++ b/kde-runtime4/patches/patch-kioslave_thumbnail_CMakeLists.txt
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Don't use kdewebkit
+
+--- kioslave/thumbnail/CMakeLists.txt.orig 2017-10-01 01:02:55.000000000 +0000
++++ kioslave/thumbnail/CMakeLists.txt
+@@ -89,18 +89,6 @@ install(TARGETS textthumbnail DESTINATIO
+
+ ########### next target ###############
+
+-if(NOT WINCE)
+-set(htmlthumbnail_PART_SRCS htmlcreator.cpp)
+-
+-kde4_add_plugin(htmlthumbnail ${htmlthumbnail_PART_SRCS})
+-
+-target_link_libraries(htmlthumbnail ${KDE4_KDEWEBKIT_LIBS})
+-
+-install(TARGETS htmlthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
+-endif(NOT WINCE)
+-
+-########### next target ###############
+-
+ if(NOT WIN32)
+ set(djvuthumbnail_PART_SRCS djvucreator.cpp)
+
diff --git a/kde-runtime4/patches/patch-plasma_declarativeimports_CMakeLists.txt b/kde-runtime4/patches/patch-plasma_declarativeimports_CMakeLists.txt
new file mode 100644
index 0000000000..fa87a0e833
--- /dev/null
+++ b/kde-runtime4/patches/patch-plasma_declarativeimports_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD$
+
+Don't link to kactivities
+
+--- plasma/declarativeimports/CMakeLists.txt.orig 2017-10-01 01:02:55.000000000 +0000
++++ plasma/declarativeimports/CMakeLists.txt
+@@ -6,5 +6,4 @@ add_subdirectory(graphicswidgets)
+ add_subdirectory(krunnermodel)
+ add_subdirectory(qtextracomponents)
+ add_subdirectory(plasmacomponents)
+-add_subdirectory(plasmaextracomponents)
+ add_subdirectory(locale)
diff --git a/kde-runtime4/patches/patch-plasma_declarativeimports_graphicswidgets_graphicswidgetsbindingsplugin.cpp b/kde-runtime4/patches/patch-plasma_declarativeimports_graphicswidgets_graphicswidgetsbindingsplugin.cpp
new file mode 100644
index 0000000000..048cbff958
--- /dev/null
+++ b/kde-runtime4/patches/patch-plasma_declarativeimports_graphicswidgets_graphicswidgetsbindingsplugin.cpp
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Don't use kdewebkit
+
+--- plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp.orig 2017-10-01 01:02:55.000000000 +0000
++++ plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.cpp
+@@ -47,7 +47,6 @@
+ #include <Plasma/ToolButton>
+ #include <Plasma/TreeView>
+ #include <Plasma/VideoWidget>
+-#include <Plasma/WebView>
+
+ #include "declarativetabbar.h"
+
+@@ -99,7 +98,6 @@ void GraphicsWidgetsBindingsPlugin::regi
+ qmlRegisterType<Plasma::ToolButton>(uri, 0, 1, "ToolButton");
+ qmlRegisterType<Plasma::TreeView>(uri, 0, 1, "TreeView");
+ qmlRegisterType<Plasma::VideoWidget>(uri, 0, 1, "VideoWidget");
+- qmlRegisterType<Plasma::WebView>(uri, 0, 1, "WebView");
+ }
+
+
diff --git a/kde-runtime4/patches/patch-plasma_scriptengines_javascript_simplebindings_uiloader.cpp b/kde-runtime4/patches/patch-plasma_scriptengines_javascript_simplebindings_uiloader.cpp
new file mode 100644
index 0000000000..3c593a1482
--- /dev/null
+++ b/kde-runtime4/patches/patch-plasma_scriptengines_javascript_simplebindings_uiloader.cpp
@@ -0,0 +1,31 @@
+$NetBSD$
+
+Don't use kdewebkit
+
+--- plasma/scriptengines/javascript/simplebindings/uiloader.cpp.orig 2017-10-01 01:02:55.000000000 +0000
++++ plasma/scriptengines/javascript/simplebindings/uiloader.cpp
+@@ -49,7 +49,6 @@
+ #include <Plasma/TextEdit>
+ #include <Plasma/ToolButton>
+ #include <Plasma/TreeView>
+-#include <Plasma/WebView>
+ #include <Plasma/VideoWidget>
+
+
+@@ -78,7 +77,6 @@ QGraphicsWidget *createTextEdit(QGraphic
+ QGraphicsWidget *createToolButton(QGraphicsWidget *parent) { return new Plasma::ToolButton(parent); }
+ QGraphicsWidget *createTreeView(QGraphicsWidget *parent) { return new Plasma::TreeView(parent); }
+ QGraphicsWidget *createVideoWidget(QGraphicsWidget *parent) { return new Plasma::VideoWidget(parent); }
+-QGraphicsWidget *createWebView(QGraphicsWidget *parent) { return new Plasma::WebView(parent); }
+ QGraphicsWidget *createGraphicsWidget(QGraphicsWidget *parent) { return new QGraphicsWidget(parent); }
+
+ UiLoader::UiLoader()
+@@ -108,8 +106,6 @@ UiLoader::UiLoader()
+ m_widgetCtors.insert("ToolButton", createToolButton);
+ m_widgetCtors.insert("TreeView", createTreeView);
+ m_widgetCtors.insert("VideoWidget", createVideoWidget);
+- m_widgetCtors.insert("WebView", createWebView);
+- m_widgetCtors.insert("GraphicsWidget", createWebView);
+ }
+
+ UiLoader::~UiLoader()
Home |
Main Index |
Thread Index |
Old Index