Accepting request 761828 from shells

- Add temporary patch tcsh-6.22.02-workaround-common.patch to avoid
  common variable seen twice by compiler (boo#1160296)

OBS-URL: https://build.opensuse.org/request/show/761828
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tcsh?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger 2020-01-11 13:37:13 +00:00 committed by Git OBS Bridge
commit cb2830d277
3 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- tcsh-6.22.02/sh.h
+++ tcsh-6.22.02/sh.h 2020-01-08 12:05:37.346589832 +0000
@@ -566,7 +566,7 @@ EXTERN int neednote IZERO; /* Need to
EXTERN int noexec IZERO; /* Don't execute, just syntax check */
EXTERN int pjobs IZERO; /* want to print jobs if interrupted */
EXTERN int setintr IZERO; /* Set interrupts on/off -> Wait intr... */
-EXTERN int handle_interrupt IZERO;/* Are we currently handling an interrupt? */
+extern int handle_interrupt IZERO;/* Are we currently handling an interrupt? */
EXTERN int havhash IZERO; /* path hashing is available */
EXTERN int editing IZERO; /* doing filename expansion and line editing */
EXTERN int noediting IZERO; /* initial $term defaulted to noedit */

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 8 12:06:46 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Add temporary patch tcsh-6.22.02-workaround-common.patch to avoid
common variable seen twice by compiler (boo#1160296)
-------------------------------------------------------------------
Thu Dec 5 06:46:37 UTC 2019 - Dr. Werner Fink <werner@suse.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package tcsh
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,6 +32,7 @@ Patch2: tcsh-6.16.00-norm-cmd.dif
Patch4: tcsh-6.18.03-colorls.dif
Patch5: tcsh-6.17.06-dspmbyte.dif
Patch6: tcsh-6.18.03-catalogs.dif
Patch7: tcsh-6.22.02-workaround-common.patch
BuildRequires: autoconf
BuildRequires: fdupes
BuildRequires: ncurses-devel
@ -57,6 +58,7 @@ correction, a history mechanism, job control, and a C-like syntax.
%patch4 -b .colorls
%patch5 -b .dspmbyte
%patch6 -b .catalogs
%patch7 -p 1 -b .workaround
%patch0 -b .0
%build