Gentoo Archives: gentoo-commits

From:	"Ian Stakenvicius (axs)" <axs@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in x11-misc/slim/files: slim-1.3.6-fix-slimlock-nopam.patch
Date:	Mon, 28 Oct 2013 01:31:55
Message-Id:	`20131028013152.484772004E@flycatcher.gentoo.org`

1	axs 13/10/28 01:31:52
2
3	Added: slim-1.3.6-fix-slimlock-nopam.patch
4	Log:
5	fixed build system to not try and install slimlock if it wasnt built, bug 489610
6
7	(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
8
9	Revision Changes Path
10	1.1 x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam.patch
11
12	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam.patch?rev=1.1&view=markup
13	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam.patch?rev=1.1&content-type=text/plain
14
15	Index: slim-1.3.6-fix-slimlock-nopam.patch
16	===================================================================
17	--- a/CMakeLists.txt 2013-10-27 21:24:21.193802669 -0400
18	+++ b/CMakeLists.txt 2013-10-27 21:26:54.127806951 -0400
19	@@ -220,7 +220,6 @@
20	####### install
21	# slim
22	install(TARGETS slim RUNTIME DESTINATION bin)
23	-install(TARGETS slimlock RUNTIME DESTINATION bin)
24
25	if (BUILD_SHARED_LIBS)
26	set_target_properties(libslim PROPERTIES
27	@@ -235,8 +234,14 @@
28
29	# man file
30	install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
31	-install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
32	# configure
33	install(FILES slim.conf DESTINATION ${SYSCONFDIR})
34	+
35	+#slimlock
36	+if(BUILD_SLIMLOCK)
37	+install(TARGETS slimlock RUNTIME DESTINATION bin)
38	+install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
39	+endif(BUILD_SLIMLOCK)
40	+
41	# themes directory
42	subdirs(themes)