media-libs/urt: Clean up patches.

Package-Manager: Portage-2.3.46, Repoman-2.3.10

5 files changed, 56 insertions, 56 deletions

diff --git a/media-libs/urt/files/urt-3.1b-build-fixes.patch b/media-libs/urt/files/urt-3.1b-build-fixes.patch
index 28da6b9b66d9..2f801e0c984a 100644
--- a/media-libs/urt/files/urt-3.1b-build-fixes.patch
+++ b/media-libs/urt/files/urt-3.1b-build-fixes.patch
@@ -4,8 +4,8 @@ http://bugs.gentoo.org/107428
 respect user LDFLAGS
 http://bugs.gentoo.org/126872
 
---- urt/lib/makefile.src
-+++ urt/lib/makefile.src
+--- a/lib/makefile.src
++++ b/lib/makefile.src
 @@ -181,8 +181,7 @@
  # Rebuild the library from all the .o files.
  buildlib: $(OBJS)
@@ -16,8 +16,8 @@ http://bugs.gentoo.org/126872
  #ifndef NO_RANLIB
  	ranlib $(LIBNAME)
  #endif
---- urt/tools/clock/makefile.src
-+++ urt/tools/clock/makefile.src
+--- a/tools/clock/makefile.src
++++ b/tools/clock/makefile.src
 @@ -6,7 +6,7 @@ install: rleClock
  	mv rleClock ../rleClock.out
  
@@ -27,8 +27,8 @@ http://bugs.gentoo.org/126872
  
  font.c:font.src makeFont
  	chmod +x makeFont
---- urt/tools/makefile.src
-+++ urt/tools/makefile.src
+--- a/tools/makefile.src
++++ b/tools/makefile.src
 @@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h
  pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
  	$(CC) $(CFLAGS) pyrlib.c -c
@@ -64,8 +64,8 @@ http://bugs.gentoo.org/126872
  	mv $*.new $@
  
  .c.o:
---- urt/cnv/makefile.src
-+++ urt/cnv/makefile.src
+--- a/cnv/makefile.src
++++ b/cnv/makefile.src
 @@ -76,13 +76,13 @@ PBMDIR = 
  # ppmtorle - ppm format to RLE
  # rletoppm - RLE to ppm format
@@ -127,8 +127,8 @@ http://bugs.gentoo.org/126872
  	mv $*.new $@
  
  # Dependency lines.  Make sure to #ifdef them.
---- urt/cnv/rletoabA62/makefile.src
-+++ urt/cnv/rletoabA62/makefile.src
+--- a/cnv/rletoabA62/makefile.src
++++ b/cnv/rletoabA62/makefile.src
 @@ -15,7 +15,7 @@ all		:	$(PGMS)
  # Executables.  The .out will be stripped off in the install action.
  
@@ -138,8 +138,8 @@ http://bugs.gentoo.org/126872
  			  rletoabA62.o rle.o $(LIBS)
  			mv rletoabA62.new rletoabA62.out
  
---- urt/cnv/rletogif/makefile.src
-+++ urt/cnv/rletogif/makefile.src
+--- a/cnv/rletogif/makefile.src
++++ b/cnv/rletogif/makefile.src
 @@ -15,7 +15,7 @@ all:	$(PGMS)
  # The executable.  The ".out" will be stripped off in the install action.
  
diff --git a/media-libs/urt/files/urt-3.1b-compile-updates.patch b/media-libs/urt/files/urt-3.1b-compile-updates.patch
index 105f7c41f6a7..d33f004fe80f 100644
--- a/media-libs/urt/files/urt-3.1b-compile-updates.patch
+++ b/media-libs/urt/files/urt-3.1b-compile-updates.patch
@@ -1,13 +1,13 @@
---- get/getx11/XGetHClrs.c
-+++ get/getx11/XGetHClrs.c
+--- a/get/getx11/XGetHClrs.c
++++ b/get/getx11/XGetHClrs.c
 @@ -1,5 +1,4 @@
  #ifndef XLIBINT_H_NOT_AVAILABLE
 -#include <X11/copyright.h>
  
  /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */
  /* Copyright    Massachusetts Institute of Technology    1986	*/
---- tools/mallocNd.c
-+++ tools/mallocNd.c
+--- a/tools/mallocNd.c
++++ b/tools/mallocNd.c
 @@ -67,7 +67,7 @@
  
  /* Imports */
@@ -17,8 +17,8 @@
  
  /* Forward declarations */
  char *BuildIndirectionTable();
