ports/59066: [maintainer update] science/gchempaint 0.3.6
Pav Lucistnik
pav at oook.cz
Sun Nov 9 00:10:24 UTC 2003
>Number: 59066
>Category: ports
>Synopsis: [maintainer update] science/gchempaint 0.3.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 08 16:10:21 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Pav Lucistnik
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD hood.oook.cz 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Sat Nov 8 12:53:25 CET 2003 root@:/usr/obj/usr/src/sys/PAV i386
>Description:
Update gchempaint to 0.3.6
* Printing code rewritten and now complete
* Charges inside fragments enhanced
* Added user interface for the Bonobo control
* Some code cleaning
* Some bugs fixed
Committer don't forget to
cvs remove files/patch-libgcpcanvas-gcp-canvas-rich-text.c
cvs add files/patch-libgcpcanvas-gcp-canvas-group.c
cvs add files/patch-libgcpcanvas-gcp-canvas-shape.c
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/science/gchempaint/Makefile gchempaint/Makefile
--- /usr/ports/science/gchempaint/Makefile Wed Nov 5 00:25:36 2003
+++ gchempaint/Makefile Sun Nov 9 00:25:59 2003
@@ -5,8 +5,7 @@
# $FreeBSD: ports/science/gchempaint/Makefile,v 1.5 2003/11/02 19:05:32 marcus Exp $
PORTNAME= gchempaint
-PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTVERSION= 0.3.6
CATEGORIES= science
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}/unstable.pkg/${PORTVERSION}
diff -ruN /usr/ports/science/gchempaint/distinfo gchempaint/distinfo
--- /usr/ports/science/gchempaint/distinfo Fri Aug 29 20:01:06 2003
+++ gchempaint/distinfo Sun Nov 9 00:26:33 2003
@@ -1 +1 @@
-MD5 (gchempaint-0.3.5.tar.bz2) = 096dafb7aec7437704d8293ba7f3ae01
+MD5 (gchempaint-0.3.6.tar.bz2) = 2e1bf7deba7487e9b5dbef4cfd7e0cd0
diff -ruN /usr/ports/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-group.c gchempaint/files/patch-libgcpcanvas-gcp-canvas-group.c
--- /usr/ports/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-group.c Thu Jan 1 01:00:00 1970
+++ gchempaint/files/patch-libgcpcanvas-gcp-canvas-group.c Sun Nov 9 00:58:03 2003
@@ -0,0 +1,13 @@
+--- 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);
diff -ruN /usr/ports/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-rich-text.c gchempaint/files/patch-libgcpcanvas-gcp-canvas-rich-text.c
--- /usr/ports/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-rich-text.c Thu Aug 28 23:34:38 2003
+++ gchempaint/files/patch-libgcpcanvas-gcp-canvas-rich-text.c Thu Jan 1 01:00:00 1970
@@ -1,64 +0,0 @@
---- 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);
diff -ruN /usr/ports/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-shape.c gchempaint/files/patch-libgcpcanvas-gcp-canvas-shape.c
--- /usr/ports/science/gchempaint/files/patch-libgcpcanvas-gcp-canvas-shape.c Thu Jan 1 01:00:00 1970
+++ gchempaint/files/patch-libgcpcanvas-gcp-canvas-shape.c Sun Nov 9 00:58:04 2003
@@ -0,0 +1,17 @@
+--- 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;
diff -ruN /usr/ports/science/gchempaint/pkg-plist gchempaint/pkg-plist
--- /usr/ports/science/gchempaint/pkg-plist Sun Jun 29 22:16:01 2003
+++ gchempaint/pkg-plist Sun Nov 9 00:39:02 2003
@@ -29,6 +29,7 @@
share/gnome/gchempaint/glade/tools.glade
share/gnome/gchempaint/glade/upbond.xpm
share/gnome/gchempaint/glade/xbond.xpm
+share/gnome/gnome-2.0/ui/gchempaint.xml
share/gnome/help/gchempaint/C/gchempaint.xml
share/gnome/help/gchempaint/C/legal.xml
share/gnome/help/gchempaint/C/figures/bond.png
@@ -50,7 +51,6 @@
share/gnome/pixmaps/gchempaint.png
share/gnome/pixmaps/gchempaint_logo.png
@exec scrollkeeper-install -q %D/share/gnome/omf/gchempaint/gchempaint-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/ui/gchempaint.xml
share/locale/de/LC_MESSAGES/gchempaint.mo
share/locale/fr/LC_MESSAGES/gchempaint.mo
share/locale/it/LC_MESSAGES/gchempaint.mo
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list