From ac2891738ad379e28b9eede5d8af1421ed6f940a57d5137a9eae602e86c050f1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 8 Jan 2020 12:18:52 +0000 Subject: [PATCH 1/2] Avoid variable seen twice by compiler OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=94 --- tcsh-6.22.02-workaround-common.patch | 11 +++++++++++ tcsh.changes | 6 ++++++ tcsh.spec | 4 +++- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tcsh-6.22.02-workaround-common.patch diff --git a/tcsh-6.22.02-workaround-common.patch b/tcsh-6.22.02-workaround-common.patch new file mode 100644 index 0000000..5ebaf79 --- /dev/null +++ b/tcsh-6.22.02-workaround-common.patch @@ -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 */ diff --git a/tcsh.changes b/tcsh.changes index 34238d2..101f0d5 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 8 12:06:46 UTC 2020 - Dr. Werner Fink + +- Add temporary patch tcsh-6.22.02-workaround-common.patch to avoid + common variable seen twice by compikler (boo#1160296) + ------------------------------------------------------------------- Thu Dec 5 06:46:37 UTC 2019 - Dr. Werner Fink diff --git a/tcsh.spec b/tcsh.spec index ed51e20..bfbde83 100644 --- a/tcsh.spec +++ b/tcsh.spec @@ -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 From ed3166724edca157d2836e70a528478c74255a852beb81d389532544c70cd235 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 8 Jan 2020 12:19:43 +0000 Subject: [PATCH 2/2] Avoid variable seen twice by compiler OBS-URL: https://build.opensuse.org/package/show/shells/tcsh?expand=0&rev=95 --- tcsh.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcsh.changes b/tcsh.changes index 101f0d5..b2a0813 100644 --- a/tcsh.changes +++ b/tcsh.changes @@ -2,7 +2,7 @@ Wed Jan 8 12:06:46 UTC 2020 - Dr. Werner Fink - Add temporary patch tcsh-6.22.02-workaround-common.patch to avoid - common variable seen twice by compikler (boo#1160296) + common variable seen twice by compiler (boo#1160296) ------------------------------------------------------------------- Thu Dec 5 06:46:37 UTC 2019 - Dr. Werner Fink