---- tools/into.c
-+++ tools/into.c
+--- a/tools/into.c
++++ b/tools/into.c
 @@ -40,8 +40,8 @@
  static char buf[MAXPATHLEN+1];
  short forceflg;				/* overwrite an unwritable file? */
@@ -39,8 +39,8 @@
  	unlink(buf);
  	exit(1);
      }
---- cnv/tex/dvirle2.c
-+++ cnv/tex/dvirle2.c
+--- a/cnv/tex/dvirle2.c
++++ b/cnv/tex/dvirle2.c
 @@ -55,7 +55,6 @@
  void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks();
  
@@ -49,8 +49,8 @@
  extern char *optarg;
  extern int optind;
  
---- cnv/wasatchrle.c
-+++ cnv/wasatchrle.c
+--- a/cnv/wasatchrle.c
++++ b/cnv/wasatchrle.c
 @@ -32,7 +32,6 @@
  #include <errno.h>
  #include "rle.h"
@@ -59,8 +59,8 @@
  
  /* "short" in our world is 16 bits.  Beware of swyte-bopping. */
  
---- get/getx11/x11_stuff.c
-+++ get/getx11/x11_stuff.c
+--- a/get/getx11/x11_stuff.c
++++ b/get/getx11/x11_stuff.c
 @@ -155,7 +155,6 @@
  			IPC_CREAT|0777 );
  	    if ( img->shm_img.shmid < 0 )
@@ -77,8 +77,8 @@
  		if ( errno == ENOSPC )
  		{
  		    if ( !no_shared_space )
---- get/qcr/qcr.h
-+++ get/qcr/qcr.h
+--- a/get/qcr/qcr.h
++++ b/get/qcr/qcr.h
 @@ -6,8 +6,6 @@
  #define GREEN 1
  #define BLUE 2
@@ -88,8 +88,8 @@
  /* Command defs for QCR-Z Film Recorder */
  
  /* These are for 8 bit Look Up Tables */
---- get/gettaac.c
-+++ get/gettaac.c
+--- a/get/gettaac.c
++++ b/get/gettaac.c
 @@ -24,6 +24,7 @@
   * Send bug fixes and improvements to:  ksp@maxwell.nde.swri.edu
   */
@@ -106,8 +106,8 @@
       struct  direct     *nameEntry;
       DIR                *dirChan;
       struct  passwd     *pwdEntry;
---- tools/clock/rleClock.c
-+++ tools/clock/rleClock.c
+--- a/tools/clock/rleClock.c
++++ b/tools/clock/rleClock.c
 @@ -598,7 +598,7 @@
      { TRUE,  "-tf", STRING, "Text area format string", 	          (char *)&FormatString }, 
      { FALSE, "-Xm", BOOL,   "Output the alpha channel on RGB",    (char *)&DebugAlpha },
@@ -117,8 +117,8 @@
  };
  
  void
---- tools/to8.c
-+++ tools/to8.c
+--- a/tools/to8.c
++++ b/tools/to8.c
 @@ -175,7 +175,7 @@
  	 * Give it a background color of black, since the real background
  	 * will be dithered anyway.
@@ -128,8 +128,8 @@
  	{
  	    out_hdr.bg_color = (int *)malloc( sizeof( int ) );
  	    RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 );
---- cnv/rletoabA62/rletoabA62.c
-+++ cnv/rletoabA62/rletoabA62.c
+--- a/cnv/rletoabA62/rletoabA62.c
++++ b/cnv/rletoabA62/rletoabA62.c
 @@ -157,7 +157,7 @@
  	exit(1);
      }
diff --git a/media-libs/urt/files/urt-3.1b-rle-fixes.patch b/media-libs/urt/files/urt-3.1b-rle-fixes.patch
index 3720806960fe..b892f0acdeee 100644
--- a/media-libs/urt/files/urt-3.1b-rle-fixes.patch
+++ b/media-libs/urt/files/urt-3.1b-rle-fixes.patch
@@ -1,7 +1,7 @@
 Fixes taken from netpbm
 
