kwin: SUBST rather than patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: kwin: SUBST rather than patches
From: Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Date: Sat, 03 Feb 2018 01:52:56 +0000
Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sat Feb 3 14:52:56 2018 +1300
Changeset:	8bfbb5e7257bc5d19ddb5c882d4b4ee70aa81923

Modified Files:
	kwin/Makefile
	kwin/distinfo
	kwin/patches/patch-kcmkwin_kwincompositing_CMakeLists.txt
	kwin/patches/patch-kcmkwin_kwintabbox_CMakeLists.txt
Removed Files:
	kwin/patches/patch-data_CMakeLists.txt
	kwin/patches/patch-kcmkwin_kwinscripts_CMakeLists.txt
	kwin/patches/patch-plugins_kdecorations__aurorae_src_CMakeLists.txt

Log Message:
kwin: 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=8bfbb5e7257bc5d19ddb5c882d4b4ee70aa81923

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

diffstat:
 kwin/Makefile                                             | 13 +++++++++++--
 kwin/distinfo                                             |  7 ++-----
 kwin/patches/patch-data_CMakeLists.txt                    | 13 -------------
 kwin/patches/patch-kcmkwin_kwincompositing_CMakeLists.txt |  9 ---------
 kwin/patches/patch-kcmkwin_kwinscripts_CMakeLists.txt     | 12 ------------
 kwin/patches/patch-kcmkwin_kwintabbox_CMakeLists.txt      |  8 --------
 ...patch-plugins_kdecorations__aurorae_src_CMakeLists.txt | 15 ---------------
 7 files changed, 13 insertions(+), 64 deletions(-)

diffs:
diff --git a/kwin/Makefile b/kwin/Makefile
index 52e5bdc0d4..fd20b45cc8 100644
--- a/kwin/Makefile
+++ b/kwin/Makefile
@@ -9,8 +9,6 @@ LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2
 
 .include "../../wip/kde5/plasma.mk"
 
-CONFLICTS+=	kde-workspace4-[0-9]*
-
 BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 DEPENDS+=	kinit>=5.21.0:../../x11/kinit
 
@@ -27,6 +25,17 @@ SUBST_FILES.fix-moc+=	_KDE_build/kcmkwin/kwinscreenedges/CMakeFiles/kcm_kwintouc
 SUBST_FILES.fix-moc+=	_KDE_build/CMakeFiles/kwin_autogen.dir/AutogenInfo.cmake
 SUBST_SED.fix-moc=	-e 's,;${PREFIX}/include;,;,g'
 
+SUBST_CLASSES+=		xdg
+SUBST_STAGE.xdg=	post-patch
+SUBST_MESSAGE.xdg=	Install via examples dir.
+SUBST_FILES.xdg=	data/CMakeLists.txt
+SUBST_FILES.xdg+=	kcmkwin/kwincompositing/CMakeLists.txt
+SUBST_FILES.xdg+=	kcmkwin/kwinscripts/CMakeLists.txt
+SUBST_FILES.xdg+=	kcmkwin/kwintabbox/CMakeLists.txt
+SUBST_FILES.xdg+=	plugins/kdecorations/aurorae/src/CMakeLists.txt
+SUBST_SED.xdg=		-e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+SUBST_SED.xdg+=		-e 's:{CONFIG_INSTALL_DIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/aurorae.knsrc \
 		${PKG_SYSCONFDIR}/xdg/aurorae.knsrc
diff --git a/kwin/distinfo b/kwin/distinfo
index 5e30f81bee..58c1916d24 100644
--- a/kwin/distinfo
+++ b/kwin/distinfo
@@ -4,10 +4,7 @@ SHA1 (kwin-5.11.5.tar.xz) = 5a45f36165e114983a6887d00bb6df63578889cd
 RMD160 (kwin-5.11.5.tar.xz) = 2b7b1ddbb63b5e24e779fc5baee7163ab1722c7c
 SHA512 (kwin-5.11.5.tar.xz) = fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2
 Size (kwin-5.11.5.tar.xz) = 4965516 bytes
-SHA1 (patch-data_CMakeLists.txt) = 1b8c611e934c12cdcb0d3bf4e4c0332c5aa1ba6a
-SHA1 (patch-kcmkwin_kwincompositing_CMakeLists.txt) = 2c55a2e2738047e0a478753b80426408e271f684
+SHA1 (patch-kcmkwin_kwincompositing_CMakeLists.txt) = 77cf05fc7f9e75b969c746bf2bd051020354b785
 SHA1 (patch-kcmkwin_kwindesktop_CMakeLists.txt) = ac855325440b14ea079a87b2ca1d79f69a7602d6
 SHA1 (patch-kcmkwin_kwinscreenedges_CMakeLists.txt) = 39972987c11dee5ebd701d41a2ab22d7ab063e1a
