diff options
author | Michal Wojdyla | 2021-05-09 09:59:31 +0200 |
---|---|---|
committer | Michal Wojdyla | 2021-05-09 09:59:31 +0200 |
commit | 7488853b651661fd1e83b019cac705918f52a912 (patch) | |
tree | c7fbd0d24173b954ae43d3cab1459e90f5fa4c0c | |
parent | 5e694990f55755509305c1c165886d7c15ff3fb7 (diff) | |
download | aur-slim-unicode.tar.gz |
add patches from slim package
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | slim-1.3.6-default-path.patch | 11 | ||||
-rw-r--r-- | slimlock.pam | 3 |
4 files changed, 36 insertions, 14 deletions
@@ -1,9 +1,8 @@ pkgbase = slim-unicode pkgdesc = Desktop-independent graphical login manager for X11 pkgver = 1.3.6 - pkgrel = 5 - url = http://slim.berlios.de/ - arch = i686 + pkgrel = 6 + url = https://sourceforge.net/projects/slim.berlios/ arch = x86_64 license = GPL2 makedepends = cmake @@ -22,11 +21,13 @@ pkgbase = slim-unicode backup = etc/logrotate.d/slim backup = etc/pam.d/slim backup = etc/slimlock.conf - source = http://sourceforge.net/projects/slim.berlios/files/slim-1.3.6.tar.gz/download + source = https://sourceforge.net/projects/slim.berlios/files/slim-1.3.6.tar.gz/download source = slim-1.3.6-fix-libslim-libraries.patch source = slim-1.3.6-add-sessiondir.patch source = slim-1.3.6-systemd-session.patch + source = slim-1.3.6-default-path.patch source = slim.pam + source = slimlock.pam source = slim.logrotate source = slim-unicode.patch source = slim-utf8.patch @@ -35,7 +36,9 @@ pkgbase = slim-unicode sha256sums = 3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0 sha256sums = 0dffd53a69eb9033a67fad964df6fc150ee7a483e29d8eb8b559010fbd14e5fd sha256sums = 900b7ffe723b741c05bcc0ca857f300a2131a0029c6532eb17be935451bf2c70 + sha256sums = 1e303eda65a06edc8c2d938ab0751ae7744effae48cc185fd27d3cc5b2561522 sha256sums = b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4 + sha256sums = dfe35488b50f19fd96526374edc16850ed37dac919834dd579392b1a7518f2ab sha256sums = 5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def sha256sums = 18b13bdbab3f756b10e7a5ab50a2f31e4a5f18aa412baf45fa623c75b7860e4b sha256sums = 30d1b8e62d41457d9928d40a12078c169d46641604ca4ad0c26651aa5602a98a @@ -1,5 +1,4 @@ -# $Id$ -# Maintainer: Benjamin Robin <dev@benjarobin.fr> +# Contributor: Benjamin Robin <dev@benjarobin.fr> # Contributor: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> @@ -9,10 +8,10 @@ _pkgname=slim pkgname=${_pkgname}-unicode pkgver=1.3.6 -pkgrel=5 +pkgrel=6 pkgdesc="Desktop-independent graphical login manager for X11" -arch=('i686' 'x86_64') -url="http://slim.berlios.de/" +arch=('x86_64') +url="https://sourceforge.net/projects/slim.berlios/" license=('GPL2') depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth' 'ttf-font') @@ -21,11 +20,13 @@ backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim' 'etc/slimlock.conf') provides=('slim') conflicts=('slim') -source=(http://sourceforge.net/projects/slim.berlios/files/$_pkgname-$pkgver.tar.gz/download +source=(https://sourceforge.net/projects/slim.berlios/files/slim-1.3.6.tar.gz/download slim-1.3.6-fix-libslim-libraries.patch slim-1.3.6-add-sessiondir.patch slim-1.3.6-systemd-session.patch + slim-1.3.6-default-path.patch slim.pam + slimlock.pam slim.logrotate slim-unicode.patch slim-utf8.patch @@ -35,14 +36,16 @@ sha256sums=('21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df' '3dfa697f8c058390c7e02e7aba769475057ef8ddde945dc43b8cb7f9724dbda0' '0dffd53a69eb9033a67fad964df6fc150ee7a483e29d8eb8b559010fbd14e5fd' '900b7ffe723b741c05bcc0ca857f300a2131a0029c6532eb17be935451bf2c70' + '1e303eda65a06edc8c2d938ab0751ae7744effae48cc185fd27d3cc5b2561522' 'b9a77a614c451287b574c33d41e28b5b149c6d2464bdb3a5274799842bca51a4' + 'dfe35488b50f19fd96526374edc16850ed37dac919834dd579392b1a7518f2ab' '5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def' '18b13bdbab3f756b10e7a5ab50a2f31e4a5f18aa412baf45fa623c75b7860e4b' '30d1b8e62d41457d9928d40a12078c169d46641604ca4ad0c26651aa5602a98a' 'eb5fe51ab46c7d637d9ed639bd0aeb8567c639233819c4f933d8e49bed57a238') prepare() { - cd "$srcdir/$_pkgname-$pkgver" + cd $_pkgname-$pkgver # Fix installation path of slim.service sed -i 's|set(LIBDIR "/lib")|set(LIBDIR "/usr/lib")|' CMakeLists.txt @@ -50,6 +53,7 @@ prepare() { patch -Np1 -i ../slim-1.3.6-fix-libslim-libraries.patch patch -Np1 -i ../slim-1.3.6-add-sessiondir.patch patch -Np1 -i ../slim-1.3.6-systemd-session.patch + patch -Np1 -i ../slim-1.3.6-default-path.patch # Add support of unicode #patch -p1 -i "$srcdir/unicode.patch" @@ -58,7 +62,7 @@ prepare() { } build() { - cd "$srcdir/$_pkgname-$pkgver" + cd $_pkgname-$pkgver cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -70,11 +74,12 @@ build() { } package() { - cd "$srcdir/$_pkgname-$pkgver" + cd $_pkgname-$pkgver make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim" + install -Dm644 "$srcdir/slimlock.pam" "$pkgdir/etc/pam.d/slimlock" install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim" install -Dm644 slimlock.conf "$pkgdir/etc/slimlock.conf" @@ -84,4 +89,4 @@ package() { "$pkgdir/etc/slim.conf" } -# vim:set ts=2 sw=2 et: +# vim:set ts=2 sw=2 et:
\ No newline at end of file diff --git a/slim-1.3.6-default-path.patch b/slim-1.3.6-default-path.patch new file mode 100644 index 000000000000..6e1f455911b8 --- /dev/null +++ b/slim-1.3.6-default-path.patch @@ -0,0 +1,11 @@ +diff -uprw slim-1.3.6.orig/slim.conf slim-1.3.6/slim.conf +--- slim-1.3.6.orig/slim.conf 2017-11-26 09:54:56.774671269 +0200 ++++ slim-1.3.6/slim.conf 2017-11-26 10:10:15.520730363 +0200 +@@ -1,6 +1,6 @@ + # Path, X server and arguments (if needed) + # Note: -xauth $authfile is automatically appended +-default_path /bin:/usr/bin:/usr/local/bin ++default_path /usr/local/bin:/usr/local/sbin:/usr/bin + default_xserver /usr/bin/X + #xserver_arguments -dpi 75 + diff --git a/slimlock.pam b/slimlock.pam new file mode 100644 index 000000000000..660b510bc393 --- /dev/null +++ b/slimlock.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 + +auth include system-local-login |