[packages/zgv] - fix format string error - fix building with texinfo 5.x - rel 12

baggins baggins at pld-linux.org
Thu Nov 7 09:33:03 CET 2013


commit 9257cf86c0ea6b87a72d583ecbd608c1e8e5dc57
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Nov 7 09:32:35 2013 +0100

    - fix format string error
    - fix building with texinfo 5.x
    - rel 12

 format-security.patch | 11 +++++++++++
 texinfo.patch         | 11 +++++++++++
 zgv.spec              |  6 +++++-
 3 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/zgv.spec b/zgv.spec
index 1ebdfc2..fe36a3a 100644
--- a/zgv.spec
+++ b/zgv.spec
@@ -15,7 +15,7 @@ Summary(tr.UTF-8):	Birçok resim formatını görüntüleyebilen konsol aracı
 Summary(ru.UTF-8):	Консольная программа просмотра множества графических форматов
 Name:		zgv
 Version:	5.9
-Release:	11
+Release:	12
 License:	GPL
 Group:		Applications/Graphics
 Source0:	ftp://metalab.unc.edu/pub/Linux/apps/graphics/viewers/svga/%{name}-%{version}.tar.gz
@@ -26,6 +26,8 @@ Patch2:		%{name}-Dkey.patch
 Patch3:		%{name}-home_etc.patch
 Patch4:		%{name}-gcc.patch
 Patch5:		%{name}-libpng15.patch
+Patch6:		format-security.patch
+Patch7:		texinfo.patch
 %{?with_sdl:BuildRequires:	SDL-devel}
 BuildRequires:	gawk
 BuildRequires:	libjpeg-devel
@@ -152,6 +154,8 @@ Ten pakiet zawiera interfejs korzystajacy z biblioteki SDL.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %if %{with pcd}
 sed -e 's@#\(PCDDEF=.*\)@\1@' config.mk > config.mk.new
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..a94065f
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- zgv-5.9/src/font.c~	2003-04-05 19:41:51.000000000 +0200
++++ zgv-5.9/src/font.c	2013-11-07 09:30:09.329692860 +0100
+@@ -63,7 +63,7 @@
+  */
+ static void its_too_damn_picky_sometimes()
+ {
+-printf(bitmap_fonts_copyright);
++printf("%s", bitmap_fonts_copyright);
+ }
+ 
+ 
diff --git a/texinfo.patch b/texinfo.patch
new file mode 100644
index 0000000..c9e0b59
--- /dev/null
+++ b/texinfo.patch
@@ -0,0 +1,11 @@
+--- zgv-5.9/doc/zgv.texi.orig	2013-11-07 09:31:25.396358976 +0100
++++ zgv-5.9/doc/zgv.texi	2013-11-07 09:31:40.269692201 +0100
+@@ -1526,7 +1526,7 @@
+ when mouse support is enabled can be used to move around the list.
+ 
+ @kindex S (Selector)
+- at itemx S
++ at item S
+ Toggle shuffling (randomising) of slideshows. @xref{Slideshows}.
+ 
+ @kindex L (Selector)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zgv.git/commitdiff/9257cf86c0ea6b87a72d583ecbd608c1e8e5dc57



More information about the pld-cvs-commit mailing list