Accepting request 132449 from home:sleep_walker:branches:devel:tools
- fix build for SLE distributions - update to 15.8a - patches refreshed - ctrlz patch reached upstream - deleted OBS-URL: https://build.opensuse.org/request/show/132449 OBS-URL: https://build.opensuse.org/package/show/devel:tools/cscope?expand=0&rev=11
This commit is contained in:
Git OBS Bridge
parent
c5fa4a92c5
commit
307e074ac9
@ -2,7 +2,7 @@ Index: src/global.h
|
||||
===================================================================
|
||||
--- src/global.h.orig
|
||||
+++ src/global.h
|
||||
@@ -370,7 +370,7 @@ void mousecleanup(void);
|
||||
@@ -387,7 +387,7 @@ void mousecleanup(void);
|
||||
void mousemenu(void);
|
||||
void mouseinit(void);
|
||||
void mousereinit(void);
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:02638bcba790bc8b0562f28dbe789e61794415079d94a676efc287d18dc96037
|
||||
size 361214
|
||||
3
cscope-15.8a.tar.bz2
Normal file
3
cscope-15.8a.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eab34b1179a582bb4e3a875778d5e30fbc99d46cdeaf3bef866471bcd4cc7cf7
|
||||
size 516150
|
||||
@ -2,7 +2,7 @@ Index: src/main.c
|
||||
===================================================================
|
||||
--- src/main.c.orig
|
||||
+++ src/main.c
|
||||
@@ -375,6 +375,8 @@ cscope: Could not create private temp di
|
||||
@@ -526,6 +526,8 @@ cscope: Could not create private temp di
|
||||
}
|
||||
/* cleanup on the hangup signal */
|
||||
signal(SIGHUP, myexit);
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
# restore control-z functionality of interactive cscope.
|
||||
# version 15.6 (and previous) had control-z functionality because
|
||||
# the terminal was in cbreak mode. Putting the terminal in raw mode
|
||||
# fixed using control-c to change the 'ignore case mode'.
|
||||
# catch the control-z and send ourself the suspend signal.
|
||||
# rcoe@wi.rr.com
|
||||
#
|
||||
--- cscope-15.7a/src/command.c 2009-04-10 08:40:36.000000000 -0500
|
||||
+++ cscope-15.7a.orig/src/command.c 2011-06-10 09:33:21.862932467 -0500
|
||||
@@ -634,11 +634,13 @@ changestring(void)
|
||||
atchange();
|
||||
|
||||
/* get a character from the terminal */
|
||||
- if ((c = mygetch()) == EOF
|
||||
- || c == ctrl('D')
|
||||
- || c == ctrl('Z')) {
|
||||
+ if ((c = mygetch()) == EOF || c == ctrl('D')) {
|
||||
break; /* change lines */
|
||||
}
|
||||
+ if (c == ctrl('Z')) {
|
||||
+ kill(0, SIGTSTP);
|
||||
+ goto same;
|
||||
+ }
|
||||
/* see if the input character is a command */
|
||||
switch (c) {
|
||||
case ' ': /* display next page */
|
||||
--- cscope-15.7a/src/main.c 2011-06-09 15:36:06.275174224 -0500
|
||||
+++ cscope-15.7a.orig/src/main.c 2011-06-10 09:39:17.120599658 -0500
|
||||
@@ -707,9 +707,13 @@ cscope: cannot read source file name fro
|
||||
atfield(); /* move to the input field */
|
||||
|
||||
/* exit if the quit command is entered */
|
||||
- if ((c = mygetch()) == EOF || c == ctrl('D') || c == ctrl('Z')) {
|
||||
+ if ((c = mygetch()) == EOF || c == ctrl('D')) {
|
||||
break;
|
||||
}
|
||||
+ if (c == ctrl('Z')) {
|
||||
+ kill(0, SIGTSTP);
|
||||
+ continue;
|
||||
+ }
|
||||
/* execute the commmand, updating the display if necessary */
|
||||
if (command(c) == YES) {
|
||||
display();
|
||||
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 3 21:57:08 UTC 2012 - sleep_walker@suse.cz
|
||||
|
||||
- attempt to fix build for SLE distributions
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 3 21:46:46 UTC 2012 - sleep_walker@suse.cz
|
||||
|
||||
- update to 15.8a
|
||||
- patches refreshed
|
||||
- ctrlz patch reached upstream - deleted
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 20 20:15:02 UTC 2011 - coolo@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package cscope
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -15,8 +15,9 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: cscope
|
||||
Version: 15.7a
|
||||
Version: 15.8a
|
||||
Release: 0
|
||||
Summary: Interactive Tool for Browsing C Source Code
|
||||
License: BSD-3-Clause
|
||||
@ -28,7 +29,6 @@ Patch2: %{name}-15.7-gcc-warnings.patch
|
||||
Patch3: %{name}-15.7-vpath.patch
|
||||
Patch5: %{name}-cleanup_on_sigterm.patch
|
||||
Patch6: %{name}-egrep.out.patch
|
||||
Patch7: %{name}-ctrlz.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: ncurses-devel
|
||||
@ -45,7 +45,6 @@ browse through C source code files for specified elements of code.
|
||||
%patch3
|
||||
%patch5
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -58,7 +57,7 @@ install -m 755 src/cscope %{buildroot}%{_bindir}/cscope
|
||||
install -m 644 doc/cscope.1 %{buildroot}%{_mandir}/man1/cscope.1
|
||||
install -m 755 contrib/xcscope/cscope-indexer %{buildroot}%{_bindir}/cscope-indexer
|
||||
pushd contrib
|
||||
%make_install
|
||||
%makeinstall
|
||||
popd
|
||||
|
||||
%files
|
||||
|
||||
Loading…
Reference in New Issue
Block a user