From fe58a913e3a29fb71698b1769dcb66c77bab862e Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Sat, 1 Feb 2003 00:24:16 +0000
Subject: * Update to 2.0.1 * Disable printing until libgnomeprint-2.2 support
 is added

Submitted by:	maintainer
---
 graphics/gthumb2/Makefile                          |  5 +--
 graphics/gthumb2/distinfo                          |  2 +-
 .../files/patch-libgthumb_print-callbacks.c        | 52 ++++++++++++++++++++++
 3 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 graphics/gthumb2/files/patch-libgthumb_print-callbacks.c

(limited to 'graphics')

diff --git a/graphics/gthumb2/Makefile b/graphics/gthumb2/Makefile
index 6785cc8df02b..fa9df10804cf 100644
--- a/graphics/gthumb2/Makefile
+++ b/graphics/gthumb2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gthumb2
-PORTVERSION=	1.108
+PORTVERSION=	2.0.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gthumb
@@ -14,8 +14,7 @@ DISTNAME=	gthumb-${PORTVERSION}
 
 MAINTAINER=	verbophobe@hotmail.com
 
-LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
-		gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/graphics/gthumb2/distinfo b/graphics/gthumb2/distinfo
index 26cb8af798fd..bcdd779515fa 100644
--- a/graphics/gthumb2/distinfo
+++ b/graphics/gthumb2/distinfo
@@ -1 +1 @@
-MD5 (gthumb-1.108.tar.gz) = 3fbf92c0137cce8b9fdf2d475406cf5d
+MD5 (gthumb-2.0.1.tar.gz) = 608fa80b3ea6b8de0c4ae5c89005b85e
diff --git a/graphics/gthumb2/files/patch-libgthumb_print-callbacks.c b/graphics/gthumb2/files/patch-libgthumb_print-callbacks.c
new file mode 100644
index 000000000000..0d2e0c014aa0
--- /dev/null
+++ b/graphics/gthumb2/files/patch-libgthumb_print-callbacks.c
@@ -0,0 +1,52 @@
+--- print-callbacks.c.ori	Fri Jan 31 18:49:46 2003
++++ print-callbacks.c	Fri Jan 31 18:51:39 2003
+@@ -25,11 +25,8 @@
+ 
+ #include <libgnome/libgnome.h>
+ #include <libgnomeprint/gnome-print.h>
+-#include <libgnomeprint/gnome-print-master.h>
+ #include <libgnomeprintui/gnome-print-preview.h>
+-#include <libgnomeprintui/gnome-print-master-preview.h>
+ #include <libgnomeprintui/gnome-print-dialog.h>
+-#include <libgnomeprintui/gnome-printer-dialog.h>
+ #include <libgnomeprintui/gnome-print-paper-selector.h>
+ #include <libgnomecanvas/libgnomecanvas.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
+@@ -68,7 +65,6 @@
+ 	double               paper_bmargin;
+ 
+ 	GnomePrintConfig    *config;
+-	GnomePrintMaster    *gpm;
+ 
+ 	gboolean             print_comment;
+ 	gboolean             portrait;
+@@ -117,8 +113,6 @@
+ 	pi->ref_count--;
+ 
+ 	if (pi->ref_count == 0) {
+-		if (pi->gpm != NULL)
+-			g_object_unref (pi->gpm);
+ 		gnome_print_config_unref (pi->config);
+ 		g_object_unref (pi->pixbuf);
+ 		g_object_unref (pi->font_comment);
+@@ -727,11 +721,7 @@
+ 
+ 	/* Print !! */
+ 
+-	pi->gpm = gnome_print_master_new_from_config (pi->config);
+-	gp_ctx = gnome_print_master_get_context (pi->gpm);
+ 	print_image (gp_ctx, pi, FALSE);
+-	gnome_print_master_close (pi->gpm);
+-	gnome_print_master_print (pi->gpm);	
+ 	print_info_unref (pi);
+ }
+ 
+@@ -938,7 +928,7 @@
+ 	notebook     = glade_xml_get_widget (data->gui, "notebook");
+ 
+ 	gtk_box_pack_start (GTK_BOX (printer_vbox),
+-			    gnome_printer_selection_new (pi->config), 
++			    gtk_label_new("Sorry, printing is currently broken"), 
+ 			    FALSE, FALSE, 0);
+ 	gtk_box_pack_start (GTK_BOX (paper_vbox),
+ 			    gnome_paper_selector_new (pi->config), /*FIXME*/
-- 
cgit