systemsettings: make 5.18.5 build

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: systemsettings: make 5.18.5 build
From: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Date: Sat, 04 Sep 2021 03:27:06 +0000
Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sat Sep 4 15:27:06 2021 +1200
Changeset:	58dd67d0ff96a11ffd27deef2f3ce77f9b869f68

Modified Files:
	systemsettings/Makefile
	systemsettings/PLIST
	systemsettings/buildlink3.mk
	systemsettings/distinfo

Log Message:
systemsettings: make 5.18.5 build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=58dd67d0ff96a11ffd27deef2f3ce77f9b869f68

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 systemsettings/Makefile      | 18 ++++--------------
 systemsettings/PLIST         | 14 +++++++-------
 systemsettings/buildlink3.mk |  4 +---
 systemsettings/distinfo      |  8 ++++----
 4 files changed, 16 insertions(+), 28 deletions(-)

diffs:
diff --git a/systemsettings/Makefile b/systemsettings/Makefile
index 17ae1b3c75..7e231d9e21 100644
--- a/systemsettings/Makefile
+++ b/systemsettings/Makefile
@@ -1,17 +1,14 @@
 # $NetBSD: Makefile,v 1.25 2016/01/10 20:01:05 markd Exp $
 
 DISTNAME=	systemsettings-${PLASMAVER}
-PKGREVISION=	1
 CATEGORIES=	x11
 
-HOMEPAGE=	https://www.kde.org/workspaces/plasmadesktop/
+HOMEPAGE=	https://kde.org/plasma-desktop/
 COMMENT=	KDE system settings
 LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
 
 .include "../../meta-pkgs/kde/plasma5.mk"
 
-CONFLICTS+=	kde-workspace4-[0-9]*
-
 BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
 USE_TOOLS+=	msgmerge
@@ -19,17 +16,10 @@ USE_TOOLS+=	msgmerge
 SUBST_CLASSES+=		fix-moc
 SUBST_STAGE.fix-moc=	post-configure
 SUBST_MESSAGE.fix-moc=	Cleaning up MOC includes
