diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | 0001-systemd-logind-do-not-rely-on-directed-signals.patch | 55 | ||||
| -rw-r--r-- | PKGBUILD | 11 |
3 files changed, 8 insertions, 70 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-server-dev - pkgver = 1.17.99.901 - pkgrel = 2 + pkgver = 1.17.99.902 + pkgrel = 1 url = http://xorg.freedesktop.org arch = i686 arch = x86_64 @@ -52,19 +52,17 @@ pkgbase = xorg-server-dev makedepends = dri3proto makedepends = libxshmfence makedepends = libunwind - source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.17.99.901.tar.bz2 - source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.17.99.901.tar.bz2.sig + source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.17.99.902.tar.bz2 + source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.17.99.902.tar.bz2.sig source = nvidia-drm-outputclass.conf source = xvfb-run source = xvfb-run.1 - source = 0001-systemd-logind-do-not-rely-on-directed-signals.patch source = 0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch - sha256sums = d9efaf191f9dd4e84771de507ac00571d2a2f43bfae589fbf1b05706f83bb280 + sha256sums = 0344d78d92ba5f1181e0adb98a9679d5906b06bc3c15978e1355b0d3be3749c0 sha256sums = SKIP sha256sums = af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56 sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9 sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 - sha256sums = 3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c sha256sums = bdcfc54ce0b64d29848efc56383d850778c6eeecf836c10b67ec2eda03a6160b pkgname = xorg-server-dev diff --git a/0001-systemd-logind-do-not-rely-on-directed-signals.patch b/0001-systemd-logind-do-not-rely-on-directed-signals.patch deleted file mode 100644 index 9daadf6f6336..000000000000 --- a/0001-systemd-logind-do-not-rely-on-directed-signals.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 - @@ -3,8 +3,8 @@ _pkgbase=xorg-server pkgname=('xorg-server-dev' 'xorg-server-xephyr-dev' 'xorg-server-xdmx-dev' 'xorg-server-xvfb-dev' 'xorg-server-xnest-dev' 'xorg-server-xwayland-dev' 'xorg-server-common-dev' 'xorg-server-devel-dev') -pkgver=1.17.99.901 # 1.18.0 RC1: http://lists.x.org/archives/xorg/2015-September/057571.html -pkgrel=2 +pkgver=1.17.99.902 # 1.18.0 RC2: http://lists.x.org/archives/xorg-announce/2015-October/002646.html +pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" @@ -19,25 +19,20 @@ source=(${url}/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig} nvidia-drm-outputclass.conf xvfb-run xvfb-run.1 - 0001-systemd-logind-do-not-rely-on-directed-signals.patch 0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') -sha256sums=('d9efaf191f9dd4e84771de507ac00571d2a2f43bfae589fbf1b05706f83bb280' +sha256sums=('0344d78d92ba5f1181e0adb98a9679d5906b06bc3c15978e1355b0d3be3749c0' 'SKIP' 'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c' 'bdcfc54ce0b64d29848efc56383d850778c6eeecf836c10b67ec2eda03a6160b') prepare() { cd "${_pkgbase}-${pkgver}" - msg2 "fix VT switching with kdbus; from upstream" - patch -Np1 -i ../0001-systemd-logind-do-not-rely-on-directed-signals.patch - msg2 "fix FS#46741, taken from Fedora" patch -Np1 -i ../0001-linux-Do-not-call-FatalError-from-xf86CloseConsole.patch |