plasma-workspace: SUBST rather than patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: plasma-workspace: SUBST rather than patches
From: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Date: Sat, 03 Feb 2018 00:53:45 +0000
Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sat Feb 3 13:53:45 2018 +1300
Changeset:	d7d492d69dfcc1c232e8655556dad3a0c2eb5ded

Modified Files:
	plasma-workspace/Makefile
	plasma-workspace/distinfo
Removed Files:
	plasma-workspace/patches/patch-components_shellprivate_CMakeLists.txt
	plasma-workspace/patches/patch-klipper_CMakeLists.txt
	plasma-workspace/patches/patch-krunner_CMakeLists.txt
	plasma-workspace/patches/patch-kuiserver_CMakeLists.txt
	plasma-workspace/patches/patch-libtaskmanager_CMakeLists.txt
	plasma-workspace/patches/patch-shell_CMakeLists.txt
	plasma-workspace/patches/patch-wallpapers_image_CMakeLists.txt
	plasma-workspace/patches/patch-xembed-sni-proxy_CMakeLists.txt

Log Message:
plasma-workspace: SUBST rather than patches

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

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

diffstat:
 plasma-workspace/Makefile                                | 16 +++++++++++++++-
 plasma-workspace/distinfo                                |  8 --------
 .../patches/patch-components_shellprivate_CMakeLists.txt | 15 ---------------
 plasma-workspace/patches/patch-klipper_CMakeLists.txt    | 15 ---------------
 plasma-workspace/patches/patch-krunner_CMakeLists.txt    | 15 ---------------
 plasma-workspace/patches/patch-kuiserver_CMakeLists.txt  | 12 ------------
 .../patches/patch-libtaskmanager_CMakeLists.txt          | 12 ------------
 plasma-workspace/patches/patch-shell_CMakeLists.txt      | 15 ---------------
 .../patches/patch-wallpapers_image_CMakeLists.txt        | 15 ---------------
 .../patches/patch-xembed-sni-proxy_CMakeLists.txt        | 13 -------------
 10 files changed, 15 insertions(+), 121 deletions(-)

diffs:
diff --git a/plasma-workspace/Makefile b/plasma-workspace/Makefile
index 726b055c0f..02d11be000 100644
--- a/plasma-workspace/Makefile
+++ b/plasma-workspace/Makefile
@@ -19,7 +19,7 @@ DEPENDS+=	plasma-integration>=${PLASMAVER}:../../wip/plasma-integration
 
 USE_TOOLS+=	msgmerge pkg-config
 
-BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+#CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Debug
 
 # generation of ksmserver.moc fails when ${PREFIX}/include in the moc include path
 SUBST_CLASSES+=		fix-moc
@@ -35,6 +35,20 @@ SUBST_FILES.qtpath=	startkde/startkde.cmake
 SUBST_VARS.qtpath=	QTDIR
 SUBST_STAGE.qtpath=	post-patch
 
+SUBST_CLASSES+=		xdg
+SUBST_STAGE.xdg=	post-patch
+SUBST_MESSAGE.xdg=	Install via examples dir.
+SUBST_FILES.xdg=	components/shellprivate/CMakeLists.txt
+SUBST_FILES.xdg+=	klipper/CMakeLists.txt
+SUBST_FILES.xdg+=	krunner/CMakeLists.txt
+SUBST_FILES.xdg+=	kuiserver/CMakeLists.txt
+SUBST_FILES.xdg+=	libtaskmanager/CMakeLists.txt
+SUBST_FILES.xdg+=	shell/CMakeLists.txt
+SUBST_FILES.xdg+=	wallpapers/image/CMakeLists.txt
+SUBST_FILES.xdg+=	xembed-sni-proxy/CMakeLists.txt
+SUBST_SED.xdg=		-e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+SUBST_SED.xdg+=		-e 's:{KDE_INSTALL_AUTOSTARTDIR}:{KDE_INSTALL_AUTOSTARTEXDIR}:'
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg/autostart
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/autostart/krunner.desktop \
 		${PKG_SYSCONFDIR}/xdg/autostart/krunner.desktop
