diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index d537d14..e7a8bb0 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Jan de Groot pkgname=xorg-xdm pkgver=1.1.11 -pkgrel=7 +pkgrel=8 pkgdesc="X Display Manager" arch=(x86_64) url="https://xorg.freedesktop.org/" @@ -16,15 +16,17 @@ source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2 Xsession-xsm.patch xdm-1.0.5-sessreg-utmp-fix-bug177890.patch xdm.pam - git_fixes.diff) + git_fixes.diff + configure.patch) sha512sums=('fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5' '4777e227c99bd39409a134fc2b0cb6ffd8f80ad0e0106ee9ab172637fdafe85027fe05ad7fc978005473ef683ab92f52d3cf06a257991af6b1aeaefe9860953e' '5ac449267e9787e3cefc4674379ad3d756c9403a39af50cbf945cb2da55b5435436d6a370c0f3c5fd110eb6d99aef73f4a2e118dd0cfd07fa0343967aca2d9fe' '698d401899660708dc17eaa84bd2323426afa4c3c094ff8d4a8d9c54e26e073f40dafed67636855bb230f351523a88f1f1ed1ec443d77d92ef65646b5a6976d5' 'cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0' - 'be63ade1a79099991501cb9aba7e8a641a7b7f9a1779cea285e23b150fa9a929b4aa0d3bbfb4c9596214f77e75821b69130b0866ef1aa12cfa86020dc9327566') + 'be63ade1a79099991501cb9aba7e8a641a7b7f9a1779cea285e23b150fa9a929b4aa0d3bbfb4c9596214f77e75821b69130b0866ef1aa12cfa86020dc9327566' + 'f30243aa8343d245e32a80953dc990d95d0b9048574a1ae777cb81cde14a0e167e544df1d40d7316ec8465571bd6b68cda984bb40c1fe99fc7ce348247cdca71') -build() { +prepare() { cd "${srcdir}/xdm-${pkgver}" # upstream commits - Add some missing malloc failure checks 2012-01-07 patch -Np1 -i "${srcdir}/git_fixes.diff" @@ -32,7 +34,11 @@ build() { patch -Np0 -i "${srcdir}/Xsession-loginshell.patch" patch -Np1 -i "${srcdir}/Xsession-xsm.patch" patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch" + patch -Np1 -i "${srcdir}/configure.patch" +} +build() { + cd "${srcdir}/xdm-${pkgver}" autoreconf -fi ./configure --prefix=/usr \ --disable-xdm-auth \ diff --git a/trunk/configure.patch b/trunk/configure.patch new file mode 100644 index 0000000..c0c1c1e --- /dev/null +++ b/trunk/configure.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +index d20ae28..2da0f50 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -173,10 +173,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], + [Add support for systemd startup notification (default is autodetected)]), + [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) + AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ +- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], ++ PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], + [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], + [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], +- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] ++ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] + )] + ) + ])