Attachment #37004 for bug #59066

View | Details | Raw Unified | Return to bug 59066
Collapse All | Expand All

Lines 5-12 Link Here

(-)gchempaint/Makefile (-2 / +1 lines)
5	# $FreeBSD: ports/science/gchempaint/Makefile,v 1.5 2003/11/02 19:05:32 marcus Exp $	5	# $FreeBSD: ports/science/gchempaint/Makefile,v 1.5 2003/11/02 19:05:32 marcus Exp $
6		6
7	PORTNAME= gchempaint	7	PORTNAME= gchempaint
8	PORTVERSION= 0.3.5	8	PORTVERSION= 0.3.6
9	PORTREVISION= 1
10	CATEGORIES= science	9	CATEGORIES= science
11	MASTER_SITES= ${MASTER_SITE_SAVANNAH}	10	MASTER_SITES= ${MASTER_SITE_SAVANNAH}
12	MASTER_SITE_SUBDIR= ${PORTNAME}/unstable.pkg/${PORTVERSION}	11	MASTER_SITE_SUBDIR= ${PORTNAME}/unstable.pkg/${PORTVERSION}

Line 1 Link Here

(-)gchempaint/distinfo (-1 / +1 lines)
1	MD5 (gchempaint-0.3.5.tar.bz2) = 096dafb7aec7437704d8293ba7f3ae01	1	MD5 (gchempaint-0.3.6.tar.bz2) = 2e1bf7deba7487e9b5dbef4cfd7e0cd0




--- libgcpcanvas/gcp-canvas-group.c.orig	Sun Oct 12 13:51:42 2003
+++ libgcpcanvas/gcp-canvas-group.c	Sun Nov  9 00:51:10 2003
@@ -92,9 +92,9 @@
 
 void gnome_canvas_group_ext_print (GPrintable *printable, GnomePrintContext *pc)
 {
-	g_return_if_fail (GNOME_IS_CANVAS_GROUP_EXT (printable));
 	GList *list;
 	double affine[6];
+	g_return_if_fail (GNOME_IS_CANVAS_GROUP_EXT (printable));
 	for (list = GNOME_CANVAS_GROUP (printable) ->item_list; list; list = list->next) {
 		if (GNOME_IS_CANVAS_GROUP_EXT(list->data))
 			gnome_canvas_group_ext_print (G_PRINTABLE (list->data), pc);




--- libgcpcanvas/gcp-canvas-rich-text.c.orig	Thu Aug 28 08:12:13 2003
+++ libgcpcanvas/gcp-canvas-rich-text.c	Thu Aug 28 18:07:40 2003
@@ -2101,6 +2101,11 @@
 	double ax, ay;
 	double x1, y1, x2, y2;
 	ArtPoint ip, cp;
+	GdkPixbuf *pxb;
+	GdkPixmap* pb;
+	GdkGC* gc;
+	GdkPixbuf* pixbuf;
+	GdkColormap* map;
 
     gnome_canvas_buf_ensure_buf (buf);
 
@@ -2149,11 +2154,11 @@
 	if (y0 + h >= buf->rect.y1 + 1)
 		h = buf->rect.y1 - y0 + 1;
 	if (((int) w == 0) || ((int) h == 0)) return;
-	GdkPixbuf *pxb = gdk_pixbuf_new_from_data (buf->buf + y * buf->buf_rowstride + x * 3,
+	pxb = gdk_pixbuf_new_from_data (buf->buf + y * buf->buf_rowstride + x * 3,
 																GDK_COLORSPACE_RGB, FALSE, 8, (int) w, (int) h,
 																buf->buf_rowstride, NULL, NULL);
-	GdkPixmap* pb = gdk_pixmap_new (item->canvas->layout.bin_window, (int) w, (int) h, gtk_widget_get_visual ((GtkWidget*) item->canvas)->depth);
-	GdkGC* gc = gdk_gc_new (pb);
+	pb = gdk_pixmap_new (item->canvas->layout.bin_window, (int) w, (int) h, gtk_widget_get_visual ((GtkWidget*) item->canvas)->depth);
+	gc = gdk_gc_new (pb);
 	gdk_pixbuf_render_to_drawable (pxb, pb, gc, 0, 0, 0, 0, w, h, GDK_RGB_DITHER_NONE, 0, 0);
 	gtk_text_layout_set_screen_width(text->_priv->layout, x2 - x1);
         /* FIXME: should last arg be NULL? */
@@ -2166,8 +2171,8 @@
 		0, 0, x2 - x0, y2 - y0,
 		NULL);
 
-	GdkPixbuf* pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, (int) w, (int) h);
-	GdkColormap* map = gdk_colormap_new (gtk_widget_get_visual ((GtkWidget*) item->canvas), FALSE);
+	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, (int) w, (int) h);
+	map = gdk_colormap_new (gtk_widget_get_visual ((GtkWidget*) item->canvas), FALSE);
 	gdk_pixbuf_get_from_drawable (pixbuf, pb, map, 0, 0, 0, 0, (int) w, (int) h);
 	data = gdk_pixbuf_get_pixels (pixbuf);
 	r = gdk_pixbuf_get_rowstride (pixbuf);
