rpms/xv/EL-5 xv-3.10a-cleanup.patch, NONE, 1.1 xv-3.10a-enhancements.20070520-20081216.diff, NONE, 1.1 xv-FLmask.v2.1.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xv.desktop, 1.1, 1.2 xv.spec, 1.2, 1.3 xv-jumbo-20070520-imc.patch, 1.1, NONE

[Paul Howarth]

Author: pghmcfc

Update of /cvs/nonfree/rpms/xv/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23611/EL-5

Modified Files:
	.cvsignore sources xv.desktop xv.spec 
Added Files:
	xv-3.10a-cleanup.patch 
	xv-3.10a-enhancements.20070520-20081216.diff 
	xv-FLmask.v2.1.patch 
Removed Files:
	xv-jumbo-20070520-imc.patch 
Log Message:
Sync all active branches with devel

xv-3.10a-cleanup.patch:

--- NEW FILE xv-3.10a-cleanup.patch ---
This patch addresses a number of compiler warnings about dubious type
conversions.

Most importantly, it fixes some buffer overflow checks using
invalid constructs like this:

  int filesize = get_file_size();
  if (filesize + 256 < filesize) ...

Integer overflow operation is undefined for signed values, so this
check can legitimately be optimized out, hence losing the buffer
overflow check.

--- xv-3.10a/xvbutt.c.clean	2009-08-21 10:01:04.000000000 +0100
+++ xv-3.10a/xvbutt.c	2009-08-21 13:06:48.000000000 +0100
@@ -843,7 +843,7 @@
      int           x,y;
      unsigned int  w,h;
      const char   *title;
