packages: cdp/cdp.spec, cdp/cdp-getline.patch (NEW) - rel 39; getline fix

[arekm]

Author: arekm                        Date: Thu Sep  1 07:51:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 39; getline fix

---- Files affected:
packages/cdp:
   cdp.spec (1.48 -> 1.49) , cdp-getline.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cdp/cdp.spec
diff -u packages/cdp/cdp.spec:1.48 packages/cdp/cdp.spec:1.49
--- packages/cdp/cdp.spec:1.48	Wed Aug 31 20:27:06 2011
+++ packages/cdp/cdp.spec	Thu Sep  1 09:51:25 2011
@@ -6,7 +6,7 @@
 Summary(tr.UTF-8):	Müzik CD'lerini çalmak için bir metin ekran programı
 Name:		cdp
 Version:	0.33
-Release:	28
+Release:	29
 License:	GPL
 Group:		Applications/Sound
 Source0:	ftp://sunsite.unc.edu/pub/Linux/apps/sound/cdrom/curses/%{name}-%{version}.tgz
@@ -21,6 +21,7 @@
 Patch7:		%{name}-keys.patch
 Patch8:		%{name}-nonblock.patch
 Patch9:		%{name}-bo_fix.patch
+Patch10:	%{name}-getline.patch
 BuildRequires:	ncurses-devel >= 5.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,6 +60,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %{__make} COMP_OPT="%{rpmcflags} -Wall"
@@ -84,6 +86,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2011/09/01 07:51:25  arekm
+- rel 39; getline fix
+
 Revision 1.48  2011/08/31 18:27:06  arekm
 - release 28
 

================================================================
Index: packages/cdp/cdp-getline.patch
diff -u /dev/null packages/cdp/cdp-getline.patch:1.1
--- /dev/null	Thu Sep  1 09:51:30 2011
+++ packages/cdp/cdp-getline.patch	Thu Sep  1 09:51:25 2011
@@ -0,0 +1,54 @@
+diff -ur cdp-0.33.org/display.c cdp-0.33/display.c
+--- cdp-0.33.org/display.c	1995-11-10 07:10:42.000000000 +0100
++++ cdp-0.33/display.c	2011-09-01 09:49:41.544769864 +0200
+@@ -540,7 +540,7 @@
+     displayStatusPrintf( pInfo, pCD->trk[ track - 1 ].songname );
+   
+     line = TOC_TOP_LINE + 1 + track - 1 - pInfo->scrStartTrack;
+-    code = getline( line, STARTX_TRK_NAME, WIDTH_TRK_NAME + 2,REVERSE_COLOR,
++    code = getline_cdp( line, STARTX_TRK_NAME, WIDTH_TRK_NAME + 2,REVERSE_COLOR,
+ 		    NORMAL_COLOR, MARKED_COLOR | A_BOLD, 
+  		    lpszNewName, SONG_SIZE, 
+ 		    pCD->trk[ track - 1 ].songname );
+@@ -573,7 +573,7 @@
+     resetCurrTrackMark( pInfo );
+     pCD = pInfo->pCD;
+ 
+-    code = getline( 2, 19, WIDTH_CDNAME, REVERSE_COLOR,
++    code = getline_cdp( 2, 19, WIDTH_CDNAME, REVERSE_COLOR,
+ 		    NORMAL_COLOR, MARKED_COLOR | A_BOLD, 
+ 		    lpszNewName, sizeof( pCD->cdname ), 
+ 		    pCD->cdname );
+@@ -604,7 +604,7 @@
+     resetCurrTrackMark( pInfo );
+     pCD = pInfo->pCD;
+ 
+-    code = getline( 1, 19, WIDTH_ARTIST,REVERSE_COLOR,
++    code = getline_cdp( 1, 19, WIDTH_ARTIST,REVERSE_COLOR,
+ 		    NORMAL_COLOR, MARKED_COLOR | A_BOLD, 
+ 		    lpszNewName, sizeof( pCD->artist ), 
+ 		    pCD->artist );
+diff -ur cdp-0.33.org/getline.c cdp-0.33/getline.c
+--- cdp-0.33.org/getline.c	2011-09-01 09:50:11.075466389 +0200
++++ cdp-0.33/getline.c	2011-09-01 09:49:41.544769864 +0200
+@@ -139,7 +139,7 @@
+ }
+ 			     
+ 
+-int     getline( int      y,
++int     getline_cdp( int      y,
+ 		 int      x, 
+ 		 int      width,
+  		 chtype   attrText,
+diff -ur cdp-0.33.org/getline.h cdp-0.33/getline.h
+--- cdp-0.33.org/getline.h	1995-11-10 07:10:42.000000000 +0100
++++ cdp-0.33/getline.h	2011-09-01 09:49:41.548103522 +0200
+@@ -7,7 +7,7 @@
+ #define  __getline__H
+ 
+ 
+-int     getline( int      y, 
++int     getline_cdp( int      y, 
+ 		 int      x,
+ 		 int      width,
+  		 chtype   attrText,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cdp/cdp.spec?r1=1.48&r2=1.49&f=u