diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | fixes.patch | 16 |
3 files changed, 15 insertions, 30 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-xdm-git pkgdesc = X Display Manager - pkgver = 1.1.12 + pkgver = 1.1.12.r6.gd0fa514 pkgrel = 1 url = http://xorg.freedesktop.org/ arch = i686 @@ -18,10 +18,8 @@ pkgbase = xorg-xdm-git depends = xorg-sessreg depends = libxft depends = systemd - provides = xorg-xdm + provides = xorg-xdm=1.1.12-1 conflicts = xorg-xdm - conflicts = xorg-xdm-xlogin - conflicts = xorg-xdm-xlogin-git options = !libtool backup = etc/X11/xdm/Xaccess backup = etc/X11/xdm/Xresources @@ -34,8 +32,7 @@ pkgbase = xorg-xdm-git source = fixes.patch source = xdm.pam sha512sums = SKIP - sha512sums = 9fb1c63c37c7fe8d92f9883cc4c1f0f0685076f5edadbae1b56ed01c3f74c6fd31b57b3054441f939bcb617493dbaefe741f6826c9d1e7aa94170f7acb88cb83 + sha512sums = 568d9b17caf410e4e5c3033ec4a751a75b6015bf9d20af29414aac14f0b8dffb90f2b20d83999026af5e024379c32508c2f0bdd7b685e536b8511444ab2a11cd sha512sums = cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0 pkgname = xorg-xdm-git - @@ -2,15 +2,14 @@ # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdm-git -pkgver=1.1.12 +_pkgname=xorg-xdm +pkgver=1.1.12.r6.gd0fa514 pkgrel=1 pkgdesc="X Display Manager" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('libbsd' 'pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd') -provides=('xorg-xdm') -conflicts=('xorg-xdm' 'xorg-xdm-xlogin' 'xorg-xdm-xlogin-git') makedepends=('git' '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') @@ -18,12 +17,14 @@ source=("$pkgname::git://anongit.freedesktop.org/git/xorg/app/xdm" fixes.patch xdm.pam) sha512sums=('SKIP' - '9fb1c63c37c7fe8d92f9883cc4c1f0f0685076f5edadbae1b56ed01c3f74c6fd31b57b3054441f939bcb617493dbaefe741f6826c9d1e7aa94170f7acb88cb83' + '568d9b17caf410e4e5c3033ec4a751a75b6015bf9d20af29414aac14f0b8dffb90f2b20d83999026af5e024379c32508c2f0bdd7b685e536b8511444ab2a11cd' 'cb912013a294f0801b357a43f3e5313ffa9ac5fcc493b2318843983388eb0b839c84060a97c355e12ca03f3b056644aa4a2bb8a74ed73a0f2405816b8d6efdc0') +provides=("${_pkgname}=${pkgver%%.r*}-${pkgrel}") +conflicts=("${_pkgname}") pkgver() { cd $pkgname - git describe | sed 's,xdm-,,;s,-,.,g' + git describe --long --tags | sed -E 's,^[^0-9]*,,;s,([^-]*-g),r\1,;s,-,.,g' } prepare() { @@ -34,16 +35,19 @@ prepare() { build() { cd $pkgname - ./configure --prefix=/usr \ + ./autogen.sh --prefix=/usr \ + --sysconfdir=/etc \ --disable-xdm-auth \ --disable-static \ --with-xdmconfigdir=/etc/X11/xdm \ --with-xdmscriptdir=/etc/X11/xdm \ - --with-pixmapdir=/usr/share/xdm/pixmaps + --with-pixmapdir=/usr/share/xdm/pixmaps \ + DEF_USER_PATH="/usr/local/bin:/usr/bin:/bin" \ + DEF_SYSTEM_PATH="/usr/local/bin:/usr/bin:/bin" sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make + make CWARNFLAGS="" } package() { diff --git a/fixes.patch b/fixes.patch index b207e108c332..c5eff6c2da2d 100644 --- a/fixes.patch +++ b/fixes.patch @@ -7,22 +7,6 @@ diff -up src/xorg-xdm-git/config/GiveConsole.orig src/xorg-xdm-git/config/GiveCo chown $USER /dev/console +exec /usr/bin/sessreg -a -w "/var/log/wtmp" -u "/run/utmp" \ + -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER -diff -up src/xorg-xdm-git/configure.ac.orig src/xorg-xdm-git/configure.ac ---- src/xorg-xdm-git/configure.ac.orig 2019-08-13 00:10:29.000000000 -0600 -+++ src/xorg-xdm-git/configure.ac 2019-08-13 00:10:30.000000000 -0600 -@@ -173,10 +173,10 @@ AC_ARG_WITH([systemd-daemon], AS_HELP_ST - [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.])] - )] - ) - ]) diff -up src/xorg-xdm-git/config/Xservers.ws.in.orig src/xorg-xdm-git/config/Xservers.ws.in --- src/xorg-xdm-git/config/Xservers.ws.in.orig 2019-08-13 00:10:29.000000000 -0600 +++ src/xorg-xdm-git/config/Xservers.ws.in 2019-08-13 00:10:31.000000000 -0600 |