diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-05 01:28:55 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-05 01:28:55 -0700 |
| commit | 9478c3c735c37ebdda0eb99126f5925790fb3e55 (patch) | |
| tree | 15eefbfb45c57203f177ece35f81ae6fe4cf1cdb /extra/slim | |
| parent | a1e8649c27451ac75f05b9b520d52b78e9f2913d (diff) | |
Sat Oct 5 01:28:41 PDT 2013
Diffstat (limited to 'extra/slim')
| -rw-r--r-- | extra/slim/PKGBUILD | 22 | ||||
| -rw-r--r-- | extra/slim/slim-1.3.6-fix-libslim-libraries.patch | 20 |
2 files changed, 35 insertions, 7 deletions
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 0451efc72..27a492819 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184434 2013-05-06 19:39:43Z foutrelis $ +# $Id: PKGBUILD 195897 2013-10-03 23:13:04Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -6,27 +6,35 @@ # Contributor: Hugo Ideler <hugoideler@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 \ diff --git a/extra/slim/slim-1.3.6-fix-libslim-libraries.patch b/extra/slim/slim-1.3.6-fix-libslim-libraries.patch new file mode 100644 index 000000000..b6c90f9f4 --- /dev/null +++ b/extra/slim/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} + ) |