rpm/gpm
SHA256
1
0
Fork 0
forked from pool/gpm
Code Pull Requests Activity

Accepting request 764589 from Base:System

Browse Source 
- gpm-fno-common.patch: fix compilation in Tumbleweed (bsc#1160873) 

- Add back support for the TAOS evaluation module to inputattach.

OBS-URL: https://build.opensuse.org/request/show/764589
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpm?expand=0&rev=52
This commit is contained in:
Dominique Leuenberger 2020-01-18 11:14:34 +00:00 committed by Git OBS Bridge
commit 3df07cd1fc
4 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gpm-fno-common.patch Normal file
View File

@ -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;

10
gpm.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Jan 15 09:54:37 UTC 2020 - Adam Majer <adam.majer@suse.de>
- gpm-fno-common.patch: fix compilation in Tumbleweed (bsc#1160873)
-------------------------------------------------------------------
Thu Jan 9 07:43:00 UTC 2020 - Jean Delvare <jdelvare@suse.com>
- Add back support for the TAOS evaluation module to inputattach.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 27 11:41:04 CEST 2018 - kukuk@suse.de Tue Mar 27 11:41:04 CEST 2018 - kukuk@suse.de

6
gpm.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package gpm # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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/
# #
@ -62,6 +62,7 @@ Patch29: gpm-do_create_symlink.patch
Patch30: gpm-fix_fsf_addess.patch Patch30: gpm-fix_fsf_addess.patch
#PATCH-FIX-UPSTREAM Fix missing declarations #PATCH-FIX-UPSTREAM Fix missing declarations
Patch31: decls.patch Patch31: decls.patch
Patch32: gpm-fno-common.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: libtool BuildRequires: libtool
BuildRequires: lzma BuildRequires: lzma
@ -127,6 +128,7 @@ Development files for the gpm (general purpose mouse) package.
%patch29 %patch29
%patch30 %patch30
%patch31 -p1 %patch31 -p1
%patch32 -p1
cp %{S:2} %{S:3} %{S:4} . cp %{S:2} %{S:3} %{S:4} .
cp %{S:7} COPYING cp %{S:7} COPYING

6
inputattach.c
View File

@ -376,6 +376,9 @@ struct input_types input_types[] = {
{ "--elo4002", "-elo6b", B9600, CS8 | CRTSCTS, SERIO_ELO, 1, 0, 0, NULL }, { "--elo4002", "-elo6b", B9600, CS8 | CRTSCTS, SERIO_ELO, 1, 0, 0, NULL },
{ "--elo271-140", "-elo4b", B9600, CS8 | CRTSCTS, SERIO_ELO, 2, 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 }, { "--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 }, { "--dump", "-dump", B2400, CS8, 0, 0, 0, 0, dump_init },
{ "", "", 0, 0 } { "", "", 0, 0 }
@ -416,6 +419,9 @@ int main(int argc, char **argv)
puts(" --ps2serkbd -ps2ser PS/2 via serial keyboard"); puts(" --ps2serkbd -ps2ser PS/2 via serial keyboard");
puts(" --twiddler -twid Handykey Twiddler chording keyboard"); puts(" --twiddler -twid Handykey Twiddler chording keyboard");
puts(" --twiddler-joy -twidjoy Handykey Twiddler used as a joystick"); puts(" --twiddler-joy -twidjoy Handykey Twiddler used as a joystick");
#ifdef SERIO_TAOSEVM
puts(" --taos-evm -taos TAOS evaluation module");
#endif
puts(""); puts("");
return 1; return 1;
} }