summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2002-08-09 18:06:35 +0000
committerdrochner <drochner@pkgsrc.org>2002-08-09 18:06:35 +0000
commitee8f65ee2687bd9ff924f9c08f15b5085b814a5d (patch)
treea1b74bfffc1c1c7c3a79c32e42822a834c04c4f0 /graphics
parent577caefd40583199470fbcced4992006c9e7c72f (diff)
downloadpkgsrc-ee8f65ee2687bd9ff924f9c08f15b5085b814a5d.tar.gz
don't use filename as format string, should fix PR pkg/17750 by
Christian Biere
Diffstat (limited to 'graphics')
-rw-r--r--graphics/xv/distinfo4
-rw-r--r--graphics/xv/patches/patch-aw15
2 files changed, 14 insertions, 5 deletions
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index b4c7b4527bb..1c537bbe82a 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/29 13:02:24 tron Exp $
+$NetBSD: distinfo,v 1.4 2002/08/09 18:06:35 drochner Exp $
SHA1 (xv-3.10a.tar.gz) = 9e6372f154be9e9e355972cbeb91d98d9c342474
Size (xv-3.10a.tar.gz) = 2259124 bytes
@@ -30,4 +30,4 @@ SHA1 (patch-as) = f960648c9ce6e86c13dbd1cca091c4cc71ea7d08
SHA1 (patch-at) = a2c2c57ad852006b66addc5c88f73fce7d4716eb
SHA1 (patch-au) = 3cb2fde94db4b71a449c81e4b912132b204b0062
SHA1 (patch-av) = cb815b12de135927cad826623c5071e938a59509
-SHA1 (patch-aw) = 71698320f3fa4e7008f4cc231370d5db25b1efea
+SHA1 (patch-aw) = 2085110d88d34a78d14b68dd6a3cbff56251352f
diff --git a/graphics/xv/patches/patch-aw b/graphics/xv/patches/patch-aw
index 05d42b84110..bba52f7a553 100644
--- a/graphics/xv/patches/patch-aw
+++ b/graphics/xv/patches/patch-aw
@@ -1,7 +1,7 @@
-$NetBSD: patch-aw,v 1.1 2002/07/29 13:02:24 tron Exp $
+$NetBSD: patch-aw,v 1.2 2002/08/09 18:06:36 drochner Exp $
---- xv.c.orig Mon Jul 29 14:50:12 2002
-+++ xv.c Mon Jul 29 14:51:19 2002
+--- xv.c.orig Fri Aug 9 19:14:10 2002
++++ xv.c Fri Aug 9 19:51:18 2002
@@ -1872,11 +1872,13 @@
if (filenum == LOADPIC) {
fullname = GetDirFullName();
@@ -34,3 +34,12 @@ $NetBSD: patch-aw,v 1.1 2002/07/29 13:02:24 tron Exp $
/* if fullname doesn't start with a '/' (ie, it's a relative path),
(and it's not LOADPIC and it's not the special case '<stdin>')
+@@ -2233,7 +2239,7 @@
+ SetISTR(ISTR_INFO,formatStr);
+
+ SetInfoMode(INF_PART);
+- SetISTR(ISTR_FILENAME,
++ SetISTR(ISTR_FILENAME, "%s",
+ (filenum==DFLTPIC || filenum==GRABBED || frompipe)
+ ? "<none>" : basefname);
+