pkgsrc-WIP-changes archive

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

kwayland: 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 15:44:33 2018 +1300
Changeset:	5df6d9f78af6036e315b8be1526d143d47b65487

Modified Files:
	kwayland/Makefile
	kwayland/distinfo
Removed Files:
	kwayland/patches/patch-CMakeLists.txt

Log Message:
kwayland: 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=5df6d9f78af6036e315b8be1526d143d47b65487

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

diffstat:
 kwayland/Makefile                     |  6 ++++++
 kwayland/distinfo                     |  1 -
 kwayland/patches/patch-CMakeLists.txt | 15 ---------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diffs:
diff --git a/kwayland/Makefile b/kwayland/Makefile
index e307cc2133..0ccf4cf535 100644
--- a/kwayland/Makefile
+++ b/kwayland/Makefile
@@ -11,6 +11,12 @@ LICENSE=	gnu-lgpl-v2.1
 
 USE_TOOLS+=	pkg-config
 
+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_DATAROOTDIR}/examples/kde-xdg:'
+
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg
 CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/org_kde_kwayland.categories \
 		${PKG_SYSCONFDIR}/xdg/org_kde_kwayland.categories
diff --git a/kwayland/distinfo b/kwayland/distinfo
index bc0d1d73f1..345b309575 100644
--- a/kwayland/distinfo
+++ b/kwayland/distinfo
@@ -4,4 +4,3 @@ SHA1 (kwayland-5.41.0.tar.xz) = 18203d24afb3125d57a588f73496053901f02562
 RMD160 (kwayland-5.41.0.tar.xz) = 22a7cceda74038f6eae300057060e12abcef497a
 SHA512 (kwayland-5.41.0.tar.xz) = b31a769c1b265ae786eec42ab0a9e1aa29820b2dffed08fb9d5b1fbe224c4a4f2deab461823da88f44ffb0a4f35fbb0b77af2d235d45d3c90f9707f728ff1d37
 Size (kwayland-5.41.0.tar.xz) = 289716 bytes
-SHA1 (patch-CMakeLists.txt) = e54aa0e47e7c59bd6feeec9d94d5e4966c4f32bd
diff --git a/kwayland/patches/patch-CMakeLists.txt b/kwayland/patches/patch-CMakeLists.txt
deleted file mode 100644
index 84565ecf81..0000000000
--- a/kwayland/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Install vai examples dir
-
---- src/CMakeLists.txt.orig	2017-12-02 10:20:25.000000000 +0000
-+++ src/CMakeLists.txt
-@@ -2,7 +2,7 @@ add_subdirectory(client)
- add_subdirectory(server)
- add_subdirectory(tools)
- 
--install( FILES org_kde_kwayland.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
-+install( FILES org_kde_kwayland.categories DESTINATION ${KDE_INSTALL_DATAROOTDIR}/examples/kde-xdg )
- 
- 
- if(BUILD_QCH)


Home | Main Index | Thread Index | Old Index