packages: texlive/texlive.spec, texlive/texlive-libpng.patch (NEW) - rel 2; ...

[arekm]

Author: arekm                        Date: Thu Jan 28 21:17:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; libpng fixes

---- Files affected:
packages/texlive:
   texlive.spec (1.308 -> 1.309) , texlive-libpng.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/texlive/texlive.spec
diff -u packages/texlive/texlive.spec:1.308 packages/texlive/texlive.spec:1.309
--- packages/texlive/texlive.spec:1.308	Thu Jan 28 21:42:19 2010
+++ packages/texlive/texlive.spec	Thu Jan 28 22:17:40 2010
@@ -36,7 +36,7 @@
 Summary(tr.UTF-8):	TeX dizgi sistemi ve MetaFont yazıtipi biçimlendiricisi
 Name:		texlive
 Version:	%{year}%{monthday}
-Release:	1
+Release:	2
 Epoch:		1
 License:	distributable
 Group:		Applications/Publishing/TeX
@@ -83,6 +83,7 @@
 Patch3:		%{name}-getline.patch
 Patch4:		%{name}-stdio.patch
 Patch5:		%{name}-aclocal.patch
+Patch6:		%{name}-libpng.patch
 URL:		http://www.tug.org/texlive/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -5611,6 +5612,7 @@
 # %patch3 -p1
 %patch4 -p1
 # %patch5 -p1
+%patch6 -p1
 CURDIR=$(pwd)
 
 cd utils/xindy/make-rules/alphabets
@@ -13967,6 +13969,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.309  2010/01/28 21:17:40  arekm
+- rel 2; libpng fixes
+
 Revision 1.308  2010/01/28 20:42:19  arekm
 - rel 1
 

================================================================
Index: packages/texlive/texlive-libpng.patch
diff -u /dev/null packages/texlive/texlive-libpng.patch:1.1
--- /dev/null	Thu Jan 28 22:17:45 2010
+++ packages/texlive/texlive-libpng.patch	Thu Jan 28 22:17:40 2010
@@ -0,0 +1,44 @@
+--- texlive-20091011-source/./texk/xdvipdfmx/src/xbb.c~	2008-05-25 17:00:35.000000000 +0200
++++ texlive-20091011-source/./texk/xdvipdfmx/src/xbb.c	2010-01-28 22:01:10.653876887 +0100
+@@ -246,7 +246,7 @@
+   unsigned char sigbytes[4];
+   rewind (png_file);
+   if (fread(sigbytes, 1, sizeof(sigbytes), png_file) != sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes)))) return 0;
++      (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) return 0;
+   else return 1;
+ }             
+ 
+--- texlive-20091011-source/texk/xdvipdfmx/src/pngimage.c~	2007-11-22 17:48:06.000000000 +0100
++++ texlive-20091011-source/texk/xdvipdfmx/src/pngimage.c	2010-01-28 22:02:06.753257437 +0100
+@@ -146,7 +146,7 @@
+   rewind (png_file);
+   if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
+       sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes))))
++      (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
+     return 0;
+   else
+     return 1;
+--- texlive-20091011-source/./texk/dvipdfmx/src/pngimage.c~	2009-05-26 01:12:24.000000000 +0200
++++ texlive-20091011-source/./texk/dvipdfmx/src/pngimage.c	2010-01-28 22:02:43.449910278 +0100
+@@ -148,7 +148,7 @@
+   rewind (png_file);
+   if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
+       sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes))))
++      (png_sig_cmp( (sigbytes, 0, sizeof(sigbytes))))
+     return 0;
+   else
+     return 1;
+--- texlive-20091011-source/./texk/web2c/xetexdir/pngimage.c~	2006-07-26 18:19:45.000000000 +0200
++++ texlive-20091011-source/./texk/web2c/xetexdir/pngimage.c	2010-01-28 22:03:20.986780607 +0100
+@@ -101,7 +101,7 @@
+   rewind (png_file);
+   if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
+       sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes))))
++      (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
+     return 0;
+   else
+     return 1;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/texlive/texlive.spec?r1=1.308&r2=1.309&f=u