@@ -2220,18 +2225,20 @@
 
 PangoLayout* gnome_canvas_rich_text_ext_get_pango_layout (GnomeCanvasRichTextExt *text, gint line)
 {
-	g_return_val_if_fail (GNOME_IS_CANVAS_RICH_TEXT_EXT (text), NULL);
 	gint top = 0, bottom, firsty;
+	GSList* lines;
+	GtkTextLine* text_line;
+	g_return_val_if_fail (GNOME_IS_CANVAS_RICH_TEXT_EXT (text), NULL);
 	gtk_text_layout_get_size (text->_priv->layout, NULL, &bottom);
 	if (bottom <= top) return NULL;
-	GSList* lines = gtk_text_layout_get_lines (text->_priv->layout, top, bottom, &firsty);
+	lines = gtk_text_layout_get_lines (text->_priv->layout, top, bottom, &firsty);
 	firsty = 0;
 	while ((firsty < line) && lines)
 	{
 		lines = lines->next;
 		firsty++;
 	}
-	GtkTextLine* text_line = (lines)? lines->data: NULL;
+	text_line = (lines)? lines->data: NULL;
 	if (text_line)
 	{
 		GtkTextLineDisplay* display = gtk_text_layout_get_line_display(text->_priv->layout, text_line, TRUE);




--- libgcpcanvas/gcp-canvas-shape.c.orig	Sun Oct 12 13:51:42 2003
+++ libgcpcanvas/gcp-canvas-shape.c	Sun Nov  9 00:53:27 2003
@@ -95,13 +95,13 @@
 
 void gnome_canvas_shape_ext_print (GPrintable *printable, GnomePrintContext *pc)
 {
-	g_return_if_fail (GNOME_IS_CANVAS_SHAPE_EXT (printable));
 	GnomeCanvasShape *shape;
 	GnomeCanvasShapePriv * priv;
 	GnomeCanvasPathDef * path;
 	gdouble width;
 	ArtBpath * bpath;
 	
+	g_return_if_fail (GNOME_IS_CANVAS_SHAPE_EXT (printable));
 	shape = GNOME_CANVAS_SHAPE (printable);
 	priv = shape->priv;
 	path = priv->path;

Return to bug 59066

Line 0 Link Here

(-)gchempaint/files/patch-libgcpcanvas-gcp-canvas-group.c (+13 lines)
	1	--- libgcpcanvas/gcp-canvas-group.c.orig Sun Oct 12 13:51:42 2003
	2	+++ libgcpcanvas/gcp-canvas-group.c Sun Nov 9 00:51:10 2003
	3	@@ -92,9 +92,9 @@
	4
	5	void gnome_canvas_group_ext_print (GPrintable printable, GnomePrintContext pc)
	6	{
	7	- g_return_if_fail (GNOME_IS_CANVAS_GROUP_EXT (printable));
	8	GList *list;
	9	double affine[6];
	10	+ g_return_if_fail (GNOME_IS_CANVAS_GROUP_EXT (printable));
	11	for (list = GNOME_CANVAS_GROUP (printable) ->item_list; list; list = list->next) {
	12	if (GNOME_IS_CANVAS_GROUP_EXT(list->data))
	13	gnome_canvas_group_ext_print (G_PRINTABLE (list->data), pc);

Lines 1-64 Link Here

(-)gchempaint/files/patch-libgcpcanvas-gcp-canvas-rich-text.c (-64 lines)
1	--- libgcpcanvas/gcp-canvas-rich-text.c.orig Thu Aug 28 08:12:13 2003
2	+++ libgcpcanvas/gcp-canvas-rich-text.c Thu Aug 28 18:07:40 2003
3	@@ -2101,6 +2101,11 @@
4	double ax, ay;
5	double x1, y1, x2, y2;
6	ArtPoint ip, cp;
7	+ GdkPixbuf *pxb;
8	+ GdkPixmap* pb;
9	+ GdkGC* gc;
10	+ GdkPixbuf* pixbuf;
11	+ GdkColormap* map;
12
13	gnome_canvas_buf_ensure_buf (buf);
14
15	@@ -2149,11 +2154,11 @@
16	if (y0 + h >= buf->rect.y1 + 1)
17	h = buf->rect.y1 - y0 + 1;
18	if (((int) w == 0) \|\| ((int) h == 0)) return;
19	- GdkPixbuf pxb = gdk_pixbuf_new_from_data (buf->buf + y buf->buf_rowstride + x * 3,
20	+ pxb = gdk_pixbuf_new_from_data (buf->buf + y * buf->buf_rowstride + x * 3,
21	GDK_COLORSPACE_RGB, FALSE, 8, (int) w, (int) h,
22	buf->buf_rowstride, NULL, NULL);
23	- GdkPixmap* pb = gdk_pixmap_new (item->canvas->layout.bin_window, (int) w, (int) h, gtk_widget_get_visual ((GtkWidget*) item->canvas)->depth);
24	- GdkGC* gc = gdk_gc_new (pb);
25	+ pb = gdk_pixmap_new (item->canvas->layout.bin_window, (int) w, (int) h, gtk_widget_get_visual ((GtkWidget*) item->canvas)->depth);
26	+ gc = gdk_gc_new (pb);
27	gdk_pixbuf_render_to_drawable (pxb, pb, gc, 0, 0, 0, 0, w, h, GDK_RGB_DITHER_NONE, 0, 0);
28	gtk_text_layout_set_screen_width(text->_priv->layout, x2 - x1);
29	/* FIXME: should last arg be NULL? */
30	@@ -2166,8 +2171,8 @@
31	0, 0, x2 - x0, y2 - y0,
32	NULL);
33
34	- GdkPixbuf* pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, (int) w, (int) h);
35	- GdkColormap* map = gdk_colormap_new (gtk_widget_get_visual ((GtkWidget*) item->canvas), FALSE);
36	+ pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, (int) w, (int) h);
37	+ map = gdk_colormap_new (gtk_widget_get_visual ((GtkWidget*) item->canvas), FALSE);
38	gdk_pixbuf_get_from_drawable (pixbuf, pb, map, 0, 0, 0, 0, (int) w, (int) h);
39	data = gdk_pixbuf_get_pixels (pixbuf);
40	r = gdk_pixbuf_get_rowstride (pixbuf);
41	@@ -2220,18 +2225,20 @@
42
43	PangoLayout* gnome_canvas_rich_text_ext_get_pango_layout (GnomeCanvasRichTextExt *text, gint line)
44	{
45	- g_return_val_if_fail (GNOME_IS_CANVAS_RICH_TEXT_EXT (text), NULL);
46	gint top = 0, bottom, firsty;
47	+ GSList* lines;
48	+ GtkTextLine* text_line;
49	+ g_return_val_if_fail (GNOME_IS_CANVAS_RICH_TEXT_EXT (text), NULL);
50	gtk_text_layout_get_size (text->_priv->layout, NULL, &bottom);
51	if (bottom <= top) return NULL;
52	- GSList* lines = gtk_text_layout_get_lines (text->_priv->layout, top, bottom, &firsty);
53	+ lines = gtk_text_layout_get_lines (text->_priv->layout, top, bottom, &firsty);
54	firsty = 0;
55	while ((firsty < line) && lines)
56	{
57	lines = lines->next;
58	firsty++;
59	}
60	- GtkTextLine* text_line = (lines)? lines->data: NULL;
61	+ text_line = (lines)? lines->data: NULL;
62	if (text_line)
63	{
64	GtkTextLineDisplay* display = gtk_text_layout_get_line_display(text->_priv->layout, text_line, TRUE);

Line 0 Link Here

(-)gchempaint/files/patch-libgcpcanvas-gcp-canvas-shape.c (+17 lines)
	1	--- libgcpcanvas/gcp-canvas-shape.c.orig Sun Oct 12 13:51:42 2003
	2	+++ libgcpcanvas/gcp-canvas-shape.c Sun Nov 9 00:53:27 2003
	3	@@ -95,13 +95,13 @@
	4
	5	void gnome_canvas_shape_ext_print (GPrintable printable, GnomePrintContext pc)
	6	{
	7	- g_return_if_fail (GNOME_IS_CANVAS_SHAPE_EXT (printable));
	8	GnomeCanvasShape *shape;
	9	GnomeCanvasShapePriv * priv;
	10	GnomeCanvasPathDef * path;
	11	gdouble width;
	12	ArtBpath * bpath;
	13
	14	+ g_return_if_fail (GNOME_IS_CANVAS_SHAPE_EXT (printable));
	15	shape = GNOME_CANVAS_SHAPE (printable);
	16	priv = shape->priv;
	17	path = priv->path;

Lines 29-34 Link Here

(-)gchempaint/pkg-plist (-1 / +1 lines)
29	share/gnome/gchempaint/glade/tools.glade	29	share/gnome/gchempaint/glade/tools.glade
30	share/gnome/gchempaint/glade/upbond.xpm	30	share/gnome/gchempaint/glade/upbond.xpm
31	share/gnome/gchempaint/glade/xbond.xpm	31	share/gnome/gchempaint/glade/xbond.xpm
		32	share/gnome/gnome-2.0/ui/gchempaint.xml
32	share/gnome/help/gchempaint/C/gchempaint.xml	33	share/gnome/help/gchempaint/C/gchempaint.xml
33	share/gnome/help/gchempaint/C/legal.xml	34	share/gnome/help/gchempaint/C/legal.xml
34	share/gnome/help/gchempaint/C/figures/bond.png	35	share/gnome/help/gchempaint/C/figures/bond.png
Lines 50-56 Link Here
50	share/gnome/pixmaps/gchempaint.png	51	share/gnome/pixmaps/gchempaint.png
51	share/gnome/pixmaps/gchempaint_logo.png	52	share/gnome/pixmaps/gchempaint_logo.png
52	@exec scrollkeeper-install -q %D/share/gnome/omf/gchempaint/gchempaint-C.omf 2>/dev/null \|\| /usr/bin/true	53	@exec scrollkeeper-install -q %D/share/gnome/omf/gchempaint/gchempaint-C.omf 2>/dev/null \|\| /usr/bin/true
53	share/gnome/ui/gchempaint.xml
54	share/locale/de/LC_MESSAGES/gchempaint.mo	54	share/locale/de/LC_MESSAGES/gchempaint.mo
55	share/locale/fr/LC_MESSAGES/gchempaint.mo	55	share/locale/fr/LC_MESSAGES/gchempaint.mo
56	share/locale/it/LC_MESSAGES/gchempaint.mo	56	share/locale/it/LC_MESSAGES/gchempaint.mo