Add a bunch of patches to let this old unmaintained upstream crap compile

with a recent Gtk. Still some issues on amd64 though, so be prepared to
see it die soon if the issues persists.

prodded/reminded by jasper@
This commit is contained in:
landry 2008-11-14 17:16:34 +00:00
parent 6d02089311
commit 1a9ca229ca
6 changed files with 89 additions and 2 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2008/08/21 13:12:32 jasper Exp $
# $OpenBSD: Makefile,v 1.12 2008/11/14 17:16:34 landry Exp $
COMMENT= image viewer/manager
DISTNAME= pornview-0.2.0pre1
PKGNAME= ${DISTNAME}p4
PKGNAME= ${DISTNAME}p5
CATEGORIES= graphics
HOMEPAGE= http://pornview.sourceforge.net/

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_comment_c,v 1.1 2008/11/14 17:16:34 landry Exp $
--- src/comment.c.orig Tue Nov 11 14:45:28 2008
+++ src/comment.c Tue Nov 11 14:46:04 2008
@@ -187,7 +187,7 @@ comment_new ()
{
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;

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_comment_h,v 1.1 2008/11/14 17:16:34 landry Exp $
--- src/comment.h.orig Tue Nov 11 13:25:56 2008
+++ src/comment.h Tue Nov 11 13:29:24 2008
@@ -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;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_support_charset_c,v 1.1 2008/11/14 17:16:34 landry Exp $
--- 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);
}

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_support_widgets_gtkcellrendererpixmap_c,v 1.1 2008/11/14 17:16:34 landry Exp $
--- src/support/widgets/gtkcellrendererpixmap.c.orig Tue Nov 11 12:39:57 2008
+++ src/support/widgets/gtkcellrendererpixmap.c Tue Nov 11 12:40:15 2008
@@ -59,10 +59,10 @@ enum
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)
{

View File

@ -0,0 +1,29 @@
$OpenBSD: patch-src_support_widgets_gtkcellrendererpixmap_h,v 1.1 2008/11/14 17:16:34 landry Exp $
--- src/support/widgets/gtkcellrendererpixmap.h.orig Fri Dec 13 12:02:45 2002
+++ src/support/widgets/gtkcellrendererpixmap.h Tue Nov 11 12:53:57 2008
@@ -32,11 +32,11 @@ extern "C"
#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 @@ extern "C"
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