- rename getline to avoid conflict with glibc (#511715)
- remove makefiles from docs - drop wchar patch
This commit is contained in:
Miroslav Lichvar
parent
fd5316daec
commit
091b57cfce
112
minicom-2.3-getline.patch
Normal file
112
minicom-2.3-getline.patch
Normal file
@ -0,0 +1,112 @@
|
||||
diff -up minicom-2.3/src/minicom.c.getline minicom-2.3/src/minicom.c
|
||||
--- minicom-2.3/src/minicom.c.getline 2009-07-16 13:17:04.000000000 +0200
|
||||
+++ minicom-2.3/src/minicom.c 2009-07-16 13:21:55.000000000 +0200
|
||||
@@ -166,7 +166,7 @@ static void shjump(int sig)
|
||||
#endif /*SIGTSTP*/
|
||||
|
||||
/* Get a line from either window or scroll back buffer. */
|
||||
-static ELM *getline(WIN *w, int no)
|
||||
+static ELM *get_line(WIN *w, int no)
|
||||
{
|
||||
int i;
|
||||
static ELM outofrange[MAXCOLS] = {{0,0,0}};
|
||||
@@ -204,7 +204,7 @@ static void drawhist(WIN *w, int y, int
|
||||
|
||||
w->direct = 0;
|
||||
for (f = 0; f < w->ys; f++)
|
||||
- mc_wdrawelm(w, f, getline(w, y++));
|
||||
+ mc_wdrawelm(w, f, get_line(w, y++));
|
||||
if (r)
|
||||
mc_wredraw(w, 1);
|
||||
w->direct = 1;
|
||||
@@ -226,7 +226,7 @@ void drawhist_look(WIN *w, int y, int r,
|
||||
tmp_line[0]='\0';
|
||||
w->direct = 0;
|
||||
for (f = 0; f < w->ys; f++) {
|
||||
- tmp_e = getline(w, y++);
|
||||
+ tmp_e = get_line(w, y++);
|
||||
|
||||
/* First we "accumulate" the line into a variable */
|
||||
mc_wdrawelm_var(w, tmp_e, tmp_line);
|
||||
@@ -323,7 +323,7 @@ int find_next(WIN *w, WIN *w_hist,
|
||||
|
||||
for (next_line = hit_line; next_line <= all_lines; next_line++) {
|
||||
/* we do 'something' here... :-) */
|
||||
- tmp_e = getline(w_hist, next_line);
|
||||
+ tmp_e = get_line(w_hist, next_line);
|
||||
|
||||
/*
|
||||
* First we "accumulate" the line into a variable.
|
||||
@@ -378,9 +378,9 @@ wchar_t *StrStr(wchar_t *str1, wchar_t *
|
||||
static void drawcite(WIN *w, int y, int citey, int start, int end)
|
||||
{
|
||||
if (y+citey >= start && y+citey <= end)
|
||||
- mc_wdrawelm_inverse(w, y, getline(w, y+citey));
|
||||
+ mc_wdrawelm_inverse(w, y, get_line(w, y+citey));
|
||||
else
|
||||
- mc_wdrawelm(w, y, getline(w, y+citey));
|
||||
+ mc_wdrawelm(w, y, get_line(w, y+citey));
|
||||
}
|
||||
|
||||
static void drawcite_whole(WIN *w, int y, int start, int end)
|
||||
@@ -399,7 +399,7 @@ static void do_cite(WIN *w, int start, i
|
||||
for (y=start; y<=end; y++) {
|
||||
vt_send('>');
|
||||
vt_send(' ');
|
||||
- tmp_e = getline(w, y);
|
||||
+ tmp_e = get_line(w, y);
|
||||
mc_wdrawelm_var(w, tmp_e, tmp_line);
|
||||
tmp_line[w->xs] = 0;
|
||||
for (x = w->xs-1; x >= 0; x--) {
|
||||
@@ -599,7 +599,7 @@ static void scrollback(void)
|
||||
if (citemode) {
|
||||
inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
|
||||
} else {
|
||||
- tmp_e = getline(b_us, y);
|
||||
+ tmp_e = get_line(b_us, y);
|
||||
if (wcslen(look_for) > 1) {
|
||||
/* quick scan for pattern match */
|
||||
mc_wdrawelm_var(b_us, tmp_e, tmp_line);
|
||||
@@ -610,9 +610,9 @@ static void scrollback(void)
|
||||
}
|
||||
|
||||
if (inverse)
|
||||
- mc_wdrawelm_inverse(b_us, 0, getline(b_us, y));
|
||||
+ mc_wdrawelm_inverse(b_us, 0, get_line(b_us, y));
|
||||
else
|
||||
- mc_wdrawelm(b_us, 0, getline(b_us, y));
|
||||
+ mc_wdrawelm(b_us, 0, get_line(b_us, y));
|
||||
if (citemode)
|
||||
mc_wlocate(b_us, 0, cite_y);
|
||||
mc_wflush();
|
||||
@@ -647,7 +647,7 @@ static void scrollback(void)
|
||||
if (citemode) {
|
||||
inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
|
||||
} else {
|
||||
- tmp_e = getline(b_us, y + b_us->ys - 1);
|
||||
+ tmp_e = get_line(b_us, y + b_us->ys - 1);
|
||||
if (wcslen(look_for) > 1) {
|
||||
/* quick scan for pattern match */
|
||||
mc_wdrawelm_var(b_us, tmp_e, tmp_line);
|
||||
@@ -659,10 +659,10 @@ static void scrollback(void)
|
||||
|
||||
if (inverse)
|
||||
mc_wdrawelm_inverse(b_us, b_us->ys - 1,
|
||||
- getline(b_us, y + b_us->ys - 1));
|
||||
+ get_line(b_us, y + b_us->ys - 1));
|
||||
else
|
||||
mc_wdrawelm(b_us, b_us->ys - 1,
|
||||
- getline(b_us, y + b_us->ys - 1));
|
||||
+ get_line(b_us, y + b_us->ys - 1));
|
||||
if (citemode)
|
||||
mc_wlocate(b_us, 0, cite_y);
|
||||
mc_wflush();
|
||||
@@ -752,7 +752,7 @@ static void scrollback(void)
|
||||
mc_wlocate(b_st, 0, 0);
|
||||
mc_wprintf(b_st, hline);
|
||||
mc_wredraw(b_st, 1);
|
||||
- mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
|
||||
+ mc_wdrawelm_inverse(b_us, cite_y, get_line(b_us, cite_ystart));
|
||||
mc_wlocate(b_us, 0, cite_y);
|
||||
break;
|
||||
case K_ESC:
|
||||
@ -1,23 +0,0 @@
|
||||
diff -urp minicom-2.3.orig/src/minicom.c minicom-2.3/src/minicom.c
|
||||
--- minicom-2.3.orig/src/minicom.c 2008-02-24 20:46:09.000000000 +0100
|
||||
+++ minicom-2.3/src/minicom.c 2008-02-24 20:48:03.000000000 +0100
|
||||
@@ -31,7 +31,6 @@
|
||||
RCSID(PKG_VER "$Id: minicom.c,v 1.34 2008-02-02 22:49:53 al-guest Exp $")
|
||||
|
||||
#include <getopt.h>
|
||||
-#include <wchar.h>
|
||||
#include <wctype.h>
|
||||
|
||||
#define EXTERN
|
||||
Only in minicom-2.3/src: minicom.c.wchar
|
||||
diff -urp minicom-2.3.orig/src/window.c minicom-2.3/src/window.c
|
||||
--- minicom-2.3.orig/src/window.c 2008-02-24 21:06:29.000000000 +0100
|
||||
+++ minicom-2.3/src/window.c 2008-02-24 21:06:42.000000000 +0100
|
||||
@@ -27,7 +27,6 @@ RCSID("$Id: window.c,v 1.21 2008-02-06 2
|
||||
|
||||
#include <limits.h>
|
||||
#include <stdarg.h>
|
||||
-#include <wchar.h>
|
||||
#ifdef HAVE_TERMCAP_H
|
||||
# include <termcap.h>
|
||||
#elif defined (HAVE_NCURSES_TERMCAP_H)
|
||||
16
minicom.spec
16
minicom.spec
@ -1,7 +1,7 @@
|
||||
Summary: A text-based modem control and terminal emulation program
|
||||
Name: minicom
|
||||
Version: 2.3
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
URL: http://alioth.debian.org/projects/minicom/
|
||||
License: GPLv2+
|
||||
Group: Applications/Communications
|
||||
@ -14,13 +14,13 @@ Source0: http://alioth.debian.org/frs/download.php/2332/minicom-2.3.tar.gz
|
||||
|
||||
Patch1: minicom-2.3-ncurses.patch
|
||||
Patch2: minicom-2.3-drop-privs.patch
|
||||
Patch3: minicom-2.3-wchar.patch
|
||||
Patch4: minicom-2.2-umask.patch
|
||||
Patch6: minicom-2.2-spaces.patch
|
||||
Patch7: minicom-2.3-gotodir.patch
|
||||
Patch8: minicom-2.3-rh.patch
|
||||
Patch9: minicom-2.3-esc.patch
|
||||
Patch10: minicom-2.3-staticbuf.patch
|
||||
Patch11: minicom-2.3-getline.patch
|
||||
|
||||
%description
|
||||
Minicom is a simple text-based modem control and terminal emulation
|
||||
@ -32,13 +32,16 @@ language, and other features.
|
||||
%setup -q
|
||||
%patch1 -p1 -b .ncurses
|
||||
%patch2 -p1 -b .drop-privs
|
||||
%patch3 -p1 -b .wchar
|
||||
%patch4 -p1 -b .umask
|
||||
%patch6 -p1 -b .spaces
|
||||
%patch7 -p1 -b .gotodir
|
||||
%patch8 -p1 -b .rh
|
||||
%patch9 -p1 -b .esc
|
||||
%patch10 -p1 -b .staticbuf
|
||||
%patch11 -p1 -b .getline
|
||||
|
||||
cp -pr doc doc_
|
||||
rm -f doc_/Makefile*
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -57,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%doc ChangeLog AUTHORS NEWS TODO doc/*
|
||||
%doc ChangeLog AUTHORS NEWS TODO doc_/*
|
||||
%config(noreplace) %{_sysconfdir}/minicom.users
|
||||
# DO NOT MAKE minicom SUID/SGID anything.
|
||||
%{_bindir}/minicom
|
||||
@ -67,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Thu Jul 16 2009 Miroslav Lichvar <mlichvar@redhat.com> 2.3-5
|
||||
- rename getline to avoid conflict with glibc (#511715)
|
||||
- remove makefiles from docs
|
||||
- drop wchar patch
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user