Date: Tuesday, February 9, 2016 @ 15:22:37 Author: lcarlier Revision: 259001
upgpkg: xorg-server 1.18.1-2 remove patch already applied upstream (FS#48106) Modified: xorg-server/trunk/PKGBUILD Deleted: xorg-server/trunk/0001-systemd-logind-do-not-rely-on-directed-signals.patch -----------------------------------------------------------+ 0001-systemd-logind-do-not-rely-on-directed-signals.patch | 55 ------------ PKGBUILD | 14 --- 2 files changed, 3 insertions(+), 66 deletions(-) Deleted: 0001-systemd-logind-do-not-rely-on-directed-signals.patch =================================================================== --- 0001-systemd-logind-do-not-rely-on-directed-signals.patch 2016-02-09 12:05:37 UTC (rev 259000) +++ 0001-systemd-logind-do-not-rely-on-directed-signals.patch 2016-02-09 14:22:37 UTC (rev 259001) @@ -1,55 +0,0 @@ -From 780a69aff0ff57ef813179a2f09556eaf488cdfc Mon Sep 17 00:00:00 2001 -From: David Herrmann <[email protected]> -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 <[email protected]> -Cc: Keith Packard <[email protected]> -Reported-by: Jan Alexander Steffens <[email protected]> -Signed-off-by: David Herrmann <[email protected]> -Reviewed-by: Hans de Goede <[email protected]> -Tested-by: Hans de Goede <[email protected]> -Signed-off-by: Hans de Goede <[email protected]> - -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 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-02-09 12:05:37 UTC (rev 259000) +++ PKGBUILD 2016-02-09 14:22:37 UTC (rev 259001) @@ -5,7 +5,7 @@ pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel') pkgver=1.18.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') groups=('xorg') @@ -19,8 +19,7 @@ 'libxshmfence' 'libunwind') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig} xvfb-run - xvfb-run.1 - 0001-systemd-logind-do-not-rely-on-directed-signals.patch) + xvfb-run.1) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') @@ -27,15 +26,8 @@ sha256sums=('85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d' 'SKIP' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c') + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') -prepare() { - cd "${pkgbase}-${pkgver}" - # fix VT switching with kdbus; from upstream - patch -Np1 -i ../0001-systemd-logind-do-not-rely-on-directed-signals.patch -} - build() { cd "${pkgbase}-${pkgver}" ./configure --prefix=/usr \
