diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
| commit | 70877cfb7e290449b9f9c660e25345f462576c4c (patch) | |
| tree | 0f63651432b8448262549265a5420fff1ab665e8 /extra/slim | |
| parent | 509bf50c73444930b6f57c42678ec22e7de82c88 (diff) | |
| parent | 412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/performous/PKGBUILD
community/drbd/PKGBUILD
community/oss/PKGBUILD
community/pinot/PKGBUILD
core/glibc/PKGBUILD
core/kmod/PKGBUILD
core/pkg-config/PKGBUILD
core/systemd/PKGBUILD
extra/bitlbee/PKGBUILD
extra/mesa/PKGBUILD
extra/nettle/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nettle/PKGBUILD
multilib/lib32-nouveau-dri/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/zsnes/PKGBUILD
multilib/zsnes/zsnes.patch
testing/cryptsetup/PKGBUILD
testing/ekiga/PKGBUILD
testing/iputils/PKGBUILD
testing/poppler/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'extra/slim')
| -rw-r--r-- | extra/slim/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/slim/libpng-1.4+-support.patch | 14 | ||||
| -rw-r--r-- | extra/slim/slim.service | 2 |
3 files changed, 23 insertions, 12 deletions
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 35d7fa342..70b1ef56a 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 160692 2012-06-03 19:17:38Z tpowa $ +# $Id: PKGBUILD 163488 2012-07-13 10:14:32Z tpowa $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Hugo Ideler <hugoideler@dse.nl> pkgname=slim -pkgver=1.3.3 -pkgrel=5 +pkgver=1.3.4 +pkgrel=1 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64' 'mips64el') url='http://slim.berlios.de/' @@ -19,17 +19,15 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'pam.d' 'logrotate' 'slim.service' - 'ptr_pam.patch' 'session-name.patch' - 'fix-numlock-1.3.3.patch') + 'libpng-1.4+-support.patch') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../ptr_pam.patch # FS#23995: pointer mishandling confuses PAM patch -p1 -i ../session-name.patch # FS#26693: fix default session name - patch -p1 -i ../fix-numlock-1.3.3.patch # FS#29818: fix numlock handling + patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build cd ${srcdir} mkdir build cd build @@ -55,11 +53,10 @@ package() { # install systemd files install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service } -md5sums=('ce53e44c1e4a2eacf5bb7688ee2a5de8' +md5sums=('51543533e492b41007811f7d880720fa' 'd8ea9c4dee2811524b67f4f666311a1f' 'd33edc74724c6ca00445767ce38fc732' '43da096480bf72c3ccec8ad8400f34f0' - '7c0bf1fb6292537e2c63ec04f8532079' - 'ae4b237d472ec5d373e30080aa0ff804' + 'a5d6bde9e63899df7d2081e1585bbe54' 'ebcb6829028615686de7b64ceeaaf8ed' - '6c29c93370e44ed310ff30132424b619') + '6d19bd7a91592ed2bb902b22b9594565') diff --git a/extra/slim/libpng-1.4+-support.patch b/extra/slim/libpng-1.4+-support.patch new file mode 100644 index 000000000..57b39272b --- /dev/null +++ b/extra/slim/libpng-1.4+-support.patch @@ -0,0 +1,14 @@ +--- a/image.cpp 2012-06-26 04:20:14.000000000 -0400 ++++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400 +@@ -781,7 +781,11 @@ + (png_infopp) NULL); + } + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((png_ptr)))) { ++#else + if (setjmp(png_ptr->jmpbuf)) { ++#endif + goto png_destroy; + } + diff --git a/extra/slim/slim.service b/extra/slim/slim.service index 18d8c99be..b894085a0 100644 --- a/extra/slim/slim.service +++ b/extra/slim/slim.service @@ -6,4 +6,4 @@ After=systemd-user-sessions.service ExecStart=/usr/bin/slim -nodaemon [Install] -WantedBy=graphical.target +Alias=display-manager.service |