version v1.3.6.3.g741e439.2013.10.03-1

3 files changed, 40 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a1fbb59a9660..c3613d8eaf99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = slim-git
-	pkgver = 1.3.6.4.ga33d260
+	pkgver = v1.3.6.3.g741e439.2013.10.03
 	pkgrel = 1
 	url = http://developer.berlios.de/projects/slim/
 	arch = i686
@@ -13,16 +13,18 @@ pkgbase = slim-git
 	makedepends = libjpeg
 	makedepends = libxft
 	makedepends = libxrandr
-	source = git+https://github.com/WorMzy/slim.git
+	source = git://git.berlios.de/slim
 	source = slimlock-git.install
 	source = slim.conf
 	source = http://downloads.sourceforge.net/project/slim.berlios/slim-archlinux-simple.tar.gz
+	source = slim-1.3.6-fix-libslim-libraries.patch
 	source = slim.pam
 	source = slim.logrotate
 	md5sums = SKIP
 	md5sums = 40af4379e8b17203414356edbf57469f
 	md5sums = 3f75d2a7a85c08a41b2f75eeb548cd87
 	md5sums = 7c7aaa255561444a4ae3e9f1dfb4be5d
+	md5sums = 3b0579dccedff97bbeafa03d58666294
 	md5sums = 294bc95c215ed04151d02fa90e2bd387
 	md5sums = 43da096480bf72c3ccec8ad8400f34f0
 
diff --git a/PKGBUILD b/PKGBUILD
index 22dcc931bd9a..dc77bf06d2b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,30 +5,42 @@
 # Contributor: Renato Aguiar
 
 pkgbase=slim-git
-pkgname=('slim-git' 'slimlock-git')
+pkgname=slim-git
+true && pkgname=('slim-git' 'slimlock-git')
 _gitname=slim
-pkgver=1.3.6.4.ga33d260
+pkgver=v1.3.6.3.g741e439.2013.10.03
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://developer.berlios.de/projects/slim/"
 license=('GPL2')
 makedepends=('git' 'cmake' 'pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr')
-source=(git+'https://github.com/WorMzy/slim.git'
+source=('git://git.berlios.de/slim'
         'slimlock-git.install'
         'slim.conf'
         'http://downloads.sourceforge.net/project/slim.berlios/slim-archlinux-simple.tar.gz'
+        'slim-1.3.6-fix-libslim-libraries.patch'
         'slim.pam'
         'slim.logrotate')
 md5sums=('SKIP'
          '40af4379e8b17203414356edbf57469f'
          '3f75d2a7a85c08a41b2f75eeb548cd87'
          '7c7aaa255561444a4ae3e9f1dfb4be5d'
+         '3b0579dccedff97bbeafa03d58666294'
          '294bc95c215ed04151d02fa90e2bd387'
          '43da096480bf72c3ccec8ad8400f34f0')
 
 pkgver() {
   cd "$_gitname"
-  echo $(git describe --tags) | sed -e 's:v::' -e 's:-:.:g'
+  echo $(git describe --tags).$(git log -1 --format="%cd" --date=short) | sed 's:-:.:g'
+}
+
+prepare() {
+  cd "$srcdir/$_gitname"
+
+  # Fix installation path of slim.service
+  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() {
diff --git a/slim-1.3.6-fix-libslim-libraries.patch b/slim-1.3.6-fix-libslim-libraries.patch
new file mode 100644
index 000000000000..b6c90f9f46e3
--- /dev/null
+++ b/slim-1.3.6-fix-libslim-libraries.patch
@@ -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}
+ )