- include patches from OpenBSD

- Fix coredump on amd64
PR:		123410

10 files changed, 156 insertions, 55 deletions

diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index a13969d2df2e..040cbff21f79 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pornview
 PORTVERSION=	0.2.0.p.1
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/pornview/files/patch-charset.c b/graphics/pornview/files/patch-charset.c
new file mode 100644
index 000000000000..67270d6a7782
--- /dev/null
+++ b/graphics/pornview/files/patch-charset.c
@@ -0,0 +1,11 @@
+--- src/support/charset.c.orig	Tue Nov 11 14:16:57 2008
++++ src/support/charset.c	Tue Nov 11 14:17:13 2008
+@@ -468,7 +468,7 @@ charset_conv (const gchar * src,
+ 
+ #ifdef USE_GTK2
+     {
+-	gint    rbytes, wbytes;
++	gsize    rbytes, wbytes;
+ 	return g_convert (src, -1, dest_codeset, src_codeset,
+ 			  &rbytes, &wbytes, NULL);
+     }
diff --git a/graphics/pornview/files/patch-comment.c b/graphics/pornview/files/patch-comment.c
new file mode 100644
index 000000000000..14932314493b
--- /dev/null
+++ b/graphics/pornview/files/patch-comment.c
@@ -0,0 +1,24 @@
+--- src/comment.c.orig	2002-12-22 11:18:51.000000000 +0100
++++ src/comment.c	2009-04-19 14:33:47.000000000 +0200
+@@ -187,7 +187,7 @@
+ {
+     Comment *comment;
+ 
+-    comment = COMMENT (gtk_type_new (comment_get_type ()));
++    comment = g_object_new (TYPE_COMMENT, NULL);
+     g_return_val_if_fail (comment, NULL);
+ 
+     return comment;
+@@ -999,10 +999,10 @@
+  *-------------------------------------------------------------------
+  */
+ 
+-guint
++GType
+ comment_get_type (void)
+ {
+-    static guint comment_type = 0;
++    static GType comment_type = 0;
+ 
+     if (!comment_type)
+     {
diff --git a/graphics/pornview/files/patch-comment.h b/graphics/pornview/files/patch-comment.h
new file mode 100644
index 000000000000..b77b3ed98714
--- /dev/null
+++ b/graphics/pornview/files/patch-comment.h
@@ -0,0 +1,26 @@
+--- src/comment.h.orig	2002-12-22 11:18:51.000000000 +0100
++++ src/comment.h	2009-04-19 14:34:10.000000000 +0200
+@@ -18,10 +18,10 @@
+ #include "image_info.h"
+ 
+ #define TYPE_COMMENT            (comment_get_type ())
+-#define COMMENT(obj)            (GTK_CHECK_CAST ((obj), TYPE_COMMENT, Comment))
+-#define COMMENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_COMMENT, CommentClass))
+-#define IS_COMMENT(obj)         (GTK_CHECK_TYPE ((obj), TYPE_COMMENT))
+-#define IS_COMMENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMMENT))
++#define COMMENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMENT, Comment))
++#define COMMENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMENT, CommentClass))
++#define IS_COMMENT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMMENT))
++#define IS_COMMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMMENT))
+ 
+ typedef struct Comment_Tag Comment;
+ typedef struct CommentClass_Tag CommentClass;
+@@ -64,7 +64,7 @@
+ CommentDataEntry;
+ 
+ 
+-guint           comment_get_type (void);
++GType           comment_get_type (void);
+ Comment        *comment_ref (Comment * comment);
+ void            comment_unref (Comment * comment);
+ 
diff --git a/graphics/pornview/files/patch-debian b/graphics/pornview/files/patch-debian
deleted file mode 100644
index ee888b98943d..000000000000
--- a/graphics/pornview/files/patch-debian
+++ /dev/null
@@ -1,53 +0,0 @@
---- pornview-0.2pre1.orig/src/support/image_loader.c
-+++ src/support/image_loader.c
-@@ -81,7 +81,7 @@
- image_loader_stop (ImageLoader * il)
- {
- #ifdef USE_GTK2
--    GError *err;
-+    GError *err = NULL;
- #endif
- 
-     if (!il)
-@@ -174,7 +174,7 @@
-     gint    c;
- 
- #ifdef USE_GTK2
--    GError *err;
-+    GError *err = NULL;
- #endif
- 
-     if (!il)
-@@ -241,7 +241,7 @@
-     int     b;
- 
- #ifdef USE_GTK2
--    GError *err;
-+    GError *err = NULL;
- #endif
- 
-     if (!il->loader || il->pixbuf)
---- pornview-0.2pre1.orig/src/support/widgets/gtkxine.c
-+++ src/support/widgets/gtkxine.c
-@@ -632,7 +632,7 @@
-      */
-     if (this->vo_driver != NULL)
- 	xine_close_video_driver (this->xine, this->vo_driver);
--    if (this->vo_driver != NULL)
-+    if (this->ao_driver != NULL)
- 	xine_close_audio_driver (this->xine, this->ao_driver);
- 
-     /*
---- pornview-0.2pre1.orig/src/support/widgets/zlist.c
-+++ src/support/widgets/zlist.c
-@@ -634,7 +634,8 @@
- 					   CELL_X_FROM_COL (list, j), area->y,
- 					   list->cell_x_pad, area->height);
- 
--		cell = ZLIST_CELL_FROM_INDEX (list, idx);
-+		if (idx < list->cell_count)
-+		    cell = ZLIST_CELL_FROM_INDEX (list, idx);
- 
- 		cell_area.x = CELL_X_FROM_COL (list, j) + list->cell_x_pad;
- 		cell_area.y = CELL_Y_FROM_ROW (list, i) + list->cell_y_pad;
-
diff --git a/graphics/pornview/files/patch-gtkcellrendererpixmap.c b/graphics/pornview/files/patch-gtkcellrendererpixmap.c
index b1dfdd3bf54a..b69548ecb037 100644
--- a/graphics/pornview/files/patch-gtkcellrendererpixmap.c
+++ b/graphics/pornview/files/patch-gtkcellrendererpixmap.c
@@ -1,5 +1,5 @@
 --- src/support/widgets/gtkcellrendererpixmap.c.orig	2002-12-13 12:02:45.000000000 +0100
-+++ src/support/widgets/gtkcellrendererpixmap.c	2009-01-14 17:09:25.000000000 +0100
++++ src/support/widgets/gtkcellrendererpixmap.c	2009-04-19 17:20:36.000000000 +0200
 @@ -12,9 +12,6 @@
   *  Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
   */
@@ -10,3 +10,16 @@
  
  #include "gtkcellrendererpixmap.h"
  
+@@ -59,10 +56,10 @@
+     PROP_MASK_EXPANDER_CLOSED
+ };
+ 
+-GtkType
++GType
+ gtk_cell_renderer_pixmap_get_type (void)
+ {
+-    static GtkType cell_pixmap_type = 0;
++    static GType cell_pixmap_type = 0;
+ 
+     if (!cell_pixmap_type)
+     {
diff --git a/graphics/pornview/files/patch-gtkcellrendererpixmap.h b/graphics/pornview/files/patch-gtkcellrendererpixmap.h
new file mode 100644
index 000000000000..c8f79dca9ea4
--- /dev/null
+++ b/graphics/pornview/files/patch-gtkcellrendererpixmap.h
@@ -0,0 +1,28 @@
+--- src/support/widgets/gtkcellrendererpixmap.h.orig	2002-12-13 12:02:45.000000000 +0100
++++ src/support/widgets/gtkcellrendererpixmap.h	2009-04-19 13:58:55.000000000 +0200
+@@ -32,11 +32,11 @@
+ 
+ 
+ #define GTK_TYPE_CELL_RENDERER_PIXMAP			    (gtk_cell_renderer_pixmap_get_type ())
+-#define GTK_CELL_RENDERER_PIXMAP(obj)			    (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
+-#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
+-#define GTK_IS_CELL_RENDERER_PIXMAP(obj)		    (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
+-#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
+-#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
++#define GTK_CELL_RENDERER_PIXMAP(obj)			    (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmap))
++#define GTK_CELL_RENDERER_PIXMAP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
++#define GTK_IS_CELL_RENDERER_PIXMAP(obj)		    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP))
++#define GTK_IS_CELL_RENDERER_PIXMAP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PIXMAP))
++#define GTK_CELL_RENDERER_PIXMAP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PIXMAP, GtkCellRendererPixmapClass))
+ 
+     typedef struct GtkCellRendererPixmap_Tag GtkCellRendererPixmap;
+     typedef struct GtkCellRendererPixmapClass_Tag GtkCellRendererPixmapClass;
+@@ -66,7 +66,7 @@
+ 	void            (*_gtk_reserved4) (void);
+     };
+ 
+-    GtkType         gtk_cell_renderer_pixmap_get_type (void);
++    GType         gtk_cell_renderer_pixmap_get_type (void);
+     GtkCellRenderer *gtk_cell_renderer_pixmap_new (void);
+ 
+ #ifdef __cplusplus
diff --git a/graphics/pornview/files/patch-gtkxine.c b/graphics/pornview/files/patch-gtkxine.c
new file mode 100644
index 000000000000..3d328de4c5c1
--- /dev/null
+++ b/graphics/pornview/files/patch-gtkxine.c
@@ -0,0 +1,11 @@
+--- src/support/widgets/gtkxine.c.orig	2003-01-03 23:48:21.000000000 +0100
++++ src/support/widgets/gtkxine.c	2009-04-19 13:58:56.000000000 +0200
+@@ -632,7 +632,7 @@
+      */
+     if (this->vo_driver != NULL)
+ 	xine_close_video_driver (this->xine, this->vo_driver);
+-    if (this->vo_driver != NULL)
++    if (this->ao_driver != NULL)
+ 	xine_close_audio_driver (this->xine, this->ao_driver);
+ 
+     /*
diff --git a/graphics/pornview/files/patch-image_loader.c b/graphics/pornview/files/patch-image_loader.c
new file mode 100644
index 000000000000..50eac9f5e91d
--- /dev/null
+++ b/graphics/pornview/files/patch-image_loader.c
@@ -0,0 +1,29 @@
+--- src/support/image_loader.c.orig	2002-12-16 18:45:36.000000000 +0100
++++ src/support/image_loader.c	2009-04-19 13:58:56.000000000 +0200
+@@ -81,7 +81,7 @@
+ image_loader_stop (ImageLoader * il)
+ {
+ #ifdef USE_GTK2
+-    GError *err;
++    GError *err = NULL;
+ #endif
+ 
+     if (!il)
+@@ -174,7 +174,7 @@
+     gint    c;
+ 
+ #ifdef USE_GTK2
+-    GError *err;
++    GError *err = NULL;
+ #endif
+ 
+     if (!il)
+@@ -241,7 +241,7 @@
+     int     b;
+ 
+ #ifdef USE_GTK2
+-    GError *err;
++    GError *err = NULL;
+ #endif
+ 
+     if (!il->loader || il->pixbuf)
diff --git a/graphics/pornview/files/patch-zlist.c b/graphics/pornview/files/patch-zlist.c
new file mode 100644
index 000000000000..1e998ec6a322
--- /dev/null
+++ b/graphics/pornview/files/patch-zlist.c
@@ -0,0 +1,12 @@
+--- src/support/widgets/zlist.c.orig	2002-12-13 11:52:56.000000000 +0100
++++ src/support/widgets/zlist.c	2009-04-19 13:58:56.000000000 +0200
+@@ -634,7 +634,8 @@
+ 					   CELL_X_FROM_COL (list, j), area->y,
+ 					   list->cell_x_pad, area->height);
+ 
+-		cell = ZLIST_CELL_FROM_INDEX (list, idx);
++		if (idx < list->cell_count)
++	 		cell = ZLIST_CELL_FROM_INDEX (list, idx);
+ 
+ 		cell_area.x = CELL_X_FROM_COL (list, j) + list->cell_x_pad;
+ 		cell_area.y = CELL_Y_FROM_ROW (list, i) + list->cell_y_pad;