summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDet2015-07-01 08:18:07 +0300
committerDet2015-07-01 08:18:07 +0300
commit9690cd46a68cd1a35f51e84c6655fdd0bd042679 (patch)
tree1e8f6712bb784ec32853131d0a23c0b2c368ad71
parentbc4ffecab757bf37805fca03e75794be83a57f59 (diff)
downloadaur-9690cd46a68cd1a35f51e84c6655fdd0bd042679.tar.gz
1.17.2-2: Add a kdbux fix
-rw-r--r--.SRCINFO4
-rw-r--r--0001-systemd-logind-do-not-rely-on-directed-signals.patch55
-rwxr-xr-xPKGBUILD17
3 files changed, 69 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3284b7a72ef..825992a077f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xorg-server-dev
pkgver = 1.17.2
- pkgrel = 1
+ pkgrel = 2
url = http://xorg.freedesktop.org
arch = i686
arch = x86_64
@@ -59,6 +59,7 @@ pkgbase = xorg-server-dev
source = xvfb-run.1
source = 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
source = 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
+ source = 0001-systemd-logind-do-not-rely-on-directed-signals.patch
sha256sums = f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993
sha256sums = SKIP
sha256sums = af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56
@@ -66,6 +67,7 @@ pkgbase = xorg-server-dev
sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
sha256sums = 3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7
sha256sums = 416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96
+ sha256sums = 3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c
pkgname = xorg-server-dev
pkgdesc = Xorg X server - Bleeding edge version
diff --git a/0001-systemd-logind-do-not-rely-on-directed-signals.patch b/0001-systemd-logind-do-not-rely-on-directed-signals.patch
new file mode 100644
index 00000000000..9daadf6f633
--- /dev/null
+++ b/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/PKGBUILD b/PKGBUILD
index c4445c8224f..18d448850f6 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_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.2 # http://lists.x.org/archives/xorg/2015-June/057436.html
-pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgrel=2 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -20,7 +20,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')
sha256sums=('f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993'
@@ -29,21 +30,25 @@ sha256sums=('f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
'3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7'
- '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96')
+ '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96'
+ '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c')
prepare() {
cd "${_pkgbase}-${pkgver}"
msg2 "fix FS#45229, merged upstream"
patch -Np1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
+
+ msg2 "fix VT switching with kdbus; from upstream"
+ patch -Np1 -i "../0001-systemd-logind-do-not-rely-on-directed-signals.patch"
+
+ msg2 "Starting autoreconf..."
+ autoreconf -fvi
}
build() {
cd "${_pkgbase}-${pkgver}"
- msg2 "Starting autoreconf..."
- autoreconf -fi
-
msg2 "Starting ./configure..."
./configure --prefix=/usr \
--enable-ipv6 \