Thu Sep 22 21:20:42 2011 UTC ()
Fix clang build failure.


(shattered)
diff -r1.12 -r1.13 pkgsrc/graphics/xzgv/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/xzgv/patches/patch-ad
cvs diff -r1.12 -r1.13 pkgsrc/graphics/xzgv/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/xzgv/distinfo 2010/09/20 01:16:17 1.12
+++ pkgsrc/graphics/xzgv/distinfo 2011/09/22 21:20:42 1.13
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.12 2010/09/20 01:16:17 jakllsch Exp $ 1$NetBSD: distinfo,v 1.13 2011/09/22 21:20:42 shattered Exp $
2 2
3SHA1 (xzgv-0.9.1.tar.gz) = f88df5cc709996806313db73a41d607b3c865827 3SHA1 (xzgv-0.9.1.tar.gz) = f88df5cc709996806313db73a41d607b3c865827
4RMD160 (xzgv-0.9.1.tar.gz) = ed388a4def87bf4b0c063e8f2bb61568f8ab68c0 4RMD160 (xzgv-0.9.1.tar.gz) = ed388a4def87bf4b0c063e8f2bb61568f8ab68c0
5Size (xzgv-0.9.1.tar.gz) = 163419 bytes 5Size (xzgv-0.9.1.tar.gz) = 163419 bytes
6SHA1 (patch-aa) = fa502e0fc4fc94cfc88c4aa41505ac7563d982a6 6SHA1 (patch-aa) = fa502e0fc4fc94cfc88c4aa41505ac7563d982a6
7SHA1 (patch-ad) = 378e0c2e19064c2c276c6e0a3e89bdcbcc2c96c5 7SHA1 (patch-ad) = b21348c2b40eeb510a1526c6228a97343373f4d5
cvs diff -r1.1 -r1.2 pkgsrc/graphics/xzgv/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/graphics/xzgv/patches/patch-ad 2009/01/05 16:08:20 1.1
+++ pkgsrc/graphics/xzgv/patches/patch-ad 2011/09/22 21:20:42 1.2
@@ -1,33 +1,42 @@ @@ -1,33 +1,42 @@
1$NetBSD: patch-ad,v 1.1 2009/01/05 16:08:20 shattered Exp $ 1$NetBSD: patch-ad,v 1.2 2011/09/22 21:20:42 shattered Exp $
2 2
3Proposed fix for "missing preview icons" problem, from 3Proposed fix for "missing preview icons" problem, from
4http://sourceforge.net/tracker/index.php?func=detail&aid=1814712&group_id=203093&atid=984206 4http://sourceforge.net/tracker/index.php?func=detail&aid=1814712&group_id=203093&atid=984206
5 5
6--- src/main.c.orig 2007-09-09 00:36:21.000000000 +0000 6--- src/main.c.orig 2007-09-09 00:36:21.000000000 +0000
7+++ src/main.c 7+++ src/main.c
8@@ -200,7 +200,7 @@ int orient_state_flip[8] ={2,3,0,1,6,7 8@@ -201,7 +201,7 @@ int orient_state_flip[8] ={2,3,0,1,6,7
9 /* required prototypes */ 9 /* required prototypes */
10 void render_pixmap(int reset_pos); 10 void render_pixmap(int reset_pos);
11 void cb_nextprev_tagged_image(int next,int view); 11 void cb_nextprev_tagged_image(int next,int view);
12-void idle_xvpic_load(int *entryp); 12-void idle_xvpic_load(int *entryp);
13+gint idle_xvpic_load(int *entryp); 13+gint idle_xvpic_load(int *entryp);
14 gint pic_win_resized(GtkWidget *widget,GdkEventConfigure *event); 14 gint pic_win_resized(GtkWidget *widget,GdkEventConfigure *event);
15 void cb_scaling_double(void); 15 void cb_scaling_double(void);
16 void cb_xscaling_double(void); 16 void cb_xscaling_double(void);
17@@ -2624,7 +2624,7 @@ else 17@@ -2622,7 +2622,7 @@ return(pixmap);
18 } 18 }
19  19
20  20
21-void idle_xvpic_load(int *entryp) 21-void idle_xvpic_load(int *entryp)
22+gint idle_xvpic_load(int *entryp) 22+gint idle_xvpic_load(int *entryp)
23 { 23 {
24 static char buf[1024]; 24 static char buf[1024];
25 struct clist_data_tag *datptr; 25 struct clist_data_tag *datptr;
26@@ -2748,6 +2748,7 @@ for(f=0;f<IDLE_XVPIC_NUM_PER_CALL;f++) 26@@ -2638,7 +2638,7 @@ idle_xvpic_called=1;
 27
 28 /* don't do it if it would be a bad time */
 29 if(idle_xvpic_blocked)
 30- return;
 31+ return FALSE;
 32
 33 /* freeze/thaw actually *cause* flickering for this, rather than
 34 * preventing it (!), so I've not used those here.
 35@@ -2746,6 +2746,7 @@ for(f=0;f<IDLE_XVPIC_NUM_PER_CALL;f++)
27 *entryp=-1; 36 *entryp=-1;
28 } 37 }
29 } 38 }
30+ return TRUE; 39+ return TRUE;
31 } 40 }
32  41
33  42