From ffc08f498cdb1b37e3ed18d619a6fc540be9cd82 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 5 Oct 2013 09:12:20 +0200 Subject: [PATCH] slim: update to 1.3.6. --- .../slim-1.3.6-fix-libslim-libraries.patch | 19 +++++++++++++++++++ srcpkgs/slim/template | 14 ++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/slim/patches/slim-1.3.6-fix-libslim-libraries.patch diff --git a/srcpkgs/slim/patches/slim-1.3.6-fix-libslim-libraries.patch b/srcpkgs/slim/patches/slim-1.3.6-fix-libslim-libraries.patch new file mode 100644 index 00000000000..471f31f7c67 --- /dev/null +++ b/srcpkgs/slim/patches/slim-1.3.6-fix-libslim-libraries.patch @@ -0,0 +1,19 @@ +--- CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 ++++ CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 +@@ -119,6 +119,7 @@ if(USE_PAM) + if(PAM_FOUND) + message("\tPAM Found") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") ++ target_link_libraries(libslim ${PAM_LIBRARY}) + target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) + target_link_libraries(slimlock ${PAM_LIBRARY}) + include_directories(${PAM_INCLUDE_DIR}) +@@ -178,6 +179,8 @@ include_directories( + ) + + target_link_libraries(libslim ++ ${X11_Xft_LIB} ++ ${X11_Xrandr_LIB} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ) diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template index e8a24026257..8a2964173b2 100644 --- a/srcpkgs/slim/template +++ b/srcpkgs/slim/template @@ -1,22 +1,20 @@ # Template file for 'slim' pkgname=slim -version=1.3.5 -revision=3 +version=1.3.6 +revision=1 build_style=cmake configure_args="-DUSE_PAM=yes -DUSE_CONSOLEKIT=no" +hostmakedepends="cmake pkg-config" +makedepends="libpng-devel>=1.6 libjpeg-turbo-devel libXrandr-devel libXmu-devel libXft-devel pam-devel" short_desc="Desktop-independent graphical login manager for X11" maintainer="Juan RP " license="GPL-2" homepage="http://slim.berlios.de/" distfiles="http://download.berlios.de/slim/slim-${version}.tar.gz" -checksum=818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629 - -# XXX make cmake find host libraries . -makedepends="libpng-devel>=1.6 libjpeg-turbo-devel libX11-devel libXmu-devel libXft-devel pam-devel" -hostmakedepends="cmake pkg-config ${makedepends}" +checksum=21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df pre_configure() { - sed -i 's|usr/lib/systemd/system|/&|' CMakeLists.txt + sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt } post_install() {