pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

dolphin5: SUBST rather than patch



Module Name:	pkgsrc-wip
Committed By:	Mark Davies <mark%ecs.vuw.ac.nz@localhost>
Pushed By:	markd
Date:		Sat Feb 3 14:30:53 2018 +1300
Changeset:	3d1792021319ffec95e0f1933c94e2f7894ce5f7

Modified Files:
	dolphin5/Makefile
	dolphin5/distinfo
Removed Files:
	dolphin5/patches/patch-src_CMakeLists.txt

Log Message:
dolphin5: SUBST rather than patch

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

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

diffstat:
 dolphin5/Makefile                         |  6 +++++-
 dolphin5/distinfo                         |  1 -
 dolphin5/patches/patch-src_CMakeLists.txt | 15 ---------------
 3 files changed, 5 insertions(+), 17 deletions(-)

diffs:
diff --git a/dolphin5/Makefile b/dolphin5/Makefile
index cde1655b5d..7da287f47e 100644
--- a/dolphin5/Makefile
+++ b/dolphin5/Makefile
@@ -19,7 +19,11 @@ REPLACE_RUBY+=	src/settings/services/servicemenudeinstallation
 
 USE_TOOLS+=	msgmerge
 
-BUILDLINK_TRANSFORM+=	rm:-fvisibility=hidden
+SUBST_CLASSES+=		xdg
+SUBST_STAGE.xdg=	post-patch
+SUBST_MESSAGE.xdg=	Install via examples dir.
+SUBST_FILES.xdg=	src/CMakeLists.txt
+SUBST_SED.xdg=		-e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
 
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/servicemenu.knsrc \
diff --git a/dolphin5/distinfo b/dolphin5/distinfo
index 1fb1b58759..27543d6336 100644
--- a/dolphin5/distinfo
+++ b/dolphin5/distinfo
@@ -4,4 +4,3 @@ SHA1 (dolphin-17.12.1.tar.xz) = 02200a2a67fb25f84154c4f9c7d214f406f7555b
 RMD160 (dolphin-17.12.1.tar.xz) = 5d5b9e89fe03c7df769c78aaea790a106f0e7ce0
 SHA512 (dolphin-17.12.1.tar.xz) = 0780eeb1bb730ac797532cf52411ad1036633565ed1e098b35828252f1a393554489367a136029b5b43f4783c4b5f16dbde1ab38314df997f206a91ddb540837
 Size (dolphin-17.12.1.tar.xz) = 4840748 bytes
-SHA1 (patch-src_CMakeLists.txt) = 981b8cac13f673ca0a482c59fd431eb228afea75
diff --git a/dolphin5/patches/patch-src_CMakeLists.txt b/dolphin5/patches/patch-src_CMakeLists.txt
deleted file mode 100644
index 02f76d8514..0000000000
--- a/dolphin5/patches/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install via examples dir
-
---- src/CMakeLists.txt.orig	2016-04-13 16:49:42.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -387,7 +387,7 @@ ${KDE_INSTALL_KSERVICES5DIR} )
- install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
- install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
- install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
--install( FILES settings/services/servicemenu.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
-+install( FILES settings/services/servicemenu.knsrc DESTINATION ${KDE_INSTALL_XDG_EX_DIR} )
- install( PROGRAMS settings/services/servicemenuinstallation DESTINATION ${KDE_INSTALL_BINDIR} )
- install( PROGRAMS settings/services/servicemenudeinstallation DESTINATION ${KDE_INSTALL_BINDIR} )
- 


Home | Main Index | Thread Index | Old Index