[packages/xv] - rel 41; build fixes added

arekm arekm at pld-linux.org
Sun Nov 3 09:35:12 CET 2013


commit f4936c4ff3e9901616a62c63bf4b736f097e6dc0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Nov 3 09:35:09 2013 +0100

    - rel 41; build fixes added

 xv-format.patch | 13 +++++++++++++
 xv.spec         |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/xv.spec b/xv.spec
index ee7f706..47faa5c 100644
--- a/xv.spec
+++ b/xv.spec
@@ -9,7 +9,7 @@ Summary(tr.UTF-8):	X tabanlı resim görüntüleyici
 Summary(uk.UTF-8):	Програма для перегляду та перетворення файлів зображень для X
 Name:		xv
 Version:	3.10a
-Release:	40
+Release:	41
 License:	Shareware
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.cis.upenn.edu/pub/xv/%{name}-%{version}.tar.gz
@@ -29,6 +29,7 @@ Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-3.10a-enhancements.20070520-20081216.diff
 Patch2:		%{name}-libpng-1.5.patch
 Patch3:		%{name}-buffer_overflows.patch
+Patch4:		%{name}-format.patch
 URL:		http://www.trilon.com/xv/xv.html
 BuildRequires:	jasper-devel
 BuildRequires:	libjpeg-devel
@@ -109,6 +110,7 @@ patch -p1 < ./xv-3.10a-jumbo-fix-enh-patch-20070520.txt || exit 1
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__make} \
diff --git a/xv-format.patch b/xv-format.patch
new file mode 100644
index 0000000..52ef320
--- /dev/null
+++ b/xv-format.patch
@@ -0,0 +1,13 @@
+--- xv-3.10a/xvpbm.c~	2013-11-03 09:33:10.000000000 +0100
++++ xv-3.10a/xvpbm.c	2013-11-03 09:33:59.806789183 +0100
+@@ -885,8 +885,8 @@
+ 	  }
+ 	}
+ 	else {
+-	  if (*pix) fprintf(fp,str1);
+-	       else fprintf(fp,str0);
++	  if (*pix) fprintf(fp,"%s", str1);
++	       else fprintf(fp,"%s", str0);
+ 	  len+=2;
+ 	  if (len>68) { fprintf(fp,"\n"); len=0; }
+ 	}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xv.git/commitdiff/f4936c4ff3e9901616a62c63bf4b736f097e6dc0



More information about the pld-cvs-commit mailing list