diff --git a/plasma-workspace/distinfo b/plasma-workspace/distinfo
index b4d9d17f27..3843f1ef00 100644
--- a/plasma-workspace/distinfo
+++ b/plasma-workspace/distinfo
@@ -4,12 +4,4 @@ SHA1 (plasma-workspace-5.11.5.tar.xz) = fd24972b5ea77ef901a7f68dc47b36f3679cf2dd
 RMD160 (plasma-workspace-5.11.5.tar.xz) = 65ae370f6ccf30a42a4ce606b3dec2a7ae875473
 SHA512 (plasma-workspace-5.11.5.tar.xz) = 6f15e529665a5fbe24ee0420d1c8fe96ff97dbd2788ae120cd1834889b307b5979ca2aedd4f97d3cadcc7ed5cdb06c0e5f9c704ec732468db4b8ecf89270826f
 Size (plasma-workspace-5.11.5.tar.xz) = 6494360 bytes
-SHA1 (patch-components_shellprivate_CMakeLists.txt) = b8672d3415e8054087c77e3262bde46e41c88be2
-SHA1 (patch-klipper_CMakeLists.txt) = fa95e84f44901d35b3e672e2270df89038cd4551
-SHA1 (patch-krunner_CMakeLists.txt) = eb11603f00eefda5a67c8bcce85726099216f270
-SHA1 (patch-kuiserver_CMakeLists.txt) = 27ce4883f0cee6549c74eff65d834df78fd5d79b
-SHA1 (patch-libtaskmanager_CMakeLists.txt) = 8ebb715c22c1be95a161281b9eececfbdfd936da
-SHA1 (patch-shell_CMakeLists.txt) = 0dbf40b1213d6714e420064ddb5b8454d27f141c
 SHA1 (patch-startkde_startkde.cmake) = 49e9f3a5a3d0eb76865c1120d8aa3fee3a886030
