diff options
Diffstat (limited to 'libre/xorg-server')
| -rw-r--r-- | libre/xorg-server/0001-systemd-logind-do-not-rely-on-directed-signals.patch | 55 | ||||
| -rw-r--r-- | libre/xorg-server/PKGBUILD | 18 |
2 files changed, 67 insertions, 6 deletions
diff --git a/libre/xorg-server/0001-systemd-logind-do-not-rely-on-directed-signals.patch b/libre/xorg-server/0001-systemd-logind-do-not-rely-on-directed-signals.patch new file mode 100644 index 000000000..9daadf6f6 --- /dev/null +++ b/libre/xorg-server/0001-systemd-logind-do-not-rely-on-directed-signals.patch @@ -0,0 +1,55 @@ +From 780a69aff0ff57ef813179a2f09556eaf488cdfc Mon Sep 17 00:00:00 2001 +From: David Herrmann <dh.herrmann@gmail.com> +Date: Mon, 22 Jun 2015 21:13:05 +0200 +Subject: systemd-logind: do not rely on directed signals + +Right now, Xorg does not install DBus matches for "PauseDevice" / +"ResumeDevice". Therefore, it should usually not receive those DBus +signals from logind. It is just a coincidence that systemd-logind sends +those signals in a directed manner right now. Therefore, dbus-daemon +bypasses the broadcast matches. + +However, this is not ABI and Xorg should not rely on this. systemd-logind +is free to send those signals as broadcasts, in which case Xorg will +freeze the VT. Fix this by always installing those matches. + +Cc: Hans de Goede <hdegoede@redhat.com> +Cc: Keith Packard <keithp@keithp.com> +Reported-by: Jan Alexander Steffens <jan.steffens@gmail.com> +Signed-off-by: David Herrmann <dh.herrmann@gmail.com> +Reviewed-by: Hans de Goede <hdegoede@redhat.com> +Tested-by: Hans de Goede <hdegoede@redhat.com> +Signed-off-by: Hans de Goede <hdegoede@redhat.com> + +diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c +index 69e2f67..2612d9e 100644 +--- a/hw/xfree86/os-support/linux/systemd-logind.c ++++ b/hw/xfree86/os-support/linux/systemd-logind.c +@@ -507,6 +507,24 @@ connect_hook(DBusConnection *connection, void *data) + goto cleanup; + } + ++ dbus_bus_add_match(connection, ++ "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.login1.Session',member='PauseDevice'", ++ &error); ++ if (dbus_error_is_set(&error)) { ++ LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n", ++ error.message); ++ goto cleanup; ++ } ++ ++ dbus_bus_add_match(connection, ++ "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.login1.Session',member='ResumeDevice'", ++ &error); ++ if (dbus_error_is_set(&error)) { ++ LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n", ++ error.message); ++ goto cleanup; ++ } ++ + /* + * HdG: This is not useful with systemd <= 208 since the signal only + * contains invalidated property names there, rather than property, val +-- +cgit v0.10.2 + diff --git a/libre/xorg-server/PKGBUILD b/libre/xorg-server/PKGBUILD index fb239ec55..e294e10b9 100644 --- a/libre/xorg-server/PKGBUILD +++ b/libre/xorg-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 240954 2015-06-16 17:41:01Z lcarlier $ +# $Id: PKGBUILD 241622 2015-06-30 21:10:11Z heftig $ # Maintainer (Arch): AndyRTR <andyrtr@archlinux.org> # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> # Maintainer: Márcio Silva <coadde@parabola.nu> @@ -6,8 +6,8 @@ pkgbase=xorg-server pkgname=('xorg-server') pkgver=1.17.2 -pkgrel=1.parabola1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild -arch=('i686' 'x86_64' 'mips64el') +pkgrel=2.parabola1 +arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' @@ -21,7 +21,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} xvfb-run xvfb-run.1 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch - 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch) + 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch + "0001-systemd-logind-do-not-rely-on-directed-signals.patch") validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') @@ -30,7 +31,8 @@ sha256sums=('f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7' - '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96') + '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96' + '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c') prepare() { cd "${pkgbase}-${pkgver}" @@ -38,6 +40,9 @@ prepare() { patch -Np1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch + # fix VT switching with kdbus; from upstream + patch -Np1 -i "../0001-systemd-logind-do-not-rely-on-directed-signals.patch" + # fix os name: #Build Operating System = OSNAME="--kernel-name --kernel-release --machine" OSVENDOR="" #Current Operating System = --kernel-name --nodename --kernel-release --kernel-version --machine @@ -56,11 +61,12 @@ prepare() { sed -i 's|uname -srm|uname -o| s|uname -s|uname -o| ' ChangeLog config.guess configure.ac configure compile + + autoreconf -fvi } build() { cd "${pkgbase}-${pkgver}" - autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ --enable-dri \ |