Hello community, here is the log from the commit of package xf86-input-mouse for openSUSE:Factory checked in at 2017-10-20 16:10:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-mouse (Old) and /work/SRC/openSUSE:Factory/.xf86-input-mouse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-mouse" Fri Oct 20 16:10:54 2017 rev:13 rq:532961 version:1.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-mouse/xf86-input-mouse.changes 2016-11-24 21:17:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-input-mouse.new/xf86-input-mouse.changes 2017-10-20 16:10:55.373594152 +0200 @@ -1,0 +2,6 @@ +Mon Oct 9 13:50:21 UTC 2017 - [email protected] + +- Add patch U_adapt-to-removal-of-xf86GetOS.patch + This patch is in preparation of the upcoming XServer release + +------------------------------------------------------------------- New: ---- U_adapt-to-removal-of-xf86GetOS.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-mouse.spec ++++++ --- /var/tmp/diff_new_pack.xTj4oo/_old 2017-10-20 16:10:55.885570235 +0200 +++ /var/tmp/diff_new_pack.xTj4oo/_new 2017-10-20 16:10:55.889570049 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-input-mouse # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 +Patch1: U_adapt-to-removal-of-xf86GetOS.patch + BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: libtool @@ -56,6 +58,7 @@ %prep %setup -q +%patch1 -p1 %build autoreconf -fi ++++++ U_adapt-to-removal-of-xf86GetOS.patch ++++++ >From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001 From: Adam Jackson <[email protected]> Date: Thu, 16 Feb 2017 09:21:21 -0500 Subject: Adapt to removal of xf86GetOS Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/mouse.c b/src/mouse.c index dae98aa..40d97a9 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -794,7 +794,6 @@ InitProtocols(void) { int classes; int i; - const char *osname = NULL; if (osInfo) return TRUE; @@ -821,11 +820,11 @@ InitProtocols(void) mouseProtocols[i].id = PROT_UNSUP; /* NetBSD uses PROT_BM for "PS/2". */ - xf86GetOS(&osname, NULL, NULL, NULL); - if (osname && xf86NameCmp(osname, "netbsd") == 0) - for (i = 0; mouseProtocols[i].name; i++) - if (mouseProtocols[i].id == PROT_PS2) - mouseProtocols[i].id = PROT_BM; +#if defined(__NetBSD__) + for (i = 0; mouseProtocols[i].name; i++) + if (mouseProtocols[i].id == PROT_PS2) + mouseProtocols[i].id = PROT_BM; +#endif return TRUE; } -- cgit v0.10.2