-SHA1 (patch-wallpapers_image_CMakeLists.txt) = a62a155eed7cf69cada8d1e697a29b14e54ca683
-SHA1 (patch-xembed-sni-proxy_CMakeLists.txt) = 8158c958866ccd90858e76d40333e8719dda81a0
diff --git a/plasma-workspace/patches/patch-components_shellprivate_CMakeLists.txt b/plasma-workspace/patches/patch-components_shellprivate_CMakeLists.txt
deleted file mode 100644
index 5c2ef34b9b..0000000000
--- a/plasma-workspace/patches/patch-components_shellprivate_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- components/shellprivate/CMakeLists.txt.orig	2016-04-19 11:20:13.000000000 +0000
-+++ components/shellprivate/CMakeLists.txt
-@@ -43,7 +43,7 @@ if (KF5TextEditor_FOUND)
- endif (KF5TextEditor_FOUND)
- 
- install(TARGETS plasmashellprivateplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/shell)
--install(FILES widgetexplorer/plasmoids.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
-+install(FILES widgetexplorer/plasmoids.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR})
- 
- install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/shell)
- 
diff --git a/plasma-workspace/patches/patch-klipper_CMakeLists.txt b/plasma-workspace/patches/patch-klipper_CMakeLists.txt
deleted file mode 100644
index 3ce24717ad..0000000000
--- a/plasma-workspace/patches/patch-klipper_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- klipper/CMakeLists.txt.orig	2018-01-02 13:12:27.432500443 +0000
-+++ klipper/CMakeLists.txt
-@@ -66,7 +66,7 @@ install(TARGETS kdeinit_klipper ${KDE_IN
- install(TARGETS klipper         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- 
- install(PROGRAMS org.kde.klipper.desktop DESTINATION ${KDE_INSTALL_APPDIR})
--install(PROGRAMS klipper.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
-+install(PROGRAMS klipper.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTEXDIR})
- 
- # Plasma Data Engine
- set(plasma_engine_clipboard_SRCS ${libklipper_common_SRCS} clipboardengine.cpp clipboardservice.cpp clipboardjob.cpp)
diff --git a/plasma-workspace/patches/patch-krunner_CMakeLists.txt b/plasma-workspace/patches/patch-krunner_CMakeLists.txt
deleted file mode 100644
index 11157661f3..0000000000
--- a/plasma-workspace/patches/patch-krunner_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- krunner/CMakeLists.txt.orig	2016-04-19 11:20:13.000000000 +0000
-+++ krunner/CMakeLists.txt
-@@ -31,7 +31,7 @@ target_compile_definitions(krunner PRIVA
- 
- install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
--install(FILES krunner.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
-+install(FILES krunner.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTEXDIR})
- 
- set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface")
- ecm_configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in
diff --git a/plasma-workspace/patches/patch-kuiserver_CMakeLists.txt b/plasma-workspace/patches/patch-kuiserver_CMakeLists.txt
deleted file mode 100644
index 27a161d6e9..0000000000
--- a/plasma-workspace/patches/patch-kuiserver_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kuiserver/CMakeLists.txt.orig	2018-01-02 13:12:27.460500629 +0000
-+++ kuiserver/CMakeLists.txt
-@@ -78,4 +78,4 @@ install(TARGETS kuiserver5 ${KDE_INSTALL
- install( FILES kuiserver.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
- 
- # contains list of debug categories, for kdebugsettings
--install(FILES kuiserver.categories DESTINATION ${KDE_INSTALL_CONFDIR})
-+install(FILES kuiserver.categories DESTINATION ${KDE_INSTALL_XDG_EX_DIR})
diff --git a/plasma-workspace/patches/patch-libtaskmanager_CMakeLists.txt b/plasma-workspace/patches/patch-libtaskmanager_CMakeLists.txt
deleted file mode 100644
index 1f311354bf..0000000000
--- a/plasma-workspace/patches/patch-libtaskmanager_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- libtaskmanager/CMakeLists.txt.orig	2018-01-02 13:12:27.468500683 +0000
-+++ libtaskmanager/CMakeLists.txt
-@@ -110,4 +110,4 @@ install(EXPORT libtaskmanagerLibraryTarg
-         FILE LibTaskManagerLibraryTargets.cmake )
- 
- install(FILES taskmanagerrulesrc
--        DESTINATION ${KDE_INSTALL_CONFDIR})
-+        DESTINATION ${KDE_INSTALL_XDG_EX_DIR})
diff --git a/plasma-workspace/patches/patch-shell_CMakeLists.txt b/plasma-workspace/patches/patch-shell_CMakeLists.txt
deleted file mode 100644
index 5b49a38462..0000000000
--- a/plasma-workspace/patches/patch-shell_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- shell/CMakeLists.txt.orig	2018-01-02 13:12:27.504500922 +0000
-+++ shell/CMakeLists.txt
-@@ -104,7 +104,7 @@ endif()
- 
- install(TARGETS plasmashell ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR})
--install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
-+install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTEXDIR})
- install( FILES dbus/org.kde.PlasmaShell.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
- 
- install(FILES
diff --git a/plasma-workspace/patches/patch-wallpapers_image_CMakeLists.txt b/plasma-workspace/patches/patch-wallpapers_image_CMakeLists.txt
deleted file mode 100644
index 5ccede5c0b..0000000000
--- a/plasma-workspace/patches/patch-wallpapers_image_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- wallpapers/image/CMakeLists.txt.orig	2016-04-19 11:20:13.000000000 +0000
-+++ wallpapers/image/CMakeLists.txt
-@@ -26,7 +26,7 @@ install(TARGETS plasma_wallpaper_imagepl
- 
- install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/wallpapers/image)
- 
--install(FILES wallpaper.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
-+install(FILES wallpaper.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR})
- 
- plasma_install_package(imagepackage org.kde.image wallpapers wallpaper)
- plasma_install_package(slideshowpackage org.kde.slideshow wallpapers wallpaper)
diff --git a/plasma-workspace/patches/patch-xembed-sni-proxy_CMakeLists.txt b/plasma-workspace/patches/patch-xembed-sni-proxy_CMakeLists.txt
deleted file mode 100644
index d44d6ba811..0000000000
--- a/plasma-workspace/patches/patch-xembed-sni-proxy_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- xembed-sni-proxy/CMakeLists.txt.orig	2016-04-19 11:20:13.000000000 +0000
-+++ xembed-sni-proxy/CMakeLists.txt
-@@ -63,5 +63,5 @@ target_link_libraries(xembedsniproxy
- )
- 
- install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
--install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
-+install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTEXDIR})
-
Prev by Date: kmix: Add version 17.12.1
Next by Date: plasma-workspace: PLIST fixup for kholidays
Previous by Thread: kmix: Add version 17.12.1
Next by Thread: plasma-workspace: PLIST fixup for kholidays
Indexes:
Home | Main Index | Thread Index | Old Index