summaryrefslogtreecommitdiff
path: root/extra/xorg-xdm/PKGBUILD
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-31 10:59:28 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-31 10:59:28 -0300
commit36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (patch)
tree397141926cac78871a3e9d53cd8fb824bc1b9cd3 /extra/xorg-xdm/PKGBUILD
parent0858e3f6c7deaae69a94818c0d317a767aa3d481 (diff)
parent5827948456201df72a1bd73e87977c569129fb27 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/percona-server/PKGBUILD community/xmlrpc-c/PKGBUILD core/util-linux/PKGBUILD extra/colord/PKGBUILD extra/epiphany/PKGBUILD extra/evolution-data-server/PKGBUILD extra/evolution/PKGBUILD extra/gcr/PKGBUILD extra/gdm/PKGBUILD extra/gnome-color-manager/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnome-dictionary/PKGBUILD extra/gnome-font-viewer/PKGBUILD extra/gnome-screenshot/PKGBUILD extra/gnome-search-tool/PKGBUILD extra/gnome-system-log/PKGBUILD extra/gobject-introspection/PKGBUILD extra/grilo/PKGBUILD extra/gtkmm3/PKGBUILD extra/gvfs/PKGBUILD extra/json-glib/PKGBUILD extra/libgnome-keyring/PKGBUILD extra/nautilus-open-terminal/PKGBUILD extra/pidgin/PKGBUILD extra/pygobject/PKGBUILD extra/rest/PKGBUILD extra/rhythmbox/PKGBUILD extra/seahorse/PKGBUILD extra/totem/PKGBUILD extra/xorg-xinit/PKGBUILD extra/yelp/PKGBUILD
Diffstat (limited to 'extra/xorg-xdm/PKGBUILD')
-rw-r--r--extra/xorg-xdm/PKGBUILD26
1 files changed, 11 insertions, 15 deletions
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD
index 7c8f2ba23..e89df667a 100644
--- a/extra/xorg-xdm/PKGBUILD
+++ b/extra/xorg-xdm/PKGBUILD
@@ -1,41 +1,37 @@
-# $Id: PKGBUILD 163529 2012-07-14 17:17:56Z dreisner $
+# $Id: PKGBUILD 169967 2012-10-30 22:59:08Z heftig $
# Maintainer: Alexander Baldeck <alexander@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=xorg-xdm
pkgver=1.1.11
-pkgrel=3
+pkgrel=4
pkgdesc="X Display Manager"
arch=(i686 x86_64 'mips64el')
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'consolekit')
-makedepends=('pkgconfig' 'xorg-util-macros' 'systemd' 'xtrans')
+depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd')
+makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans')
backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
options=('!libtool')
source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
Xsession-loginshell.patch
Xsession-xsm.patch
- xdm-consolekit.patch
xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
- xdm.pam)
-md5sums=('64a1af1f7eb69feae12e75d4cc3aaf19'
- '234ae568e7b22cbc09433bb396ff3d80'
- '2c30078c50bc653d72eb5114506eb313'
- '25c6d8adeed0796d432b2bbf1d83a7e9'
- '13032add23a0a8d48a638418094bfc00'
- '6de9362b1bf0835026270b20d8029909')
+ xdm.pam
+ git_fixes.diff)
sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47'
'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
'77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
- '10ce850e6a93c6ba68b5d71104b1fd6680ad9760274068512f43a694b1edda76'
'5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a'
- '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418')
+ '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418'
+ '781b5577bb070220d018a11832d0d4a65fd16e130730ba26fb055c3aa68156b2')
build() {
cd "${srcdir}/xdm-${pkgver}"
+ # upstream commits - Add some missing malloc failure checks 2012-01-07
+ patch -Np1 -i "${srcdir}/git_fixes.diff"
+
patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
- patch -Np1 -i "${srcdir}/xdm-consolekit.patch"
patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch"
autoreconf -fi