-SHA1 (patch-kcmkwin_kwinscripts_CMakeLists.txt) = c876840f3839e2565f975c740d23a23d2b872c7f
-SHA1 (patch-kcmkwin_kwintabbox_CMakeLists.txt) = 84166dfc796bd91eb9bd439d9f9b81d3e85a1c92
-SHA1 (patch-plugins_kdecorations__aurorae_src_CMakeLists.txt) = 632e983b540900f22f929b16db9e6ca215af0160
+SHA1 (patch-kcmkwin_kwintabbox_CMakeLists.txt) = 6d031cd693fd6c716b0db4f53cfddd7585655449
diff --git a/kwin/patches/patch-data_CMakeLists.txt b/kwin/patches/patch-data_CMakeLists.txt
deleted file mode 100644
index 56f7ab76f7..0000000000
--- a/kwin/patches/patch-data_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- data/CMakeLists.txt.orig	2018-01-02 12:34:16.561370865 +0000
-+++ data/CMakeLists.txt
-@@ -7,5 +7,5 @@ install(TARGETS kwin5_update_default_rul
- 
- ########### install files ###############
- 
--install( FILES org_kde_kwin.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
-+install( FILES org_kde_kwin.categories DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg )
- 
diff --git a/kwin/patches/patch-kcmkwin_kwincompositing_CMakeLists.txt b/kwin/patches/patch-kcmkwin_kwincompositing_CMakeLists.txt
index 8b1bbf3cfb..d42d4d4dcb 100644
--- a/kwin/patches/patch-kcmkwin_kwincompositing_CMakeLists.txt
+++ b/kwin/patches/patch-kcmkwin_kwincompositing_CMakeLists.txt
@@ -1,7 +1,5 @@
 $NetBSD$
 
-Install via examples dir
-
 --- kcmkwin/kwincompositing/CMakeLists.txt.orig	2016-04-19 11:12:37.000000000 +0000
 +++ kcmkwin/kwincompositing/CMakeLists.txt
 @@ -41,6 +41,7 @@ target_link_libraries(kwincompositing
@@ -12,10 +10,3 @@ Install via examples dir
      kwin4_effect_builtins
  )
  
-@@ -79,5 +80,5 @@ target_link_libraries(effectModelTest
- INSTALL(DIRECTORY qml DESTINATION ${DATA_INSTALL_DIR}/kwincompositing)
- INSTALL(TARGETS kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES kwincompositing.desktop kcmkwineffects.desktop  DESTINATION  ${SERVICES_INSTALL_DIR})
--install(FILES kwineffect.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
-+install(FILES kwineffect.knsrc DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg)
- ################# list the subdirectories #################
diff --git a/kwin/patches/patch-kcmkwin_kwinscripts_CMakeLists.txt b/kwin/patches/patch-kcmkwin_kwinscripts_CMakeLists.txt
deleted file mode 100644
index e2dbffe0f5..0000000000
--- a/kwin/patches/patch-kcmkwin_kwinscripts_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- kcmkwin/kwinscripts/CMakeLists.txt.orig	2016-04-19 11:12:37.000000000 +0000
-+++ kcmkwin/kwinscripts/CMakeLists.txt
-@@ -24,4 +24,4 @@ target_link_libraries(kcm_kwin_scripts
- 
- install(TARGETS kcm_kwin_scripts DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES kwinscripts.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--install(FILES kwinscripts.knsrc  DESTINATION  ${CONFIG_INSTALL_DIR})
-+install(FILES kwinscripts.knsrc  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg)
diff --git a/kwin/patches/patch-kcmkwin_kwintabbox_CMakeLists.txt b/kwin/patches/patch-kcmkwin_kwintabbox_CMakeLists.txt
index 7ef4e7cadc..3bb9446b64 100644
--- a/kwin/patches/patch-kcmkwin_kwintabbox_CMakeLists.txt
+++ b/kwin/patches/patch-kcmkwin_kwintabbox_CMakeLists.txt
@@ -1,7 +1,5 @@
 $NetBSD$
 
-Install via examples dir
-
 --- kcmkwin/kwintabbox/CMakeLists.txt.orig	2018-01-02 12:34:16.861372861 +0000
 +++ kcmkwin/kwintabbox/CMakeLists.txt
 @@ -28,6 +28,7 @@ target_link_libraries(kcm_kwintabbox
@@ -12,9 +10,3 @@ Install via examples dir
      kwin4_effect_builtins
  )
  
-@@ -37,4 +38,4 @@ install(TARGETS kcm_kwintabbox  DESTINAT
- ########### install files ###############
- install( FILES kwintabbox.desktop DESTINATION  ${SERVICES_INSTALL_DIR} )
- install( FILES thumbnails/konqueror.png thumbnails/kmail.png thumbnails/systemsettings.png thumbnails/dolphin.png DESTINATION ${DATA_INSTALL_DIR}/kwin/kcm_kwintabbox)
--install( FILES kwinswitcher.knsrc  DESTINATION  ${CONFIG_INSTALL_DIR} )
-+install( FILES kwinswitcher.knsrc  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg )
diff --git a/kwin/patches/patch-plugins_kdecorations__aurorae_src_CMakeLists.txt b/kwin/patches/patch-plugins_kdecorations__aurorae_src_CMakeLists.txt
deleted file mode 100644
index 6e9581686d..0000000000
--- a/kwin/patches/patch-plugins_kdecorations__aurorae_src_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- plugins/kdecorations/aurorae/src/CMakeLists.txt.orig	2016-04-19 11:12:37.000000000 +0000
-+++ plugins/kdecorations/aurorae/src/CMakeLists.txt
-@@ -42,7 +42,7 @@ install(TARGETS decorationplugin DESTINA
- 
- ########### install files ###############
- 
--install( FILES aurorae.knsrc  DESTINATION  ${CONFIG_INSTALL_DIR} )
-+install( FILES aurorae.knsrc  DESTINATION  ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg )
- install( FILES
-     qml/aurorae.qml
-     qml/AuroraeButton.qml
Prev by Date: dolphin5: SUBST rather than patch
Next by Date: filelight: SUBST rather than patch
Previous by Thread: dolphin5: SUBST rather than patch
Next by Thread: filelight: SUBST rather than patch
Indexes:
Home | Main Index | Thread Index | Old Index