[arch-commits] Commit in slim/trunk (PKGBUILD slim-1.3.6-fix-libslim-libraries.patch)

[Evangelos Foutras]

    Date: Wednesday, October 2, 2013 @ 15:43:41
  Author: foutrelis
Revision: 195854

upgpkg: slim 1.3.6-1

New upstream release.

Added:
  slim/trunk/slim-1.3.6-fix-libslim-libraries.patch
Modified:
  slim/trunk/PKGBUILD

----------------------------------------+
 PKGBUILD                               |   20 ++++++++++++++------
 slim-1.3.6-fix-libslim-libraries.patch |   20 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-10-02 13:25:41 UTC (rev 195853)
+++ PKGBUILD	2013-10-02 13:43:41 UTC (rev 195854)
@@ -6,28 +6,36 @@
 # Contributor: Hugo Ideler <hugoideler at dse.nl>
 
 pkgname=slim
-pkgver=1.3.5
-pkgrel=3
+pkgver=1.3.6
+pkgrel=1
 pkgdesc="Desktop-independent graphical login manager for X11"
 arch=('i686' 'x86_64')
 url="http://slim.berlios.de/"
 license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'xorg-xauth')
+depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth')
 makedepends=('cmake' 'freeglut')
 backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
 source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
+        slim-1.3.6-fix-libslim-libraries.patch
         slim.pam
         slim.logrotate)
-sha256sums=('818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629'
+sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df'
+            '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0'
             'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4'
             '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # Fix installation path of slim.service
-  sed -i 's|usr/lib/systemd/system|/&|' CMakeLists.txt
+  sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt
 
+  patch -Np1 -i "$srcdir/slim-1.3.6-fix-libslim-libraries.patch"
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \

Added: slim-1.3.6-fix-libslim-libraries.patch
===================================================================
--- slim-1.3.6-fix-libslim-libraries.patch	                        (rev 0)
+++ slim-1.3.6-fix-libslim-libraries.patch	2013-10-02 13:43:41 UTC (rev 195854)
@@ -0,0 +1,20 @@
+diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
+--- slim-1.3.6.orig/CMakeLists.txt	2013-10-02 16:16:22.000000000 +0300
++++ slim-1.3.6/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}
+ )