-     const char  * const *list;
+     const char  **list;
      int           nlist;
      unsigned long fg,bg,hi,lo;
 {
--- xv-3.10a/xvgif.c.clean	2009-08-21 10:26:28.000000000 +0100
+++ xv-3.10a/xvgif.c	2009-08-21 10:46:25.000000000 +0100
@@ -100,7 +100,7 @@
 static int   gifError    PARM((PICINFO *, const char *));
 static void  gifWarning  PARM((const char *));
 
-static int         filesize;
+static long int    filesize;
 static const char *bname;
 static byte       *dataptr;
 
@@ -140,7 +140,7 @@
   filesize = ftell(fp);
   fseek(fp, 0L, 0);
 
-  if (filesize + 256 < filesize)
+  if (filesize > (2147483647L - 256))
     return( gifError(pinfo, "GIF file size is too large") );
 
   /* the +256's are so we can read truncated GIF files without fear of
@@ -769,7 +769,7 @@
   pinfo->normw = pinfo->w;   pinfo->normh = pinfo->h;
 
   sprintf(pinfo->fullInfo,
-	  "GIF%s, %d bit%s per pixel, %sinterlaced.  (%d bytes)",
+	  "GIF%s, %d bit%s per pixel, %sinterlaced.  (%ld bytes)",
  	  (gif89) ? "89" : "87", BitsPerPixel,
 	  (BitsPerPixel==1) ? "" : "s",
  	  Interlace ? "" : "non-", filesize);
--- xv-3.10a/xv.h.clean	2009-08-21 10:01:05.000000000 +0100
+++ xv-3.10a/xv.h	2009-08-21 13:17:17.000000000 +0100
@@ -1587,7 +1595,7 @@
 
 
 void   MBCreate            PARM((MBUTT *, Window, int, int, u_int, u_int,
-				 const char *, const char * const *, int,
+				 const char *, const char **, int,
 				 u_long, u_long, u_long, u_long));
 
 void   MBRedraw            PARM((MBUTT *));
--- xv-3.10a/xvsunras.c.clean	2009-08-21 10:01:04.000000000 +0100
+++ xv-3.10a/xvsunras.c	2009-08-21 13:01:07.000000000 +0100
@@ -54,7 +54,7 @@
      PICINFO *pinfo;
 {
   FILE	*fp;
-  int	 linesize,lsize,csize,isize,i,w,h,d,npixels,nbytes;
+  unsigned int	 linesize,lsize,csize,isize,i,w,h,d,npixels,nbytes;
   byte	 *image, *line;
   struct rasterfile sunheader;
   const char *bname;
--- xv-3.10a/xvwbmp.c.clean	2009-08-21 12:57:13.000000000 +0100
+++ xv-3.10a/xvwbmp.c	2009-08-21 12:58:38.000000000 +0100
@@ -75,7 +75,7 @@
     int im_type;	/* image type (only type 0 supported) */
     uint8 fix_header;	/* fixed header field */
     int width, height;
-    int npixels, raw_size, aux;
+    unsigned int npixels, raw_size, aux;
     uint8 * raw;
 
     st_fname = fname;

xv-3.10a-enhancements.20070520-20081216.diff:

--- NEW FILE xv-3.10a-enhancements.20070520-20081216.diff ---
  20070621
    fixed improper ClearCode termination condition in GIF decoder (JZ); fixed
    some minor inconsistencies in Makefile (GRR)
        - xv-joe-zbiciak-20070621-gif-decoder-bugfix.dif

  20080121
    removed duplicate "XDestroyWindow(theDisp, pngW);" in xvmisc.c (IMC); fixed
    empty-filename click-and-crash bug in xvdir.c (IMC, DB)
        - xv-ian-collier-20080118-crash-fixes.msg
        - xv-david-bath-20080901-empty-filename-save-crash-fix.dif

  20081205
    reverted xvxwd.c to SJT's version (bug reported by Jari Ruusu)

  20081216
    fixed crash-bug in IFF decoder (EP)
        - xv-elmar-plischke-20081216-xviff-crash-fix.dif



diff -ru ../test3.20070520.stock/xv-3.10a/xv.h ./xv.h
--- ../test3.20070520.stock/xv-3.10a/xv.h	2007-05-20 22:23:33.000000000 -0700
+++ ./xv.h	2008-12-16 09:45:00.000000000 -0800
@@ -16,8 +16,9 @@
 /* GRR 2nd public jumbo F+E patches:	20050410 */
 /* GRR 3rd public jumbo F+E patches:	20050501 */
 /* GRR 4th public jumbo F+E patch:  	20070520 */
-#define REVDATE   "version 3.10a-jumboFix+Enh of 20070520"
-#define VERSTR    "3.10a-20070520"
+/* GRR 5th public jumbo F+E patch:  	200xxxxx (probably mid-2009) */
+#define REVDATE   "version 3.10a-jumboFix+Enh of 20081216 (interim!)"
+#define VERSTR    "3.10a-20081216"
 
 /*
  * uncomment the following, and modify for your site, but only if you've



diff -ru ../test3.20070520.stock/xv-3.10a/xvdir.c ./xvdir.c
--- ../test3.20070520.stock/xv-3.10a/xvdir.c	2007-05-20 22:23:33.000000000 -0700
+++ ./xvdir.c	2008-01-21 13:02:38.000000000 -0800
@@ -539,8 +539,9 @@
     return -1;
   }
 
-  /* handle clicks inside the filename box */
-  if (x > 80 &&
+  /* handle clicks inside the filename box, but only when box is not empty */
+  if (enPos > stPos &&
+      x > 80 &&
       y > dList.y + (int) dList.h + 30 &&
       x < 80 + DNAMWIDE+6 &&
       y < dList.y + (int) dList.h + 30 + LINEHIGH+5) {



diff -ru ../test3.20070520.stock/xv-3.10a/xvgif.c ./xvgif.c
--- ../test3.20070520.stock/xv-3.10a/xvgif.c	2007-05-20 22:23:33.000000000 -0700
+++ ./xvgif.c	2007-06-21 09:36:40.000000000 -0700
@@ -700,7 +700,7 @@
        * associated output code on the output queue.
        */
 
-      while (CurCode > BitMask) {
+      while (CurCode >= ClearCode) {  /* Joe Zbiciak fix, 20070621 */
 	if (OutCount > 4096) break;   /* corrupt file */
 	OutCode[OutCount++] = Suffix[CurCode];
 	CurCode = Prefix[CurCode];



diff -ru ../test3.20070520.stock/xv-3.10a/xvmisc.c ./xvmisc.c
--- ../test3.20070520.stock/xv-3.10a/xvmisc.c	2007-05-20 22:23:33.000000000 -0700
+++ ./xvmisc.c	2008-01-21 12:57:29.000000000 -0800
@@ -561,10 +561,6 @@
     if (mgcsfxW) XDestroyWindow(theDisp, mgcsfxW);
 #endif
 
-#ifdef HAVE_PNG
-    if (pngW)  XDestroyWindow(theDisp, pngW);
-#endif
-
     /* if NOT using stdcmap for images, free stdcmap */
     if (colorMapMode != CM_STDCMAP) {
       int j;



[This one reverts xvxwd.c to the pre-2007 SJT version, which actually worked...]

diff -ru ../test3.20070520.stock/xv-3.10a/xvxwd.c ./xvxwd.c
--- ../test3.20070520.stock/xv-3.10a/xvxwd.c	2007-05-20 22:23:33.000000000 -0700
+++ ./xvxwd.c	2008-12-06 00:30:44.000000000 -0800
@@ -19,6 +19,12 @@
  */
 
 #include "xv.h"
+#include <limits.h>             /* for CHAR_BIT */
+
+/* SJT: just in case ... */
+#ifndef CHAR_BIT
+#  define CHAR_BIT 8
+#endif
 
 
 /***************************** x11wd.h *****************************/
@@ -83,9 +89,14 @@
 static int    writebiglong    PARM((FILE *, CARD32));
 #endif
 
+static void   getcolorshift   PARM((CARD32, int *, int *)); /* SJT */
+
+/* SJT: for 16bpp and 24bpp shifts */
+static int    red_shift_right, red_justify_left,
+              grn_shift_right, grn_justify_left,
+              blu_shift_right, blu_justify_left;
 static byte  *pic8, *pic24;
-static CARD32 red_mask, green_mask, blue_mask;
-static int    red_shift, green_shift, blue_shift;
+static CARD32 red_mask, grn_mask, blu_mask;
 static int    bits_per_item, bits_used, bit_shift,
               bits_per_pixel, bits_per_rgb;
 static char   buf[4];
@@ -189,38 +200,34 @@
       return 0;
     }
 
-    switch (bits_per_pixel) {
-    case 16:
-    case 24:
-    case 32:
-      ;
-    default:
-      xwdError("True/Direct supports only 16, 24, and 32 bits");
-      return 0;
-    }
+    for (row=0; row<rows; row++) {
+      for (col=0, xP=pic24+(row*cols*3); col<cols; col++) {
+	CARD32 ul;
 
-    if (byte_order == MSBFirst) {
-      for (row=0; row<rows; row++) {
-        for (col=0, xP=pic24+(row*cols*3); col<cols; col++) {
-          register CARD32 ul = getpixnum(ifp);
-
-          *xP++ = ul >> red_shift   & red_mask  ;
-          *xP++ = ul >> green_shift & green_mask;
-          *xP++ = ul >> blue_shift  & blue_mask ;
-        };
-        for (col=0; col<padright; col++) getpixnum(ifp);
-      }
-    } else {
-      for (row=0; row<rows; row++) {
-        for (col=0, xP=pic24+(row*cols*3); col<cols; col++) {
-          register CARD32 ul = getpixnum(ifp);
-
-          *xP++ = ul >> blue_shift  & blue_mask ;
-          *xP++ = ul >> green_shift & green_mask;
-          *xP++ = ul >> red_shift   & red_mask  ;
-        };
-        for (col=0; col<padright; col++) getpixnum(ifp);
+	ul = getpixnum(ifp);
+	switch (bits_per_pixel) {
+        case 16:
+        case 24:
+        case 32:
+          /* SJT: shift all the way to the right and then shift left. The
+             pairs of shifts could be combined. There will be two right and
+             one left shift, but it's unknown which will be which. It seems
+             easier to do the shifts (which might be 0) separately than to
+             have a complex set of tests. I believe this is independent of
+             byte order but I have no way to test.
+           */
+          *xP++ = ((ul & red_mask) >> red_shift_right) << red_justify_left;
+          *xP++ = ((ul & grn_mask) >> grn_shift_right) << grn_justify_left;
+          *xP++ = ((ul & blu_mask) >> blu_shift_right) << blu_justify_left;
+          break;
+
+	default:
+	  xwdError("True/Direct supports only 16, 24, and 32 bits");
+	  return 0;
+	}
       }
+
+      for (col=0; col<padright; col++) getpixnum(ifp);
     }
 
     pinfo->type = PIC24;
@@ -445,28 +452,18 @@
      (i.e., 3 bytes, no alpha/padding) */
 
 
-  bits_used      = bits_per_item;
+  bits_used  = bits_per_item;
 
   if (bits_per_pixel == sizeof(pixel_mask) * 8)  pixel_mask = (CARD32) -1;
   else pixel_mask = (1 << bits_per_pixel) - 1;
 
-  red_mask   = h11P->red_mask;
-  green_mask = h11P->grn_mask;
-  blue_mask  = h11P->blu_mask;
-
-  red_shift = blue_shift = green_shift = 0;
-  while (!(red_mask & 1)) {
-    red_mask >>= 1;
-    ++red_shift;
-  }
-  while (!(blue_mask & 1)) {
-    blue_mask >>= 1;
-    ++blue_shift;
-  }
-  while (!(green_mask & 1)) {
-    green_mask >>= 1;
-    ++green_shift;
-  }
+  red_mask = h11P->red_mask;
+  grn_mask = h11P->grn_mask;
+  blu_mask = h11P->blu_mask;
+
+  getcolorshift(red_mask, &red_shift_right, &red_justify_left);
+  getcolorshift(grn_mask, &grn_shift_right, &grn_justify_left);
+  getcolorshift(blu_mask, &blu_shift_right, &blu_justify_left);
 
   byteP  = (char   *) buf;
   shortP = (CARD16 *) buf;
@@ -476,6 +473,45 @@
 }
 
 
+/* SJT: figure out the proper shifts */
+static void getcolorshift (CARD32 mask, int *rightshift, int *leftshift)
+{
+  int lshift, rshift;
+  unsigned int uu;
+
+  if (mask == 0)
+  {
+    *rightshift = *leftshift = 0;
+    return;
+  }
+
+  uu = mask;
+  lshift = rshift = 0;
+  while ((uu & 0xf) == 0)
+  {
+      rshift += 4;
+      uu >>= 4;
+  }
+  while ((uu & 1) == 0)
+  {
+      rshift++;
+      uu >>= 1;
+  }
+
+  while (uu != 0)
+  {
+      if (uu & 1)
+      {
+          lshift++;
+          uu >>= 1;
+      }
+  }
+  *rightshift = rshift;
+  *leftshift = CHAR_BIT * sizeof(pixel) - lshift;
+  return;
+}
+
+
 /******************************/
 static CARD32 getpixnum(file)
      FILE* file;



diff -ru ../test3.20070520.stock/xv-3.10a/xviff.c ./xviff.c
--- ../test3.20070520.stock/xv-3.10a/xviff.c	2007-05-13 17:50:59.000000000 -0700
+++ ./xviff.c	2008-12-16 09:20:25.000000000 -0800
@@ -73,6 +73,7 @@
   int           BMHDok, CMAPok, CAMGok;
   int           bmhd_width, bmhd_height, bmhd_bitplanes, bmhd_transcol;
   int           i, j, k, lineskip, colors, fmt;
+  int           npixels = 0; /* needs to be initialized _outside_ while-loop */
   byte          bmhd_masking, bmhd_compression;
   long          chunkLen, camg_viewmode;
   byte          *databuf, *dataptr, *cmapptr, *picptr, *pic, *bodyptr;
@@ -138,7 +139,6 @@
      BODY chunk was found or dataptr ran over end of file */
 
   while ((rv<0) && (dataptr < (databuf + filesize))) {
-    int npixels = 0;
     chunkLen = (iff_getlong(dataptr + 4) + 1) & 0xfffffffe; /* make even */
 
     if (strncmp((char *) dataptr, "BMHD", (size_t) 4)==0) { /* BMHD chunk? */

xv-FLmask.v2.1.patch:

--- NEW FILE xv-FLmask.v2.1.patch ---
diff -c --new-file xv-3.10a.org/00_README xv+flmask/00_README
*** xv-3.10a.org/00_README	Sun Sep 14 02:29:10 1997
--- xv+flmask/00_README	Sun Sep 14 03:18:49 1997
***************
*** 0 ****
--- 1,101 ----
+ 
+ 	       XV+FLmask version 2.1.
+ 
+ 	   	     97.09.14.
+ 	     matu at alice.lb.u-tokai.ac.jp.
+                   ¤Þ¤Ä¤à¤é¤·¤²¤ë¡£¡£
+ 
+ 
+ [¤³¤Î¥Ñ¥Ã¥Á¤Ï²¿?]
+ 	¤Ê¤ó¤À¤í¤¦¡£¤Ê¤Ë¤«¤·¤é¡£
+ 	¤­¤Ã¤Èµ¤¤Þ¤°¤ì¤Çºî¤é¤ì¤¿¤â¤Î¤Ç¤¹¡£(^^)
+ 
+ 
+ [¤³¤Î¥¢¡¼¥«¥¤¥Ö¤¬´Þ¤à¤â¤Î]
+ 	README 			¤³¤Î¥Õ¥¡¥¤¥ë¡£
+ 	XV+FLmask.v2.1.patch	¥Ñ¥Ã¥Á¡£
+ 
+ 
+ [ºî¤êÊý]
+ 	(1)¤Þ¤º¡¢ºàÎÁ¤ò½¸¤á¤Þ¤·¤ç¤¦¡£
+ 		xv-3.10a.tar.gz
+ 		libjpeg-6a.tar.gz
+ 		xv310a-jp-extension-rev5.3.3.tar.gz
+ 
+ 	(2)¤³¤ì¤é¤Ë¡¢
+ 		XV+FLmask.v2.1.patch
+ 	   ¤ò²Ã¤¨¤Æ¤°¤Ä¤°¤Ä¼Ñ¹þ¤ß¤Þ¤·¤ç¤¦¡£(jvimÉ÷¡£)
+ 
+ 	(3)°Ê¾å¡£(¤³¤ì¤À¤±¡Ë
+ 
+ 
+ [»ÈÍѤˤ¢¤¿¤Ã¤Æ]
+ 	FLmask menu ¤È Mask button ¤¬Áý¤¨¤Æ¤¤¤ë¤À¤±¤Ç¤¹¡£
+ 	Æñ¤·¤¤¤È¤³¤í¤Ï̵¤¤¤Ç¤·¤ç¤¦¡£
+ 	Mask button ¤Ï¾å¼ê¤Ë»È¤¦¤ÈÊØÍø¤Ç¤¹¡£
+ 
+ 
+ [·Ù¹ð]
+ 	¤³¤Î patch ¤Ï¤¢¤Ê¤¿¼«¿È¤ÎÀÕǤ¤Î¤â¤È¤Ë»ÈÍѤ·¤Æ²¼
+ 	¤µ¤¤¡£¤â¤·¡¢¤³¤Î patch ¤ò»ÈÍѤ¹¤ë»ö¤Ë¤è¤Ã¤Æ¡¢¤¢
+ 	¤Ê¤¿¤Î HDD ¤Î data ¤¬Á´Éô¾Ã¤¨¤Æ¤·¤Þ¤Ã¤¿¤ê¡¢¥Ï¡¼
+ 	¥É¥¦¥§¥¢¤¬¥À¥á¡¼¥¸¤ò¼õ¤±¤¿¤ê¡¢¤¢¤Ê¤¿¤Î¸¤¤¬»à¤ó¤Ç
+ 	¤·¤Þ¤Ã¤Æ¤â¡¢ÅöÊý¤Ï°ìÀÚ´ØÃΤ·¤Þ¤»¤ó¡£(mgettyÉ÷¡£)
+ 
+ 
+ [Æ°ºî´Ä¶­]
+ 	³«È¯´Ä¶­¤Ï Linux-2.0.30 ¤Ç¤¹¤¬¡¢¤¿¤Ö¤ó original 
+ 	¤Î xv ¤¬Æ°¤¯´Ä¶­¤Ç¤¢¤ì¤ÐÌäÂê̵¤¯Æ°¤¯¤Ç¤·¤ç¤¦¡£
+ 	(¤¿¤Ö¤ó)
+ 
+ 
+ [¤½¤Î¾]
+ 	¤³¤Î¥Ñ¥Ã¥Á¤Ï¥·¥§¥¢¥¦¥¨¥¢¤Ç¤¹¡£
+ 	500±ßÌé¡£ÉÏ˳¤Ê³ØÀ¸¤Ê¤Î¤Ç¡¢free ¤Ë¤·¤Þ¤»¤ó¤Ç¤·¤¿¡£
+ 	Ʊ¤¸¤¯À¸³è¤Î¶ì¤·¤¤Êý¤Ï¡¢ÌȽüÃפ·¤Þ¤¹¡£¡£
+ 	¤½¤Î¾¡¢ software ¤Î¼«Í³¤ÊÇÛÉÕ¤¬¤¦¤ó¤¿¤é¤«¤ó¤¿¤é
+ 	¤Ç¤É¤¦¤È¤«¤³¤¦¤È¤«¸À¤¦¿Í¤âʧ¤ï¤Ê¤¯¤Æ¤âÎɤ¤¤Ç¤¹¡£¡£
+ 	                                           (^^;;;
+ 
+ 	¤¤¤Ä¤ÎÆü¤«¤¦¤Á¤Ë¤âP¤«¤é»Ï¤Þ¤ëCPU¤òƳÆþ¤¹¤ë»ö¤òÌ´
+ 	¸«¤Æ¡£¡£(K¤Ç¤â¤è¤¤¡£D¤Ï¤â¤¦¤¤¤ä¡£¡£)
+ 
+ 	ËÜÅö¤Ë»Ùʧ¤Ã¤Æ¤¯¤ì¤ëÊý¤Ï
+ 		E-mail: matu at alice.lb.u-tokai.ac.jp
+ 	¤Þ¤Ç Mail ¤·¤Æ²¼¤µ¤¤¡£(^^)
+ 
+ 
+ 	ÉÔ¶ñ¹ç¤ä, Í×µá, ´¶Áۤʤɤʤó¤Ç¤â, ¾å¤Î¥¢¥É¥ì¥¹¤Þ¤Ç
+ 	¤ª´ê¤¤¤·¤Þ¤¹¡£
+ 	(v2.0 ¤Î»þ mail Á÷¤Ã¤Æ²¼¤µ¤Ã¤¿Âô»³¤ÎÊý¡¢Í­Æñ¤¦¤´¤¶
+ 	¤¤¤Þ¤¹¡£¸æ°Õ¸«È¿±Ç¤Ç¤­¤ë¤è¤¦ÅØÎϤ·¤Æ¤ß¤Þ¤¹¡£¡£)
+ 
+ 
+ 	¤Þ¤¿¡ÖXV+FLmask Home Page.¡×
+ 	http://www.lb.u-tokai.ac.jp/~matu/flmask/
+ 	¤Ë¤Æ Version UP ¤Î¤ªÃΤ餻Åù¤¬¤¢¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
+ 
+ 
+ [¼Õ¼­]
+ 	¤³¤Î¥Ñ¥Ã¥Á¥­¥Ã¥È¤òºîÀ®¤¹¤ë¤Ë¤¢¤¿¤Ã¤Æ¡¢°Ê²¼¤ÎÊý¡¹
+ 	¤Î¸æ¶¨ÎϤòÆÀ¤Þ¤·¤¿¡£ ¿´¤è¤ê´¶¼ÕÃפ·¤Þ¤¹¡£
+ 
+ 	  o Gmask ¤Îºî¼Ô¤Î¸Å¹Â ¹ä ÍÍ¡£
+ 	  o ¤¢¤Î¿Í¡£
+ 	  o ¤³¤Î¿Í¡£
+ 	  o ¤½¤Î¾¡£
+ 
+ 
+ --
+ o `XV'¤Ï, X Window System¾å¤Î²èÁüɽ¼¨¥×¥í¥°¥é¥à¤Ç¤¹.
+    XV is Copyright 1989, 1994 by John Bradley.
+    X Window System is a trademark of X Consortium, Inc.
+ o MEKOMASK ¤Ï ¸Þ½½Íò ÍÎÆ󤵤óºî¤Î¥Þ¥¹¥¯¥Ä¡¼¥ë¡£
+ o WINMASK  ¤Ï ³°Â¼ ¹â¾Ï¤µ¤óºî¤Î¥Þ¥¹¥¯¥Ä¡¼¥ë¡£
+ o FLMASK   ¤Ï £Çenesis ¤µ¤óºî¤Î¥Þ¥¹¥¯¥Ä¡¼¥ë¡£
+ o CPMASK   ¤Ï ÆâÌ¤ó¤È£Çenesis ¤µ¤ó¹çºî¤Î¥Þ¥¹¥¯µ»Ë¡¡£
+ o Gmask    ¤Ï ¸Å¹Â¹ä¤µ¤ó¤Î¥Þ¥¹¥¯¥Ä¡¼¥ë¡£
+ 
+ (jp-extensionÉ÷¤Î README)
+ 
+ 
diff -c --new-file xv-3.10a.org/CPMASK xv+flmask/CPMASK
*** xv-3.10a.org/CPMASK	Sun Sep 14 02:29:10 1997
--- xv+flmask/CPMASK	Sun Sep 14 03:18:49 1997
***************
*** 0 ****
--- 1,21 ----
+ [CPMASK¤Ë¤Ä¤¤¤Æ]
+ 	¤³¤Î patch ¤Ë¤è¤Ã¤Æ¤«¤±¤é¤ì¤¿ CPmask ¤Ï FLMASK ¥×¥í¥°¥é¥àÅù
+ 	¤Ç¤«¤±¤¿¤â¤Î¤È¤Ï°ã¤¤file ¤Ë passwd ¤Î¾ðÊó¤ò»Ä¤·¤Þ¤»¤ó¡£
+ 
+ 	xv ¤Ï jpeg file ¤ò save ¤¹¤ë»þ¤Ë
+ 	¡ÖCREATOR: XV Version 3.10a Rev: 12/29/94 Quality = 75, 
+ 	  Smoothing = 0¡×
+ 	¤È¤¤¤¦¤è¤¦¤Ê¾ðÊó¤ò²Ã¤¨¤Þ¤¹¡£
+ 
+ 	CPmask ¤Ï¤³¤ÎÉôʬ¤Ë¤³¤Ã¤½¤êpasswd¾ðÊó¤ò½ñ¤­¹þ¤à¤Î¤Ç¤¹¤¬¡¢¤³
+ 	¤ì¤¬¸¶°ø¤Ç CPmask ¤Î¤«¤±¤é¤ì¤¿ file ¤ò xv ¤ÇÆɤ߹þ¤ó¤Ç¤½¤Î
+ 	¤Þ¤Þ save ¤·¤Ê¤ª¤¹¤È passwd ¤òÄ´¤Ù¤ë tool ¤È¤«¤ÇȽÄê¤Ç¤­¤Ê¤¤
+ 	file ¤¬½ÐÍè¾å¤¬¤ë¤ï¤±¤Ç¤¹¡£
+ 
+ 	¤½¤Î¤¿¤á¤Ë¡¢Á°¤Î version ¤Ç¤Ï CPmask ¤¬¤«¤±¤é¤ì¤Æ¤¤¤Ê¤¤ file
+ 	¤Î¾ì¹ç¤Ï error pop up ¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¤¤¿¤Î¤Ç¤¹¤¬¡¢ÉÔÊؤǤ¢¤ë
+ 	¤È¤Î mail ¤òÂô»³¼õ¤±¤¿¤Î¤ÇÊѤ¨¤ë¤³¤È¤Ë¤·¤Þ¤·¤¿¡£
+ 
+ 	¤Ç¤¹¤«¤é¡¢¤³¤Î patch ¤Ç¤Ï¿·¤·¤¯ CPmask ¤ò¤«¤±¤º¤Ë¡¢¤Ï¤º¤¹¤À
+ 	¤±¤Ë¤·¤Æ²¼¤µ¤¤¡£
+ 
diff -c --new-file xv-3.10a.org/Makefile xv+flmask/Makefile
*** xv-3.10a.org/Makefile	Sun Sep 14 02:29:10 1997
--- xv+flmask/Makefile	Sun Sep 14 03:18:49 1997
***************
*** 209,214 ****
--- 209,215 ----
  
  OBJS = 	xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \
  	xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \
+ 	xvmask.o xvcpmask.o xvmeko.o \
  	xvgifwr.o xvdir.o xvbutt.o xvpbm.o xvxbm.o xvgam.o xvbmp.o \
  	xvdial.o xvgraf.o xvsunras.o xvjpeg.o xvps.o xvpopup.o xvdflt.o \
  	xvtiff.o xvtiffwr.o xvpds.o xvrle.o xviris.o xvgrab.o vprintf.o \
diff -c --new-file xv-3.10a.org/Imakefile xv+flmask/Imakefile
*** xv-3.10a.org/Imakefile	Sun Sep 14 02:29:10 1997
--- xv+flmask/Imakefile	Sun Sep 14 03:18:49 1997
***************
*** 160,165 ****
--- 160,166 ----
  
  SRCS1 =	xv.c xvevent.c xvroot.c xvmisc.c xvimage.c xvcolor.c xvsmooth.c \
  	xv24to8.c xvgif.c xvpm.c xvinfo.c xvctrl.c xvscrl.c xvalg.c \
+ 	xvmask.c xvcpmask.c xvmeko.c \
  	xvgifwr.c xvdir.c xvbutt.c xvpbm.c xvxbm.c xvgam.c xvbmp.c \
  	xvdial.c xvgraf.c xvsunras.c xvjpeg.c xvps.c xvpopup.c xvdflt.c \
  	xvtiff.c xvtiffwr.c xvpds.c xvrle.c xviris.c xvgrab.c vprintf.c \
***************
*** 170,175 ****
--- 171,177 ----
  
  OBJS1 =	xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \
  	xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \
+ 	xvmask.o xvcpmask.o xvmeko.o \
  	xvgifwr.o xvdir.o xvbutt.o xvpbm.o xvxbm.o xvgam.o xvbmp.o \
  	xvdial.o xvgraf.o xvsunras.o xvjpeg.o xvps.o xvpopup.o xvdflt.o \
  	xvtiff.o xvtiffwr.o xvpds.o xvrle.o xviris.o xvgrab.o vprintf.o \
diff -c --new-file xv-3.10a.org/xv.h xv+flmask/xv.h
*** xv-3.10a.org/xv.h	Sun Sep 14 02:29:12 1997
--- xv+flmask/xv.h	Sun Sep 14 06:50:03 1997
***************
*** 17,24 ****
  /* GRR 3rd public jumbo F+E patches:	20050501 */
  /* GRR 4th public jumbo F+E patch:  	20070520 */
  /* GRR 5th public jumbo F+E patch:  	200xxxxx (probably mid-2009) */
! #define REVDATE   "version 3.10a-jumboFix+Enh of 20081216 (interim!)"
! #define VERSTR    "3.10a-20081216"
  
  /*
   * uncomment the following, and modify for your site, but only if you've
--- 17,25 ----
  /* GRR 3rd public jumbo F+E patches:	20050501 */
  /* GRR 4th public jumbo F+E patch:  	20070520 */
  /* GRR 5th public jumbo F+E patch:  	200xxxxx (probably mid-2009) */
! /* FLMask 2.1 (modified) patch:		20090820 */
! #define REVDATE   "version 3.10a-jumboFix+Enh of 20081216 (interim!)+FLmask"
! #define VERSTR    "3.10a-20081216+FLmask"
  
  /*
   * uncomment the following, and modify for your site, but only if you've
***************
*** 487,496 ****
  #define BCROP    19
  #define BUNCROP  20
  #define BACROP   21
! #define BABOUT   22
[...2331 lines suppressed...]
+     0x183D,0x1A41,0x22DD,0x21F1,0x103C,0x14BC,0x0827,0x0850,0x157D,0x02BD,
+     0x03BF,0x00DE,0x0C9E,0x1CB7,0x1BF8,0x0805,0x20A8,0x1DA1,0x1F50,0x1DA0,
+     0x0DA0,0x068E,0x1979,0x0650,0x1F52,0x2239,0x0594,0x1534,0x1C38,0x0351,
+     0x0DE3,0x1672,0x21E3,0x10AB,0x11BC,0x1788,0x1547,0x2071,0x07DE,0x012F,
+     0x22AF,0x2377,0x179A,0x12B3,0x0CF3,0x0B92,0x0BB7,0x070F,0x11CA,0x2039,
+     0x0DAA,0x1521,0x0278,0x0F4D,0x0C87,0x0956,0x0967,0x067E,0x08B0,0x11AF,
+     0x051F,0x099E,0x0C78,0x0E27,0x19BD,0x1DCC,0x15F1,0x01F5,0x1453,0x043E,
+     0x1E8C,0x018F,0x1B54,0x2166,0x1BBC,0x1FE8,0x059A,0x0C6B,0x00C7,0x1E92,
+     0x13DE,0x0B3B,0x05E4,0x15EE,0x22A9,0x2090,0x2276,0x0631,0x105D,0x2038,
+     0x195A,0x17E5,0x1AFF,0x10A8,0x0384,0x0886,0x0456,0x1599,0x0B4E,0x1D47,
+     0x1830,0x051E,0x1C3D,0x20E1,0x1895,0x2092,0x10E9,0x07C6,0x23BD,0x201A,
+     0x209A,0x04C4,0x0315,0x019B,0x237C,0x047A,0x23FC,0x11A6,0x195F,0x2006,
+     0x1328,0x1CCE,0x1DEA,0x0970,0x0067,0x058D,0x1934,0x2120,0x01C5,0x2263,
+     0x04FD,0x1AE1,0x125E,0x1CA0,0x19BC,0x226E,0x0734,0x0BB8,0x0A54,0x19FE,
+     0x0E85,0x1FC6,0x0224,0x171C,0x1FFB,0x1115,0x0524,0x133E,0x0EDD,0x2280,
+     0x1D2F,0x0200,0x0CB3,0x23FE,0x0F19,0x1569,0x1537,0x19C2,0x08DC,0x1F6D,
+     0x068D,0x10F4,0x055A,0x1E30,0x21F0,0x1CF5,0x0D35,0x04A6,0x139D,0x23D3,
+     0x0A8D,0x1D3D,0x0763,0x0575,0x1511,0x1676,0x1304,0x0E13,0x10CD,0x0E55,
+     0x199E,0x236E,0x1257,0x2288,0x13E5,0x0037,0x1D04,0x04EF,0x100E,0x0FAE,
+     0x1E9E,0x067A,0x2320,0x0539,0x21D8,0x07C4,0x045F,0x1D0B,0x1196,0x020E,
+     0x1B68,0x04B5,0x031C,0x00FD,0x1184,0x0F7C,0x166C,0x23D2,0x0C9F,0x2380,
+     0x0B78,0x0F14,0x18F0,0x05AD,0x0252,0x138A,0x13FA,0x1A93,0x1F01,0x126A,
+     0x1D6A,0x11D9,0x182F,0x1492,0x1822,0x0D54,0x16E2,0x05D1,0x1155,0x0C4A,
+     0x1F58,0x00A3,0x17E0,0x0CD6,0x1D43,0x0250,0x16F3,0x0CFB,0x0C29,0x0B86,
+     0x11A4,0x1ED7,0x14FC,0x10D8,0x0F59,0x2338,0x1C5A,0x0F42,0x142D,0x12FD,
+     0x2373,0x11CE,0x0800,0x23E0,0x2025,0x0FFD,0x0A99,0x2264,0x1FF7,0x04A9,
+     0x1A67,0x1ED4,0x0BE2,0x21F3,0x1DF4,0x1927,0x04A4,0x1C84,0x0B09,0x11B9,
+     0x21A0,0x1D7B,0x1EF7,0x006F,0x18C6,0x1478,0x0985,0x1E23,0x0039,0x1EBC,
+     0x13D2,0x0391,0x039C,0x0118,0x1061,0x21C8,0x1A40,0x1EAA,0x175B,0x036C,
+     0x204F,0x19BA,0x1F91,0x193A,0x197B,0x0F24,0x176F,0x1592,0x0854,0x0804,
+     0x0FD4,0x0A2B,0x16FE,0x0D64,0x0587,0x1F00,0x1539,0x203C,0x1E54,0x01B4,
+     0x02E6,0x1B11,0x0A98,0x157C,0x1868,0x0786,0x15C8,0x083C,0x0F84,0x1209,
+     0x0B47,0x0F1C,0x0D77,0x188C,0x06C7,0x0521,0x203E,0x1921,0x0996,0x2020,
+     0x1E5D,0x12CE,0x0940,0x0309,0x1991,0x12A7,0x1E77,0x0830,0x1B94,0x1C73,
+     0x02C4,0x1D86,0x0F0F,0x192B,0x0BFC,0x1451,0x1969,0x09F1,0x010C,0x1865,
+     0x09C6,0x1AE8,0x17B7,0x21F8,0x14A1,0x21F6,0x07D7,0x0C36,0x1CB4,0x1883,
+     0x1655,0x1DDF,0x0863,0x00F0,0x0961,0x0687,0x1070,0x0FE5,0x072F,0x0BC2,
+     0x08C8,0x1AAA,0x0645,0x09CF,0x0FA8,0x2130,0x23CF,0x2246,0x1990,0x1744,
+     0x0D4B,0x0090,0x143F,0x166F,0x1DE5,0x0331,0x09CD,0x1447,0x1CEB,0x0D3B,
+     0x0CCD,0x2159,0x0F78,0x0251,0x068F,0x07BB,0x0877,0x1A2A,0x0700,0x23C2,
+     0x08A2,0x1C98,0x1427,0x0E79,0x15AC,0x0F8B,0x153A,0x0AEC,0x0DEC,0x03EE,
+     0x1AE2,0x1F6B,0x13F4,0x1EFA,0x172F,0x1C87,0x1B3F,0x192A,0x1C53,0x1BB1,
+     0x0297,0x0772,0x1385,0x173D,0x0707,0x17BD,0x007D,0x1A07,0x08C6,0x1D6F,
+     0x09D8,0x1850,0x1C8B,0x180D,0x1CB1,0x148A,0x0492,0x0847,0x0D78,0x0DEF,
+     0x0E7E,0x1D3A,0x0E91,0x1888,0x1C59,0x1AE7,0x1FC1,0x154C,0x058C,0x0078,
+     0x22BA,0x225B,0x0F5E,0x1A4C,0x0D3E,0x195D,0x06DF,0x02A7,0x14E5,0x0CFC,
+     0x16EE,0x0F7D,0x0321,0x178A,0x1097,0x0E0B,0x1479,0x079D,0x1C5B,0x1208,
+     0x0B1F,0x0D7C,0x1963,0x0835,0x1C99,0x2226,0x1417,0x045E,0x18E0,0x0051,
+     0x1243,0x181E,0x0659,0x172A,0x1373,0x1ABD,0x1F0C,0x1749,0x113A,0x06ED,
+     0x09A6,0x027F,0x015D,0x1084,0x022E,0x1A5B,0x1685,0x1D1B,0x0054,0x0FB3,
+     0x20CC,0x23A9,0x220B,0x045A,0x1B24,0x2145,0x148B,0x18EC,0x16BC,0x0B9B,
+     0x120C,0x18B0,0x02E3,0x1A1D,0x0BE7,0x133D,0x0DE1,0x21D4,0x0357,0x1715,
+     0x20A2,0x0A18,0x239D,0x22D6,0x0CD5,0x1942,0x16E9,0x0E54,0x1007,0x069D,
+     0x1CB8,0x12DC,0x0381,0x0C93,0x1EFF,0x04E4,0x1C25,0x1FE7,0x20C1,0x0412,
+     0x0215,0x1594,0x1BC5,0x217E,0x221C,0x173A,0x1F19,0x1183,0x0765,0x20F8,
+     0x05F2,0x130A,0x036D,0x012E,0x06EA,0x0B3C,0x1C42,0x1F43,0x0A95,0x1B8C,
+     0x1F36,0x0622,0x04DA,0x2070,0x089E,0x04D4,0x184E,0x1520,0x1CC8,0x127B,
+     0x1302,0x13D0,0x0626,0x0429,0x004A,0x18C0,0x2144,0x0A34,0x1AEA,0x1212,
+     0x12A2,0x06D2,0x0751,0x1D2B,0x104A,0x133A,0x1E80,0x12F6,0x1C9E,0x1460,
+     0x13BA,0x16D9,0x1648,0x1E3A,0x1B29,0x0592,0x11BA,0x1D0E,0x0153,0x0ADB,
+     0x15C3,0x1507,0x17FC,0x122C,0x14D7,0x21AD,0x1A53,0x14F2,0x16DC,0x20F1,
+     0x118E,0x1AAB,0x04EB,0x0606,0x0D05,0x170E,0x05D9,0x0A83,0x10F7,0x070B,
+     0x04F8,0x0B27,0x2224,0x0F97,0x075E,0x180E,0x2194,0x010E,0x0B57,0x1A80,
+     0x1610,0x1B19,0x1BAC,0x0B30,0x0376,0x1697,0x0668,0x00EC,0x1256,0x1F74,
+     0x110D,0x0807,0x03D1,0x1326,0x0577,0x067C,0x1E5C,0x1D6D,0x06F1,0x075C,
+     0x0394,0x0184,0x1E7E,0x12F1,0x0216,0x0990,0x208D,0x1332,0x1044,0x0EF8,
+     0x0F70,0x075D,0x042C,0x030E,0x17CB,0x0AA3,0x04B2,0x1A63,0x04FE,0x097E,
+     0x213D,0x11DF,0x166B,0x0A2E,0x0664,0x0C75,0x21A3,0x102D,0x1F32,0x1D42,
+     0x0A65,0x14BF,0x0B11,0x22B9,0x08AC,0x1394,0x11B7,0x1FAE,0x1CCD,0x1A05,
+     0x177D,0x0D81,0x1E85,0x0D88,0x0A5E,0x0330,0x0EC4,0x13D9,0x1583,0x1CA6,
+     0x2126,0x0F99,0x158F,0x00F9,0x0176,0x1528,0x1C2B,0x1D69,0x049F,0x0418,
+     0x18B4,0x1ACB,0x236F,0x04C5,0x0705,0x0031,0x20B9,0x15B2,0x1FD4,0x18FC,
+     0x1A6E,0x21B1,0x0DEA,0x0432,0x1F1B,0x0CB7,0x2011,0x07CC,0x21FD,0x1216,
+     0x1F51,0x21AB,0x0974,0x0833,0x06F8,0x1935,0x10B4,0x0164,0x1421,0x1A4D,
+     0x1824,0x07DB,0x1551,0x0E53,0x152D,0x23CE,0x0DFE,0x0D51,0x1A6A,0x1E3C,
+     0x20B4,0x1BAA,0x0C62,0x0973,0x01E4,0x0035,0x01D7,0x0496,0x1A73,0x1435,
+     0x2290,0x22F4,0x1E71,0x0F7B,0x066D,0x0874,0x0DB5,0x0F1A,0x0F2D,0x218F,
+     0x17AE,0x0170,0x1BEA,0x1908,0x204A,0x0728,0x0746,0x18B8,0x0242,0x0F17,
+     0x1F8A,0x0B10,0x0966,0x1DD5,0x0174,0x07AE,0x1485,0x146C,0x0975,0x1556,
+     0x1783,0x2021,0x21E7,0x06DB,0x227D,0x19E7,0x22DC,0x2297,0x1FD1,0x1A26,
+     0x07CD,0x233D,0x1B84,0x1E18,0x21CE,0x0EE4,0x2255,0x0862,0x1887,0x057A,
+     0x20C9,0x17F4,0x1BDD,0x2284,0x1817,0x0929,0x0079,0x18F3,0x0E14,0x1131,
+     0x16B8,0x144E,0x120E,0x16BF,0x058B,0x1C9B,0x05D4,0x0E7B,0x07D3,0x1D27,
+     0x1051,0x1E12,0x2157,0x0A89,0x03E0,0x0DC8,0x219B,0x0495,0x04C0,0x090E,
+     0x1914,0x1A13,0x05C4,0x1C0D,0x0564,0x178C,0x2069,0x0291,0x08B5,0x0138,
+     0x1224,0x14C6,0x14C1,0x1AC7,0x0689,0x1E72,0x1751,0x1E0C,0x2270,0x080D,
+     0x1C00,0x03AD,0x1EF8,0x15C9,0x0F28,0x0E40,0x0F9E,0x0344,0x1D58,0x11F5,
+     0x1EAC,0x17A7,0x188D,0x05BA,0x1472,0x154E,0x0017,0x05C7,0x1ACD,0x2370,
+     0x1140,0x2230,0x0F2E,0x1EB2,0x1CA5,0x1B5E,0x1633,0x09B5,0x08B1,0x1B3E,
+     0x0CFE,0x02ED,0x1CEC,0x020F,0x2103,0x13ED,0x0C99,0x07E3,0x00D9,0x1342,
+     0x2179,0x03AA,0x13F5,0x124C,0x1EAB,0x15BA,0x0F41,0x02F6,0x1652,0x057E,
+     0x0157,0x0BE6,0x09AB,0x148D,0x072A,0x1071,0x09B0,0x0500,0x1B65,0x0A6A,
+     0x13A0,0x0F65,0x21BE,0x01FF,0x19B3,0x1CBA,0x109F,0x1EF0,0x0517,0x0307,
+     0x18AC,0x0FD5,0x1FEF,0x0F16,0x197E,0x1291,0x078A,0x1657,0x13C1,0x0E7A,
+     0x1466,0x07BE,0x164E,0x0419,0x2158,0x0FC4,0x0E7D,0x18D9,0x0942,0x0AEF,
+     0x163E,0x2200,0x226D,0x037A,0x1B66,0x0CAF,0x07FB,0x0CEC,0x0D4A,0x0CB6,
+     0x000E,0x1ADE,0x1BD5,0x1892,0x15A1,0x1DD1,0x1DBC,0x01EE,0x12E0,0x0671,
+     0x0ABB,0x1E0E,0x189F,0x1D9D,0x0DF2,0x0008,0x13CB,0x11B8,0x0571,0x00BA,
+     0x0AC3,0x1568,0x070A,0x21B0,0x16EA,0x1000,0x10BF,0x0C8C,0x0AE5,0x186B,
+     0x1366,0x12DF,0x2156,0x0C82,0x05CD,0x0B25,0x08CA,0x1695,0x0FCE,0x055F,
+     0x0D37,0x1748,0x13DB,0x1E43,0x03E7,0x0D8E,0x095E,0x0AF1,0x0103,0x02F4,
+     0x02F8,0x01F6,0x07FD,0x095F,0x1376,0x1643,0x1350,0x1372,0x06E3,0x14D5,
+     0x0870,0x15D9,0x20CD,0x128D,0x1878,0x0FC1,0x0907,0x127C,0x0A2C,0x0041,
+     0x03F4,0x116C,0x02B1,0x1CEA,0x1A18,0x00FB,0x08DE,0x0660,0x06AA,0x23D1,
+     0x0092,0x230C,0x0D91,0x14A3,0x0478,0x0FF7,0x1AF1,0x001A,0x0E69,0x1F5C,
+     0x162C,0x19F8,0x141A,0x1FE6,0x100F,0x047F,0x1DAF,0x231E,0x236C,0x1725,
+     0x108E,0x0290,0x1006,0x0E74,0x1C0A,0x1E35,0x1B90,0x05A7,0x1C21,0x0F1F,
+     0x0514,0x1937,0x22A6,0x0B4A,0x1A3A,0x1217,0x0E50,0x078D,0x2198,0x1B3B,
+     0x1A44,0x0BAB,0x2268,0x16D5,0x03F3,0x06D0,0x0523,0x1D45,0x18DB,0x0BA7,
+     0x1DBA,0x0776,0x1CFA,0x1E13,0x0271,0x200A,0x0D9B,0x0C4B,0x0588,0x0593,
+     0x18E4,0x082A,0x0533,0x1988,0x0317,0x1848,0x0DAB,0x2177,0x1945,0x126B,
+     0x0842,0x07B9,0x1DE1,0x06F3,0x224E,0x0AF0,0x0026,0x0240,0x010F,0x18E7,
+     0x0E51,0x0947,0x1C35,0x1F28,0x1688,0x07A9,0x1759,0x1608,0x1437,0x0B39,
+     0x2009,0x0389,0x0858,0x15BE,0x08A9,0x22D4,0x0EAE,0x015F,0x0337,0x034D,
+     0x23D9,0x081D,0x1D74,0x0C26,0x1BD9,0x0651,0x1F7B,0x2008,0x16B5,0x23A2,
+     0x05E1,0x1325,0x1E20,0x225F,0x0DED,0x101A,0x1254,0x00A8,0x1F1C,0x1F26,
+     0x1C8C,0x0563,0x12D2,0x0821,0x2160,0x115D,0x11EE,0x0232,0x192E,0x1BDF,
+     0x05F3,0x0E57,0x11F3,0x044E,0x20B5,0x1BDE,0x0F25,0x0DBE,0x1361,0x1971,
+     0x17E7,0x0C46,0x16FC,0x1B2E,0x18CB,0x23C4,0x1912,0x214C,0x0BA4,0x2392,
+     0x1037,0x1666,0x0BBB,0x180B,0x041F,0x20FA,0x1577,0x18D7,0x0115,0x0904,
+     0x136E,0x1867,0x0F53,0x0E2B,0x1A02,0x1FB2,0x1A9A,0x1D6C,0x0EBA,0x0BD5,
+     0x09F8,0x083F,0x0227,0x0E89,0x1495,0x1033,0x0F07,0x0D4D,0x0B4D,0x0F6A,
+     0x07FE,0x1AFB,0x05B0,0x1205,0x06CE,0x02D6,0x09DF,0x1A0C,0x0C3E,0x22C9,
+     0x22E5,0x0FEB,0x0A0E,0x21E6,0x088A,0x1C64,0x10B8,0x0383,0x14F8,0x0ED4,
+     0x05B4,0x2188,0x226B,0x025C,0x020D,0x0D0C,0x0449,0x0C81,0x0965,0x1135,
+     0x0CC1,0x08FC,0x16E4,0x1ED1,0x1BBD,0x1BE3,0x06D9,0x00A2,0x04C3,0x0CBF,
+     0x1324,0x2235,0x116A,0x0789,0x0198,0x05C3,0x1181,0x106C,0x1C8F,0x0984,
+     0x1A71,0x05F9,0x1F61,0x1298,0x2310,0x0075,0x063B,0x0B71,0x10C8,0x1E6D,
+     0x08A3,0x045C,0x1157,0x1DCE,0x0A05,0x1AAC,0x03F5,0x0DD1,0x2137,0x1200,
+     0x0CC4,0x17DA,0x1DF7,0x06C5,0x1C07,0x1B59,0x1AD8,0x0C43,0x15A0,0x0EF0,
+     0x0243,0x1BDA,0x1338,0x0C2F,0x132E,0x1D63,0x0969,0x23F3,0x077E,0x0991,
+     0x1DBE,0x23C7,0x05A3,0x1253,0x1FB8,0x1BCE,0x053B,0x1B8F,0x00E3,0x20E2,
+     0x1B61,0x22CE,0x04E8,0x17E1,0x06A3,0x04D1,0x02D3,0x23B1,0x031A,0x2045,
+     0x1319,0x1E7F,0x20CA,0x21E9,0x0C50,0x1E8D,0x209B,0x2306,0x0A1D,0x044B,
+     0x08A1,0x0437,0x102C,0x11F0,0x159B,0x0913,0x0A08,0x1E36,0x128F,0x06FA,
+     0x0DF0,0x160B,0x1F2E,0x094C,0x0788,0x1309,0x1CD4,0x0599,0x179F,0x0F54,
+     0x1362,0x1763,0x1B6C,0x0302,0x0921,0x231D,0x13F1,0x09C3,0x1348,0x12E1,
+     0x00FA,0x1689,0x16BE,0x18AB,0x1604,0x19F1,0x21BA,0x0D6A,0x20FC,0x21D2,
+     0x21ED,0x0663,0x0421,0x0D92,0x061A,0x165F,0x1D92,0x152E,0x070C,0x12A8,
+     0x1C90,0x0951,0x0CE5,0x1D39,0x0B75,0x168B,0x0A61,0x23B4,0x1572,0x1E06,
+     0x1AF9,0x0F5A,0x00CC,0x2139,0x0114,0x18FA,0x1654,0x18A9,0x0B13,0x0AF8,
+     0x14E4,0x051C,0x098A,0x1C9C,0x0554,0x1BBE,0x0DE5,0x198E,0x1BBB,0x0BCD,
+     0x0511,0x0E22,0x1D95,0x0C11,0x14E2,0x0108,0x1A56,0x0401,0x11B0,0x00C6,
+     0x2165,0x0F64,0x17BF,0x0154,0x0B95,0x14A5,0x0CC8,0x1B8E,0x1D7A,0x024F,
+     0x1762,0x1F71,0x1501,0x1844,0x15C2,0x010D,0x1092,0x0060,0x00AF,0x154D,
+     0x0DA5,0x0DB8,0x196E,0x1EE5,0x035E,0x05D3,0x00FC,0x0BCB,0x0364,0x0CAB,
+     0x16A3,0x23A7,0x014B,0x1536,0x0550,0x0407,0x127A,0x0A9E,0x1D64,0x0FD8,
+     0x14D2,0x0701,0x17DC,0x0BC0,0x1BA7,0x2141,0x0CFF,0x1B31,0x0205,0x22A7,
+     0x0C5E,0x1A09,0x11DE,0x13CE,0x08F3,0x208F,0x0015,0x2037,0x0AAF,0x057D,
+     0x0087,0x0AFB,0x1A85,0x1A97,0x0FD7,0x12D9,0x1FED,0x1DE2,0x197F,0x22B1,
+     0x205A,0x0544,0x0AD0,0x01DF,0x1E64,0x0AEB,0x12A6,0x0F30,0x07F1,0x1BF0,
+     0x230A,0x0573,0x0F61,0x2386,0x1242,0x1C55,0x0DA4,0x0F43,0x22AE,0x0CC6,
+     0x1BB5,0x0CDC,0x16A0,0x02FE,0x053F,0x008C,0x18E8,0x02CE,0x0C17,0x1B71,
+     0x1494,0x15F0,0x0D5B,0x089C,0x0F21,0x0A87,0x10CB,0x1EEB,0x1A2D,0x1F38,
+     0x0508,0x1C13,0x09D6,0x1B83,0x03C7,0x177B,0x0BA0,0x0760,0x00A7,0x07B8,
+     0x0F3F,0x0070,0x163B,0x0718,0x1609,0x2313,0x1058,0x10A1,0x0DA2,0x1BD8,
+     0x19D3,0x203D,0x09AA,0x0F0C,0x0A4D,0x22AD,0x0E9B,0x07A8,0x14F1,0x1056,
+     0x1E74,0x0402,0x0D40,0x0D6C,0x021E,0x1756,0x0056,0x0EB1,0x0E1C,0x0206,
+     0x0C94,0x2326,0x1F31,0x23CD,0x1BBF,0x0BB6,0x0607,0x0E0E,0x13B9,0x1724,
+     0x03F1,0x1BCC,0x01F1,0x1624,0x129F,0x1A6D,0x22E0,0x1132,0x1AE5,0x1B69,
+     0x00F1,0x225E,0x1E28,0x05EA,0x0F8E,0x024B,0x108F,0x0A3E,0x135D,0x0C73,
+     0x18D3,0x1BDC,0x1E8B,0x0BAA,0x1D09,0x0305,0x22E2,0x1D7D,0x012B,0x2164,
+     0x156F,0x0069,0x1333,0x206D,0x04F2,0x1982,0x141D,0x023D,0x0144,0x1EA0,
+     0x2378,0x1486,0x0EC5,0x1677,0x0770,0x06B4,0x04F6,0x09BC,0x1704,0x1DEF,
+     0x1FAF,0x22D5,0x1A34,0x21C0,0x099D,0x1BD7,0x1C47,0x1A4B,0x195E,0x0569,
+     0x10E5,0x0BAE,0x01A4,0x220C,0x0BB9,0x1700};
+ 
+ #define MX_MTBL		(sizeof(mekornd) / sizeof(unsigned short))
+ 
+ static int comp_mt(const void *s, const void *d)
+ {
+     MKT *mt1 = (MKT *)s;
+     MKT *mt2 = (MKT *)d;
+     return (int)(short)(mt1->r - mt2->r);
+ }
+ 
+ MKT *calcMEKO(int n)
+ {
+     int i;
+     MKT *mt;
+ 
+     if(n <= 0 || n > MX_MTBL){
+ 	    ErrPopUp ("Error:  Over max array.", "\nOk");
+ 	    return(NULL);
+     }
+ 
+     mt = malloc(sizeof(MKT) * n);
+ 
+     if(!mt) {
+ 	    ErrPopUp ("Error:  No memory.", "\nOk");
+ 	    return(NULL);
+     }
+ 
+     for(i = 0; i < n; i++) {
+         mt[i].r = mekornd[i];
+         mt[i].n = i + 1;
+     }
+     qsort(mt, n, sizeof(MKT), comp_mt);
+     return(mt);
+ }


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xv/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Aug 2008 15:20:18 -0000	1.2
+++ .cvsignore	5 Sep 2009 14:51:43 -0000	1.3
@@ -1,3 +1,5 @@
 xv-3.10a-jumbo-patches-20070520.tar.gz
 xv-3.10a.tar.gz
 xv.png
+xvman310a-html.tar.gz
+xv-non-english-Xman-pages.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xv/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Aug 2008 15:20:18 -0000	1.2
+++ sources	5 Sep 2009 14:51:43 -0000	1.3
@@ -1,3 +1,5 @@
 9fb2d0ec320498105cafeba38a588472  xv-3.10a-jumbo-patches-20070520.tar.gz
 2d4fbeec1561304362781cc8e2f7f72d  xv-3.10a.tar.gz
-99d45922a3e31929a822edd6aee25bc9  xv.png
+b08c658ae55f805d5671d7d1bc9142c1  xv.png
+5455638774a6cd2563d8e94fa58f3548  xvman310a-html.tar.gz
+4e5a6582ad76974309ca8bf8fb56b671  xv-non-english-Xman-pages.tar.bz2


Index: xv.desktop
===================================================================
RCS file: /cvs/nonfree/rpms/xv/EL-5/xv.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xv.desktop	3 Aug 2008 15:20:18 -0000	1.1
+++ xv.desktop	5 Sep 2009 14:51:43 -0000	1.2
@@ -1,11 +1,58 @@
-
 [Desktop Entry]
 Encoding=UTF-8
-Name=xv
-GenericName=XV Image Viewer
+Name=XV Image Viewer
+GenericName=Image Viewer
 Comment=XV Image Viewer
+Comment[af]=Prent Aansig
+Comment[ar]=عارض صور
+Comment[bg]=Преглед на Картинки
+Comment[br]=Diskouezer skeudennoù XV
+Comment[bs]=Preglednik slika
+Comment[ca]=Visualitzador de grà fics XV
+Comment[cs]=Prohlížeč obrázků
+Comment[de]=XV Bildbetrachter
+Comment[da]=XV Billedfremviser
+Comment[el]=Προβολή Εικόνων
+Comment[eo]=Bildorigardilo
+Comment[es]=Visor de imágenes
+Comment[et]=Pildifailide vaatamine
+Comment[eu]=Irudi Ikusgailua
+Comment[fi]=XV - kuviennäyttäjä
+Comment[fr]=Visualiseur d'images XV
+Comment[he]=מציג ×ª×ž×•× ×•×ª
+Comment[hr]=Preglednik slika
+Comment[hu]=XV kép nézegető
+Comment[is]=xv: Birta myndir af ýmsu tagi
+Comment[it]=Visualizzatore Immagini XV
+Comment[ja]=画像ビューア
+Comment[lt]=Paveikslėlių žiūriklis
+Comment[lv]=Bilžu Skatītājs
+Comment[mt]=Werrej ta' stampi
+Comment[nb]=XV-billedfremviser
+Comment[nl]=afbeeldingenweergaveprogramma
+Comment[nn]=Biletvisar
+Comment[no]=XV-billedfremviser
+Comment[pl]=Przeglądarka plików graficznych
+Comment[pt]=Visualizador de imagens
+Comment[pt_BR]=Visualizador de Imagens
+Comment[ro]=Vizualizor de imagini în diverse formate
+Comment[ru]=Просмотрщик изображений XV
+Comment[sk]=Prehliadač obrázkov
+Comment[sl]=Program za ogled in obdelavo slik XV
+Comment[sv]=XV bildvisare
+Comment[th]=เครื่องมือแสดงภาพ
+Comment[tr]=Resim Görüntüleyici
+Comment[uk]=Переглядач зображень
+Comment[ve]=Muvhoni wa Tshifanyiso
+Comment[vi]=Trình xem ảnh
+Comment[xh]=Umboniseli Womfanekiso Obheka Phambili
+Comment[zh_CN]=图片查看器
+Comment[zh_TW]=圖片瀏覽程式
+Comment[zu]=Umboniseli Womfanekiso
 Exec=xv
 Icon=xv
 Terminal=false
 Type=Application
+MimeType=image/gif;image/jpeg;image/png;image/tiff;image/x-xbm;image/x-xpm;
 Categories=Graphics;Utility;2DGraphics;Viewer;
+# vi: encoding=utf-8


Index: xv.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xv/EL-5/xv.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xv.spec	18 Oct 2008 16:46:50 -0000	1.2
+++ xv.spec	5 Sep 2009 14:51:43 -0000	1.3
@@ -3,76 +3,297 @@
 
 Name: xv
 Version: %{vprog}.jumbopatch.%{vjumbo}
-Release: 7%{?dist}
+Release: 9%{?dist}
 Summary: Interactive image display program for X
+Summary(de.UTF-8): X-basierender Bild-Viewer für praktische sämtliche Grafiken
+Summary(es.UTF-8): Visualizador de imágenes para X para cuasi todos los formatos de imágenes
+Summary(fr.UTF-8): Visualisateur sous X pour quasiment tous les types d'images
+Summary(pl.UTF-8): Przeglądarka różnego rodzaju plików graficznych pracująca w X Window
+Summary(pt_BR.UTF-8): Visualizador de imagens para X para quase todos os formatos de imagens
+Summary(ru.UTF-8): Программа для просмотра и преобразования файлов изображений для X
+Summary(tr.UTF-8): X tabanlı resim görüntüleyici
+Summary(uk.UTF-8): Програма для перегляду та перетворення файлів зображень для X
 License: Shareware
 Group: Applications/Multimedia
 URL: http://www.trilon.com/xv/xv.html
-Source0: ftp://ftp.cis.upenn.edu/pub/xv/%{name}-%{vprog}.tar.gz
+Source0: ftp://ftp.trilon.com/pub/xv/%{name}-%{vprog}.tar.gz
 Source1: http://downloads.sourceforge.net/png-mng/%{name}-%{vprog}-jumbo-patches-%{vjumbo}.tar.gz
 Source2: DISTRIBUTE.txt
 Source3: %{name}.desktop
 Source4: %{name}.png
+Source5: ftp://ftp.trilon.com/pub/xv/xvman310a-html.tar.gz
+Source6: xv-non-english-Xman-pages.tar.bz2
 Patch0: xv-jumbo-20070520-makefile.patch
-Patch1: xv-jumbo-20070520-imc.patch
+Patch1: http://www.gregroelofs.com/code/xv-3.10a-enhancements.20070520-20081216.diff
+Patch2: xv-3.10a-cleanup.patch
+Patch3: xv-FLmask.v2.1.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtiff-devel libpng-devel jasper-devel libXt-devel desktop-file-utils
+BuildRequires: libtiff-devel libpng-devel jasper-devel desktop-file-utils
+%if "%{?rhel}" != "4"
+BuildRequires: libX11-devel libXt-devel
+%global xlibdir %{_libdir}
+%else
+BuildRequires: xorg-x11-devel
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+%global xlibdir /usr/X11R6/%{_lib}
+%endif
+Requires: hicolor-icon-theme
+Requires: man
+
+%description
+This is the famous 'xv' by John Bradley. It is shareware, but we ship
+it with the permission of the authors. It is a graphics viewer for
+many file types, including gif, jpg, tiff, xwd, etc. It also has
+manipulation features such as cropping, expanding, etc. Patched to
+include flmask, a popular feature in Japan.
+
+%description -l de.UTF-8
+Dies ist das berühmte 'xv' von John Bradley, ein Shareware- Programm,
+das wir mit Erlaubnis des Autors liefern. Es ist ein Grafik-Viewer für
+diverse Dateitypen, einschließlich gif, funktionen wie Trimmen,
+Strecken u.ä. Mit flmask.
+
+%description -l es.UTF-8
+Este es el famoso 'xv' de John Bradley. Es shareware, pero nosotros lo
+distribuimos con la permisión de los autores. Es un visor gráfico para
+varios tipos de archivos, incluyendo gif, jpg, tiff, xwd, etc. También
+posee características de manejo como corte, expansión, etc.
+
+%description -l fr.UTF-8
+Le célébre xv de John Bradley. C'est shareware, mais nous le
+distribuons avec la permission de l'auteur. C'est un visualiseur
+graphique pour de nombreux formats de fichier dont gif, jpg, tiff,
+xwd, etc. Il offre aussi des fonctionnalités comme la capture,
+l'extension, la retouche de palette, etc. Flmask.
+
+%description -l pl.UTF-8
+SÅ‚ynne 'xv' Johna Bradleya. Jest to program shareware, ale
+udostępniamy go za zgodą autora. Jest to przeglądarka plików
+graficznych w różnych formatach, takich jak: gif, jpg, tiff, xwd i
+innych. Ma też proste możliwości obróbki obrazków, takie jak obcinanie
+czy rozszerzanie. Zawiera obsługę flmask.
+
+%description -l pt_BR.UTF-8
+Este é o famoso 'xv' de John Bradley. Ele é shareware, mas nós o
+distribuimos com a permissão dos autores. É um visualizador gráfico
+para vários tipos de arquivos, incluindo gif, jpg, tiff, xwd, etc.
+Também possui características de manipulação como corte, expansão,
+etc.
+
+%description -l ru.UTF-8
+Xv - это программа для просмотра и преобразования изображений для X
+Window System. Xv умеет показывать GIF, JPEG, TIFF, PBM, PPM, PDF, X11
+bitmap, Utah Raster Toolkit RLE, PDS/VICAR, Sun Rasterfile, BMP, PCX,
+IRIS RGB, XPM, Targa, XWD, PostScript(TM) и PM. Xv также умеет делать
+простую обработку изображений - cropping, expanding, снимки экрана и
+т.п.
+
+%description -l tr.UTF-8
+xv başta PNG, GIF, JPG, BMP, XBM, XPM olmak üzere birçok resim
+dosyasını görüntüleyebilir, değişik formatlarda kaydedebilir ve
+üzerinde boyutlandırma, renk değiştirme gibi bazı temel işlemleri
+yapabilir. Çok detaylı işlemler yapamamasına rağmen temel resim
+işlemlerinde öncellikle kullanılabilecek, kullanışlı arayüzüne sahip
+bir programdır. Flmask.
+
+%description -l uk.UTF-8
+Xv - це програма для перегляду та перетворення зображень для X Window
+System. Xv вміє показувати GIF, JPEG, TIFF, PBM, PPM, PDF, X11 bitmap,
+Utah Raster Toolkit RLE, PDS/VICAR, Sun Rasterfile, BMP, PCX, IRIS
+RGB, XPM, Targa, XWD, PostScript(TM) та PM. Xv також вміє робити
+просту обробку зображень - cropping, expanding, знімки экрану і т.і.
 
 %package doc
-Summary: Documentation files for xv image viewer
+Summary: Manuals in various formats for the xv image viewer
 Group: Documentation
-
-%description
-A shareware program for displaying, grabbing, converting,
-and otherwise manipulating graphic image files
+%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
+BuildArch: noarch
+%endif
 
 %description doc
-Documentation files for xv image viewer
+Manuals in various formats for the xv image viewer, plus technical details
+of the various image file formats supported.
 
 %prep
-%setup -q -n %{name}-%{vprog}
-%setup -q -T -D -b 1 -n %{name}-%{vprog}
+%setup -q -n %{name}-%{vprog} -b 1 -a 5 -a 6
+
+# Apply 20070520 jumbo enhancement patch, bundled with %{SOURCE1}
 %{__patch} -p1 < ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
+%{__rm} ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
+
+# Fix compiler options, install directories; enable JPEG 2000 support
 %patch0 -p1
+
+# Interim jumbo patch update
 %patch1 -p1
-%{__install} -m 0644 %{SOURCE2} .
-# make doc files utf8-clean:
-for F in README.jumbo copyright.h; do
+
+# Clean up code
+%patch2 -p1
+
+# Add FLmask feature (rebased patch; original version won't apply after jumbo patch)
+%patch3 -p1
+
+# Include permission to distribute
+%{__install} -m 0644 -p %{SOURCE2} .
+
+# Recode docs as UTF-8
+for F in README.jumbo copyright.h fi/man1/xv.1; do
   iconv -f iso88591 -t utf8 ${F} -o ${F}.utf8 && %{__mv} -f ${F}.utf8 ${F}
 done
+for F in pl/man1/xvpictoppm.1; do
+  iconv -f iso-8859-2 -t utf8 ${F} -o ${F}.utf8 && %{__mv} -f ${F}.utf8 ${F}
+done
+for F in 00_README CPMASK; do
+  iconv -f EUC-JP -t utf8 ${F} -o ${F}.utf8 && %{__mv} -f ${F}.utf8 ${F}
+done
+
+# Reorganize docs
+#
+# Note: Man pages for p?m file formats would conflict with netpbm-progs if installed under %{_mandir}
+%{__mv} 00_README README.FLmask
+%{__mv} docs/README README.docs
+%{__mkdir} docs/{formats,manuals}/
+%{__mv} docs/{bmp.doc,epsf.ps,gif*,p[bgp]m.5,xpm.ps} docs/formats/
+%{__mv} docs/{xvdocs.{ps,pdf},xvtitle.ps} docs/manuals/
+
+# HTML manual
+%{__mv} -f xvman310a docs/manuals/html
+
+# Fix line endings
+for doc in docs/manuals/xv*.ps; do
+  %{__sed} -e 's/\r$//' ${doc} > ${doc}.unix
+  touch -r ${doc} ${doc}.unix
+  %{__mv} -f ${doc}.unix ${doc}
+done
+
+# Fix directory location of X libs
+%{__sed} -i -e 's at -L/usr/X11R6/lib[[:space:]]@-L%{xlibdir} @' Makefile
 
 %build
-#configure
 %{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-desktop-file-install --vendor=livna --dir=%{buildroot}/%{_datadir}/applications %{SOURCE3}
-%{__install} -D -m 0644 %{SOURCE4} %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-# get rid of reduntant doc files:
-%{__rm} -f docs/xvdocs.ps docs/xvtitle.ps docs/*.5 docs/*.man
+
+desktop-file-install \
+  --vendor=livna \
+  --dir=%{buildroot}%{_datadir}/applications \
+  %{SOURCE3}
+
+%{__install} -D -p -m 0644 %{SOURCE4} \
+  %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
+# Non-English man pages
+%{__install} -D -p -m 0644 fi/man1/xv.1 \
+  %{buildroot}%{_mandir}/fi/man1/xv.1
+%{__install} -D -p -m 0644 pl/man1/xvpictoppm.1 \
+  %{buildroot}%{_mandir}/pl/man1/xvpictoppm.1
+
+# Populate the docs directory
+%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{vprog}/
+for doc in \
+  BUGS \
+  CHANGELOG \
+  copyright.h \
+  CPMASK \
+  DISTRIBUTE.txt \
+  IDEAS \
+  README \
+  README.docs \
+  README.FLmask \
+  README.jumbo \
+  README.pcd \
+  xv_mgcsfx.sample \
+  docs/bigxv.jpg \
+  docs/formats/ \
+  docs/manuals/
+do
+  %{__cp} -a ${doc} %{buildroot}%{_docdir}/%{name}-%{vprog}/
+done
 
 %clean
 %{__rm} -rf %{buildroot}
 
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+update-desktop-database &> /dev/null || :
+
+%if "%{?rhel}" != "4"
+# EL-4 doesn't have %posttrans, nor does it have an icon cache to maintain
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+%endif
+
 %files
-%defattr(-,root,root)
-%doc DISTRIBUTE.txt copyright.h README README.jumbo
-%{_bindir}/*
-%{_mandir}/man1/*
-%{_datadir}/applications/*
-%{_datadir}/icons/hicolor/48x48/apps/*
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{vprog}/BUGS
+%doc %{_docdir}/%{name}-%{vprog}/CHANGELOG
+%doc %{_docdir}/%{name}-%{vprog}/copyright.h
+%doc %{_docdir}/%{name}-%{vprog}/CPMASK
+%doc %{_docdir}/%{name}-%{vprog}/DISTRIBUTE.txt
+%doc %{_docdir}/%{name}-%{vprog}/IDEAS
+%doc %{_docdir}/%{name}-%{vprog}/README
+%doc %{_docdir}/%{name}-%{vprog}/README.FLmask
+%doc %{_docdir}/%{name}-%{vprog}/README.jumbo
+%doc %{_docdir}/%{name}-%{vprog}/README.pcd
+%doc %{_docdir}/%{name}-%{vprog}/xv_mgcsfx.sample
+%{_bindir}/bggen
+%{_bindir}/vdcomp
+%{_bindir}/xcmap
+%{_bindir}/xv
+%{_bindir}/xvpictoppm
+%{_datadir}/applications/livna-xv.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xv.png
+%{_mandir}/man1/bggen.1*
+%{_mandir}/man1/vdcomp.1*
+%{_mandir}/man1/xcmap.1*
+%{_mandir}/man1/xv.1*
+%{_mandir}/man1/xvpictoppm.1*
+%lang(fi) %{_mandir}/fi/man1/xv.1*
+%lang(pl) %{_mandir}/pl/man1/xvpictoppm.1*
 
 %files doc
-%defattr(-,root,root)
-%doc BUGS CHANGELOG docs IDEAS README.pcd
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{vprog}/README.docs
+%doc %{_docdir}/%{name}-%{vprog}/bigxv.jpg
+%doc %{_docdir}/%{name}-%{vprog}/formats/
+%doc %{_docdir}/%{name}-%{vprog}/manuals/
 
 %changelog
-* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 3.10a.jumbopatch.20070520-7
+* Thu Sep 03 2009 Paul Howarth <paul at city-fan.org> 3.10a.jumbopatch.20070520-9
+- clean up prep, build, install, and changelog sections prior to surgery
+- include Greg Roelofs' jumbo patch update (20081216)
+- drop -imc patch, included in jumbo patch update
+- get upstream tarball from ftp.trilon.com
+- add patch cleaning up pointer conversions and buffer overflow checks that
+  could get optimized out by compilers due to invalid code constructs
+- add FLMask patch (rebased; original won't apply over jumbo patch)
+- add HTML format manual
+- reshuffle documents and put them all in the same directory hierarchy
+- require hicolor-icon-theme for ownership of icon directory
+- associate image MIME types with xv in desktop file and add scriptlets
+- add some manpage translations from PLD
+- require man for ownership of translated manpage directories
+- add desktop file and package summary/description translations from PLD
+- make doc package noarch for F-10, EL-6 onwards
+- fix buildreqs, Makefile, and scriptlets for EL-4 compatibility
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 3.10a.jumbopatch.20070520-8
+- rebuild for new F11 features
+
+* Sat Oct 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 3.10a.jumbopatch.20070520-7
 - rebuild
 
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 3.10a.jumbopatch.20070520-6
+* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 3.10a.jumbopatch.20070520-6
 - rebuild
 
 * Fri Jan 18 2008 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-5


--- xv-jumbo-20070520-imc.patch DELETED ---