---- lib/rle_global.c
-+++ lib/rle_global.c
+--- a/lib/rle_global.c
++++ b/lib/rle_global.c
 @@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = {
      8,				/* cmaplen (log2 of length of color map) */
      NULL,			/* pointer to color map */
@@ -11,8 +11,8 @@ Fixes taken from netpbm
      { 7 },			/* RGB channels only */
      0L,				/* Can't free name and file fields. */
      "Urt",			/* Default "program name". */
---- lib/rle_hdr.c
-+++ lib/rle_hdr.c
+--- a/lib/rle_hdr.c
++++ b/lib/rle_hdr.c
 @@ -269,6 +273,9 @@
  {
      rle_hdr *ret_hdr;
@@ -23,8 +23,8 @@ Fixes taken from netpbm
      if ( the_hdr == &rle_dflt_hdr )
  	return the_hdr;
  
---- lib/dither.c
-+++ lib/dither.c
+--- a/lib/dither.c
++++ b/lib/dither.c
 @@ -38,10 +38,10 @@ void	make_square();
  #endif
  
@@ -40,8 +40,8 @@ Fixes taken from netpbm
  };
  
  /* basic dithering macro */
---- lib/rle_open_f.c
-+++ lib/rle_open_f.c
+--- a/lib/rle_open_f.c
++++ b/lib/rle_open_f.c
 @@ -9,7 +9,11 @@
   */
  
@@ -62,8 +62,8 @@ Fixes taken from netpbm
  
      /* Check args. */
      if ( *mode != 'r' && *mode != 'w' )
---- lib/rle_getcom.c
-+++ lib/rle_getcom.c
+--- a/lib/rle_getcom.c
++++ b/lib/rle_getcom.c
 @@ -53,11 +53,12 @@
  {
      for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ )
@@ -78,8 +78,8 @@ Fixes taken from netpbm
  
      return NULL;
  }
---- lib/scanargs.c
-+++ lib/scanargs.c
+--- a/lib/scanargs.c
++++ b/lib/scanargs.c
 @@ -128,10 +130,10 @@
  va_list argl;
  {
@@ -124,8 +124,8 @@ Fixes taken from netpbm
  				    if (typchr == 'N')
  					tmpflg = toupper( tmpflg );
  
---- lib/inv_cmap.c
-+++ lib/inv_cmap.c
+--- a/lib/inv_cmap.c
++++ b/lib/inv_cmap.c
 @@ -42,7 +42,7 @@
  static long cbinc, cginc, crinc;
  static unsigned long *gdp, *rdp, *cdp;
@@ -135,8 +135,8 @@ Fixes taken from netpbm
  static long x, xsqr, colormax;
  static int cindex;
  #ifdef INSTRUMENT_IT
---- lib/rle_getrow.c
-+++ lib/rle_getrow.c
+--- a/lib/rle_getrow.c
++++ b/lib/rle_getrow.c
 @@ -351,7 +351,7 @@
  	    bzero( (char *)scanline[-1] + the_hdr->xmin,
  		   the_hdr->xmax - the_hdr->xmin + 1 );
@@ -185,8 +185,8 @@ Fixes taken from netpbm
  	    if ( RLE_BIT( *the_hdr, channel ) )
  	    {
  		/* Don't fill past end of scanline! */
---- lib/rle_putcom.c
-+++ lib/rle_putcom.c
+--- a/lib/rle_putcom.c
++++ b/lib/rle_putcom.c
 @@ -53,11 +53,12 @@
  {
      for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ )
diff --git a/media-libs/urt/files/urt-3.1b-solaris.patch b/media-libs/urt/files/urt-3.1b-solaris.patch
index c1775d7e9783..739b937d8903 100644
--- a/media-libs/urt/files/urt-3.1b-solaris.patch
+++ b/media-libs/urt/files/urt-3.1b-solaris.patch
@@ -2,8 +2,8 @@ usage of errno requires errno.h
 
 Fabian Groffen <grobian@gentoo.org>
 
---- get/getx11/x11_stuff.c
-+++ get/getx11/x11_stuff.c
+--- a/get/getx11/x11_stuff.c
++++ b/get/getx11/x11_stuff.c
 @@ -42,6 +42,7 @@
  #ifdef X_SHARED_MEMORY
  #include <sys/errno.h>
diff --git a/media-libs/urt/files/urt-3.1b-tempfile.patch b/media-libs/urt/files/urt-3.1b-tempfile.patch
index 12acce151b5d..8be2793ed71c 100644
--- a/media-libs/urt/files/urt-3.1b-tempfile.patch
+++ b/media-libs/urt/files/urt-3.1b-tempfile.patch
@@ -1,5 +1,5 @@
---- tools/rlecat.c
-+++ tools/rlecat.c
+--- a/tools/rlecat.c
++++ b/tools/rlecat.c
 @@ -110,8 +110,14 @@
  	    nflag = 0;		/* Not really repeating! */
  	else