-SUBST_FILES.fix-moc=	_KDE_build/*/CMakeFiles/*_autogen.dir/AutogenInfo.cmake
-SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
-
-SUBST_CLASSES+=		qlc
-SUBST_STAGE.qlc=	pre-configure
-SUBST_MESSAGE.qlc=	Move to new KDE location
-SUBST_FILES.qlc=	CMakeLists.txt
-SUBST_SED.qlc=		-e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_LOGGINGCATEGORIESDIR}:'
+SUBST_FILES.fix-moc=	_KDE_build/*/CMakeFiles/*_autogen.dir/AutogenInfo.json
+SUBST_NOOP_OK.fix-moc=	yes
+SUBST_SED.fix-moc=	-e 's;"${PREFIX}/include",;;g'
 
-.include "../../www/khtml/buildlink3.mk"
-.include "../../x11/kactivities-stats/buildlink3.mk"
 .include "../../wip/plasma-workspace/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/systemsettings/PLIST b/systemsettings/PLIST
index ba8cd55a16..16fd5498ee 100644
--- a/systemsettings/PLIST
+++ b/systemsettings/PLIST
@@ -9,7 +9,6 @@ include/systemsettingsview/ModuleView.h
 include/systemsettingsview/systemsettingsview_export.h
 lib/libsystemsettingsview.so
 lib/libsystemsettingsview.so.3
-qt5/plugins/classic_mode.so
 qt5/plugins/icon_mode.so
 qt5/plugins/systemsettings_sidebar_mode.so
 share/applications/kdesystemsettings.desktop
@@ -20,6 +19,10 @@ share/doc/HTML/de/systemsettings/index.cache.bz2
 share/doc/HTML/de/systemsettings/index.docbook
 share/doc/HTML/en/systemsettings/index.cache.bz2
 share/doc/HTML/en/systemsettings/index.docbook
+share/doc/HTML/es/systemsettings/index.cache.bz2
+share/doc/HTML/es/systemsettings/index.docbook
+share/doc/HTML/id/systemsettings/index.cache.bz2
+share/doc/HTML/id/systemsettings/index.docbook
 share/doc/HTML/it/systemsettings/index.cache.bz2
 share/doc/HTML/it/systemsettings/index.docbook
 share/doc/HTML/nl/systemsettings/index.cache.bz2
@@ -34,7 +37,7 @@ share/doc/HTML/sv/systemsettings/index.cache.bz2
 share/doc/HTML/sv/systemsettings/index.docbook
 share/doc/HTML/uk/systemsettings/index.cache.bz2
 share/doc/HTML/uk/systemsettings/index.docbook
-share/kpackage/genericqml/org.kde.systemsettings.sidebar/contents/ui/ActionMenu.qml
+share/kpackage/genericqml/org.kde.systemsettings.sidebar/contents/images/plasma-logo.svg
 share/kpackage/genericqml/org.kde.systemsettings.sidebar/contents/ui/CategoriesPage.qml
 share/kpackage/genericqml/org.kde.systemsettings.sidebar/contents/ui/IntroIcon.qml
 share/kpackage/genericqml/org.kde.systemsettings.sidebar/contents/ui/SubCategoryPage.qml
@@ -45,9 +48,7 @@ share/kservices5/settings-appearance-applicationstyle.desktop
 share/kservices5/settings-appearance-color.desktop
 share/kservices5/settings-appearance-font.desktop
 share/kservices5/settings-appearance-icons.desktop
-share/kservices5/settings-appearance-workspacetheme.desktop
 share/kservices5/settings-appearance.desktop
-share/kservices5/settings-classic-view.desktop
 share/kservices5/settings-hardware-display.desktop
 share/kservices5/settings-hardware-input.desktop
 share/kservices5/settings-hardware-multimedia.desktop
@@ -67,6 +68,7 @@ share/kservices5/settings-personalization-notification.desktop
 share/kservices5/settings-personalization-regionalsettings.desktop
 share/kservices5/settings-personalization.desktop
 share/kservices5/settings-sidebar-view.desktop
+share/kservices5/settings-system-administration.desktop
 share/kservices5/settings-workspace-desktopbehavior.desktop
 share/kservices5/settings-workspace-search.desktop
 share/kservices5/settings-workspace-session.desktop
@@ -130,7 +132,6 @@ share/locale/ne/LC_MESSAGES/systemsettings.mo
 share/locale/nl/LC_MESSAGES/systemsettings.mo
 share/locale/nn/LC_MESSAGES/systemsettings.mo
 share/locale/oc/LC_MESSAGES/systemsettings.mo
-share/locale/or/LC_MESSAGES/systemsettings.mo
 share/locale/pa/LC_MESSAGES/systemsettings.mo
 share/locale/pl/LC_MESSAGES/systemsettings.mo
 share/locale/pt/LC_MESSAGES/systemsettings.mo
@@ -158,7 +159,6 @@ share/locale/vi/LC_MESSAGES/systemsettings.mo
 share/locale/wa/LC_MESSAGES/systemsettings.mo
 share/locale/zh_CN/LC_MESSAGES/systemsettings.mo
 share/locale/zh_TW/LC_MESSAGES/systemsettings.mo
+share/metainfo/org.kde.systemsettings.metainfo.xml
 share/qlogging-categories5/systemsettings.categories
-share/systemsettings/classic/main.html
-share/systemsettings/classic/systemsettings-classic.css
 share/systemsettings/systemsettings.kcfg
diff --git a/systemsettings/buildlink3.mk b/systemsettings/buildlink3.mk
index e0087b33fc..ee2744e8c8 100644
--- a/systemsettings/buildlink3.mk
+++ b/systemsettings/buildlink3.mk
@@ -6,11 +6,9 @@ BUILDLINK_TREE+=	systemsettings
 SYSTEMSETTINGS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.systemsettings+=	systemsettings>=5.6.3
-BUILDLINK_ABI_DEPENDS.systemsettings?=	systemsettings>=5.18.5nb1
 BUILDLINK_PKGSRCDIR.systemsettings?=	../../wip/systemsettings
 
-.include "../../devel/kcmutils/buildlink3.mk"
-.include "../../www/khtml/buildlink3.mk"
+.include "../../wip/plasma-workspace/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .endif	# SYSTEMSETTINGS_BUILDLINK3_MK
 
diff --git a/systemsettings/distinfo b/systemsettings/distinfo
index 3c53e6723f..b0ab393e25 100644
--- a/systemsettings/distinfo
+++ b/systemsettings/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (systemsettings-5.16.4.tar.xz) = 36550fdfc1a3d4fb6e80aca759af7dc907fe729d
-RMD160 (systemsettings-5.16.4.tar.xz) = 2166d7418be2337c0b46e14965d835d02d1149d2
-SHA512 (systemsettings-5.16.4.tar.xz) = 8bd4ffbda585e76bff8b42a588b6ce476ca46671e258a34b294859aea2d0a00e40425f783ee39ca139f54f858067c5ded109f8280193bd22e19ae01904744ae8
-Size (systemsettings-5.16.4.tar.xz) = 178620 bytes
+SHA1 (systemsettings-5.18.5.tar.xz) = 17d1d4f2a2b80f94d9bf166303d6241722c954c4
+RMD160 (systemsettings-5.18.5.tar.xz) = deab27829dcdff4214cbe8d4737c3e9257e085ef
+SHA512 (systemsettings-5.18.5.tar.xz) = b6b9184570f188878daca140bd81ee13d47ba867eac5289b67295de9918205e5ebc7f7d644968fbbd9d9dfe1395cae6bd29f7ba4c4aa9a82f85b912693ae4e6a
+Size (systemsettings-5.18.5.tar.xz) = 178252 bytes
Prev by Date: plasma-workspace: add kitemmodels and kactivities-stats to buildlink
Next by Date: polkit-kde-agent: fix HOMEPAGE
Previous by Thread: plasma-workspace: add kitemmodels and kactivities-stats to buildlink
Next by Thread: polkit-kde-agent: fix HOMEPAGE
Indexes:
Home | Main Index | Thread Index | Old Index