Hello community, here is the log from the commit of package minicom checked in at Tue Aug 22 22:06:42 CEST 2006. -------- --- minicom/minicom.changes 2006-02-27 17:53:13.000000000 +0100 +++ minicom/minicom.changes 2006-08-22 18:31:57.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 22 18:13:50 CEST 2006 - mkoenig@suse.de + +- fixed getline name collision +- moved autotools scripts out of aux/ + +------------------------------------------------------------------- New: ---- minicom-2.1-aux.patch minicom-2.1-getline.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minicom.spec ++++++ --- /var/tmp/diff_new_pack.4EToog/_old 2006-08-22 22:06:32.000000000 +0200 +++ /var/tmp/diff_new_pack.4EToog/_new 2006-08-22 22:06:32.000000000 +0200 @@ -19,7 +19,7 @@ Requires: rzsz Autoreqprov: on Version: 2.1 -Release: 151 +Release: 161 Summary: A Terminal Program Source: minicom-%{version}.tar.bz2 Patch: minicom-%{version}.dif @@ -27,6 +27,8 @@ Patch2: minicom-2.00.0.ja.po.patch Patch3: minicom-gcc4.patch Patch4: %{name}-%{version}-array.diff +Patch5: %{name}-%{version}-getline.patch +Patch6: %{name}-%{version}-aux.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -52,6 +54,8 @@ # %patch2 -p1 %patch3 %patch4 +%patch5 +%patch6 %build autoreconf --force --install @@ -90,6 +94,9 @@ %{_mandir}/man1/runscript.1.gz %changelog -n minicom +* Tue Aug 22 2006 - mkoenig@suse.de +- fixed getline name collision +- moved autotools scripts out of aux/ * Mon Feb 27 2006 - anicka@suse.cz - fix subscript out of range (#151489) * Wed Jan 25 2006 - mls@suse.de ++++++ minicom-2.1-aux.patch ++++++ ++++ 6546 lines (skipped) ++++++ minicom-2.1-getline.patch ++++++ --- src/minicom.c +++ src/minicom.c @@ -153,7 +153,7 @@ #if _HISTORY /* Get a line from either window or scroll back buffer. */ -static ELM *getline(w, no) +static ELM *l_getline(w, no) WIN *w; int no; { @@ -194,7 +194,7 @@ w->direct = 0; for(f = 0; f < w->ys; f++) - wdrawelm(w, f, getline(w, y++)); + wdrawelm(w, f, l_getline(w, y++)); if (r) wredraw(w, 1); w->direct = 1; } @@ -222,7 +222,7 @@ w->direct = 0; for (f = 0; f < w->ys; f++) { - tmp_e = getline(w, y++); + tmp_e = l_getline(w, y++); /* First we "accumulate" the line into a variable */ wdrawelm_var(w, tmp_e, tmp_line); @@ -321,7 +321,7 @@ for (next_line = hit_line; next_line <= all_lines; next_line++) { /* we do 'something' here... :-) */ - tmp_e = getline(w_hist, next_line); + tmp_e = l_getline(w_hist, next_line); /* * First we "accumulate" the line into a variable. @@ -390,9 +390,9 @@ int end; { if (y+citey >= start && y+citey <= end) - wdrawelm_inverse(w, y, getline(w, y+citey)); + wdrawelm_inverse(w, y, l_getline(w, y+citey)); else - wdrawelm(w, y, getline(w, y+citey)); + wdrawelm(w, y, l_getline(w, y+citey)); } static void drawcite_whole(w, y, start, end) @@ -416,7 +416,7 @@ for (y=start; y<=end; y++) { vt_send('>'); vt_send(' '); - tmp_e = getline(w, y); + tmp_e = l_getline(w, y); wdrawelm_var(w, tmp_e, tmp_line); tmp_line[w->xs]=0; for (x=w->xs-1; x>=0; x--){ @@ -599,7 +599,7 @@ inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend); } else { - tmp_e = getline(b_us, y); + tmp_e = l_getline(b_us, y); if (strlen(look_for) > 1) { /* quick scan for pattern match */ @@ -618,8 +618,8 @@ inverse = 0; } #endif /*_SEARCH_HISTORY*/ - if (inverse) wdrawelm_inverse(b_us, 0, getline(b_us, y)); - else wdrawelm(b_us, 0, getline(b_us, y)); + if (inverse) wdrawelm_inverse(b_us, 0, l_getline(b_us, y)); + else wdrawelm(b_us, 0, l_getline(b_us, y)); if (citemode) wlocate(b_us, 0, cite_y); wflush(); break; @@ -652,7 +652,7 @@ inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend); } else { - tmp_e = getline(b_us, y + b_us->ys - 1); + tmp_e = l_getline(b_us, y + b_us->ys - 1); if (strlen(look_for) > 1) { /* quick scan for pattern match */ @@ -673,10 +673,10 @@ #endif /*_SEARCH_HISTORY*/ if (inverse) wdrawelm_inverse(b_us, b_us->ys - 1, - getline(b_us, y + b_us->ys - 1)); + l_getline(b_us, y + b_us->ys - 1)); else wdrawelm(b_us, b_us->ys - 1, - getline(b_us, y + b_us->ys - 1)); + l_getline(b_us, y + b_us->ys - 1)); if (citemode) wlocate(b_us, 0, cite_y); wflush(); break; @@ -760,7 +760,7 @@ wlocate(b_st, 0, 0); wprintf(b_st, hline); wredraw(b_st, 1); - wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart)); + wdrawelm_inverse(b_us, cite_y, l_getline(b_us, cite_ystart)); wlocate(b_us, 0, cite_y); break; case K_ESC: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org