From 97fc6c6657ba8281aa48357fb81a527544edb715fccef1821aaaad7563422735 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Thu, 9 Jan 2020 17:05:01 +0000 Subject: [PATCH 1/2] Accepting request 762078 from home:jdelvare:branches:Base:System - Add back support for the TAOS evaluation module to inputattach. OBS-URL: https://build.opensuse.org/request/show/762078 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=55 --- gpm.changes | 5 +++++ gpm.spec | 4 ++-- inputattach.c | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gpm.changes b/gpm.changes index 8982ad3..2832ed7 100644 --- a/gpm.changes +++ b/gpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 9 07:43:00 UTC 2020 - Jean Delvare + +- Add back support for the TAOS evaluation module to inputattach. + ------------------------------------------------------------------- Tue Mar 27 11:41:04 CEST 2018 - kukuk@suse.de diff --git a/gpm.spec b/gpm.spec index 1c0446d..c3494be 100644 --- a/gpm.spec +++ b/gpm.spec @@ -1,7 +1,7 @@ # # spec file for package gpm # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # diff --git a/inputattach.c b/inputattach.c index d14ec0c..cc1a97e 100644 --- a/inputattach.c +++ b/inputattach.c @@ -376,6 +376,9 @@ struct input_types input_types[] = { { "--elo4002", "-elo6b", B9600, CS8 | CRTSCTS, SERIO_ELO, 1, 0, 0, NULL }, { "--elo271-140", "-elo4b", B9600, CS8 | CRTSCTS, SERIO_ELO, 2, 0, 0, NULL }, { "--elo261-280", "-elo3b", B9600, CS8 | CRTSCTS, SERIO_ELO, 3, 0, 0, NULL }, +#ifdef SERIO_TAOSEVM +{ "--taos-evm", "-taos", B1200, CS8, SERIO_TAOSEVM, 0, 0, 0, NULL }, +#endif { "--dump", "-dump", B2400, CS8, 0, 0, 0, 0, dump_init }, { "", "", 0, 0 } @@ -416,6 +419,9 @@ int main(int argc, char **argv) puts(" --ps2serkbd -ps2ser PS/2 via serial keyboard"); puts(" --twiddler -twid Handykey Twiddler chording keyboard"); puts(" --twiddler-joy -twidjoy Handykey Twiddler used as a joystick"); +#ifdef SERIO_TAOSEVM + puts(" --taos-evm -taos TAOS evaluation module"); +#endif puts(""); return 1; } From 59915b6f105e9d4de7046febee2cee5e3fa113d01c9dcda8ed50ca3b0537ee01 Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 15 Jan 2020 09:56:17 +0000 Subject: [PATCH 2/2] - gpm-fno-common.patch: fix compilation in Tumbleweed (bsc#1160873) OBS-URL: https://build.opensuse.org/package/show/Base:System/gpm?expand=0&rev=56 --- gpm-fno-common.patch | 13 +++++++++++++ gpm.changes | 5 +++++ gpm.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 gpm-fno-common.patch diff --git a/gpm-fno-common.patch b/gpm-fno-common.patch new file mode 100644 index 0000000..7a1df5f --- /dev/null +++ b/gpm-fno-common.patch @@ -0,0 +1,13 @@ +Index: gpm-1.20.7/src/headers/daemon.h +=================================================================== +--- gpm-1.20.7.orig/src/headers/daemon.h ++++ gpm-1.20.7/src/headers/daemon.h +@@ -180,7 +180,7 @@ extern struct mouse_features mouse_tabl + extern Gpm_Type mice[]; + extern Gpm_Type *repeated_type; + +-time_t last_selection_time; ++extern time_t last_selection_time; + + + diff --git a/gpm.changes b/gpm.changes index 2832ed7..0088913 100644 --- a/gpm.changes +++ b/gpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 15 09:54:37 UTC 2020 - Adam Majer + +- gpm-fno-common.patch: fix compilation in Tumbleweed (bsc#1160873) + ------------------------------------------------------------------- Thu Jan 9 07:43:00 UTC 2020 - Jean Delvare diff --git a/gpm.spec b/gpm.spec index c3494be..b71c94f 100644 --- a/gpm.spec +++ b/gpm.spec @@ -62,6 +62,7 @@ Patch29: gpm-do_create_symlink.patch Patch30: gpm-fix_fsf_addess.patch #PATCH-FIX-UPSTREAM Fix missing declarations Patch31: decls.patch +Patch32: gpm-fno-common.patch BuildRequires: bison BuildRequires: libtool BuildRequires: lzma @@ -127,6 +128,7 @@ Development files for the gpm (general purpose mouse) package. %patch29 %patch30 %patch31 -p1 +%patch32 -p1 cp %{S:2} %{S:3} %{S:4} . cp %{S:7} COPYING