- Update to 0.4.9

4 files changed, 53 insertions, 3 deletions

diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index 18ee76af0b49..c1daaaeba143 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	gchempaint
-PORTVERSION=	0.4.8
+PORTVERSION=	0.4.9
 CATEGORIES=	science
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/science/gchempaint/distinfo b/science/gchempaint/distinfo
index 289e614f866c..7e7b2421e32d 100644
--- a/science/gchempaint/distinfo
+++ b/science/gchempaint/distinfo
@@ -1,2 +1,2 @@
-MD5 (gchempaint-0.4.8.tar.bz2) = a6b536b9898c5cf340bc8c4e120fec5f
-SIZE (gchempaint-0.4.8.tar.bz2) = 572369
+MD5 (gchempaint-0.4.9.tar.bz2) = ffbd8ae038c72eabea06a3eb2669cad7
+SIZE (gchempaint-0.4.9.tar.bz2) = 575353
diff --git a/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-rich-text.c b/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-rich-text.c
new file mode 100644
index 000000000000..726c749fa42f
--- /dev/null
+++ b/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-rich-text.c
@@ -0,0 +1,31 @@
+--- libgcpcanvas/gcp-canvas-rich-text.c.orig	Mon Nov 29 08:46:09 2004
++++ libgcpcanvas/gcp-canvas-rich-text.c	Tue Nov 30 00:19:42 2004
+@@ -1699,9 +1699,10 @@
+ static gboolean
+ request_update(gpointer data)
+ {
++	GnomeCanvasRichTextExt *text;
+ 	if (!GNOME_IS_CANVAS_RICH_TEXT_EXT (data))
+ 		return;
+-	GnomeCanvasRichTextExt *text = GNOME_CANVAS_RICH_TEXT_EXT(data);
++	text = GNOME_CANVAS_RICH_TEXT_EXT(data);
+ 
+ 	gnome_canvas_item_request_update(GNOME_CANVAS_ITEM(text));
+ 
+@@ -2420,10 +2421,13 @@
+ gnome_canvas_rich_text_ext_ensure_rendered (GnomeCanvasRichTextExt *text)
+ {
+ 	double x1, y1, x2, y2;
+-	get_bounds (text, &x1, &y1, &x2, &y2);
+-	int w = (int) (ceil (x2) - floor (x1)) + 1, h = (int) (ceil (y2) - floor (y1)) + 1;
+-	GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, w, h);
++	int w, h;
++	GdkPixbuf *pixbuf;
+ 	GnomeCanvasBuf buf;
++
++	get_bounds (text, &x1, &y1, &x2, &y2);
++	w = (int) (ceil (x2) - floor (x1)) + 1, h = (int) (ceil (y2) - floor (y1)) + 1;
++	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, w, h);
+ 	buf.buf = gdk_pixbuf_get_pixels (pixbuf);
+ 	buf.rect.x0 = (int) floor (x1);
+ 	buf.rect.x1 = (int) ceil (x2);
diff --git a/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-text.c b/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-text.c
new file mode 100644
index 000000000000..8c8af6a3d4ef
--- /dev/null
+++ b/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-text.c
@@ -0,0 +1,19 @@
+--- libgcpcanvas/gcp-canvas-text.c.orig	Mon Nov 29 08:46:09 2004
++++ libgcpcanvas/gcp-canvas-text.c	Tue Nov 30 00:37:59 2004
+@@ -228,10 +228,13 @@
+ gnome_canvas_text_ext_ensure_rendered (GnomeCanvasTextExt *text)
+ {
+ 	double x1, y1, x2, y2;
+-	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (text), &x1, &y1, &x2, &y2);
+-	int w = (int) (ceil (x2) - floor (x1)) + 1, h = (int) (ceil (y2) - floor (y1)) + 1;
+-	GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, w, h);
++	int w, h;
+ 	GnomeCanvasBuf buf;
++	GdkPixbuf *pixbuf;
++
++	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (text), &x1, &y1, &x2, &y2);
++	w = (int) (ceil (x2) - floor (x1)) + 1, h = (int) (ceil (y2) - floor (y1)) + 1;
++	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, w, h);
+ 	buf.buf = gdk_pixbuf_get_pixels (pixbuf);
+ 	buf.rect.x0 = (int) floor (x1);
+ 	buf.rect.x1 = (int) ceil (x2);