Date: Tue, 21 May 2013 11:35:50 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318677 - in head/graphics/diacanvas2: . files Message-ID: <201305211135.r4LBZoT5057467@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Tue May 21 11:35:49 2013 New Revision: 318677 URL: http://svnweb.freebsd.org/changeset/ports/318677 Log: Fix build with glib 2.34 [1] and while here make it build with clang. Also add support for GNOME print which wasn't handled. Submitted by: pointyhat via miwi [1] Added: head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-editable.c (contents, props changed) head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-item.c (contents, props changed) head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-view.c (contents, props changed) head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas.c (contents, props changed) head/graphics/diacanvas2/files/patch-diacanvas_dia-default-tool.c (contents, props changed) head/graphics/diacanvas2/files/patch-diacanvas_dia-shape.c (contents, props changed) head/graphics/diacanvas2/files/patch-diacanvas_dia-undo-manager.c (contents, props changed) Modified: head/graphics/diacanvas2/Makefile (contents, props changed) Modified: head/graphics/diacanvas2/Makefile ============================================================================== --- head/graphics/diacanvas2/Makefile Tue May 21 11:34:58 2013 (r318676) +++ head/graphics/diacanvas2/Makefile Tue May 21 11:35:49 2013 (r318677) @@ -3,7 +3,7 @@ PORTNAME= diacanvas2 PORTVERSION= 0.15.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics gnome MASTER_SITES= SF/diacanvas/DiaCanvas2/${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A general drawing canvas from dia dialog editor -USES= pathfix +USES= pathfix pkgconfig USE_GNOME= pygnome2 USE_PYTHON= 2.2+ USE_GMAKE= yes @@ -23,6 +23,19 @@ USE_DISPLAY= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +OPTIONS_DEFINE= PRINT +OPTIONS_DEFAULT=PRINT +PRINT_DESC= GNOME print support + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MPRINT} +USE_GNOME+= libgnomeprintui +CONFIGURE_ARGS+=--enable-gnome-print +.else +CONFIGURE_ARGS+=--disable-gnome-print +.endif + post-patch: @${REINPLACE_CMD} -e \ 's|unit_tests doc|unit_tests|g' ${WRKSRC}/Makefile.in Added: head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-editable.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-editable.c Tue May 21 11:35:49 2013 (r318677) @@ -0,0 +1,22 @@ +--- diacanvas/dia-canvas-editable.c.orig 2013-05-21 08:56:55.000000000 +0000 ++++ diacanvas/dia-canvas-editable.c 2013-05-21 08:59:33.000000000 +0000 +@@ -103,7 +103,8 @@ dia_canvas_editable_base_init (gpointer + gboolean + dia_canvas_editable_is_editable (DiaCanvasEditable *editable) + { +- g_return_if_fail (DIA_IS_CANVAS_EDITABLE (editable)); ++ if (!DIA_IS_CANVAS_EDITABLE (editable)) ++ return FALSE; + + if (!DIA_CANVAS_EDITABLE_GET_IFACE (editable)->is_editable) + return TRUE; +@@ -115,7 +116,8 @@ DiaShapeText* + dia_canvas_editable_get_editable_shape (DiaCanvasEditable *editable, + gdouble x, gdouble y) + { +- g_return_if_fail (DIA_IS_CANVAS_EDITABLE (editable)); ++ if (!DIA_IS_CANVAS_EDITABLE (editable)) ++ return NULL; + + if (!DIA_CANVAS_EDITABLE_GET_IFACE (editable)->get_editable_shape) { + g_warning ("DiaCanvasEditable::get_editable_shape not " Added: head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-item.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-item.c Tue May 21 11:35:49 2013 (r318677) @@ -0,0 +1,11 @@ +--- diacanvas/dia-canvas-item.c.orig 2013-05-21 08:53:38.000000000 +0000 ++++ diacanvas/dia-canvas-item.c 2013-05-21 08:55:27.000000000 +0000 +@@ -709,7 +709,7 @@ dia_real_canvas_item_disconnect (DiaCanv + + static void item_button_press_event(DiaCanvasItem *item, gpointer event) + { +- return TRUE; ++ return; + } + + /** Added: head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-view.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas-view.c Tue May 21 11:35:49 2013 (r318677) @@ -0,0 +1,22 @@ +--- diacanvas/dia-canvas-view.c.orig 2013-05-21 09:07:50.000000000 +0000 ++++ diacanvas/dia-canvas-view.c 2013-05-21 09:09:40.000000000 +0000 +@@ -1024,7 +1024,8 @@ + DiaTool* + dia_canvas_view_get_tool (DiaCanvasView *view) + { +- g_return_if_fail (DIA_IS_CANVAS_VIEW (view)); ++ if (!DIA_IS_CANVAS_VIEW (view)) ++ return NULL; + + return view->tool; + } +@@ -1065,7 +1066,8 @@ + DiaTool* + dia_canvas_view_get_default_tool (DiaCanvasView *view) + { +- g_return_if_fail (DIA_IS_CANVAS_VIEW (view)); ++ if (!DIA_IS_CANVAS_VIEW (view)) ++ return NULL; + + return view->default_tool; + } Added: head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diacanvas2/files/patch-diacanvas_dia-canvas.c Tue May 21 11:35:49 2013 (r318677) @@ -0,0 +1,21 @@ +--- diacanvas/dia-canvas.c.orig 2007-05-15 19:26:57.000000000 +0000 ++++ diacanvas/dia-canvas.c 2013-05-21 08:52:10.000000000 +0000 +@@ -17,7 +17,7 @@ + * Boston, MA 02111-1307, USA. + */ + #include <math.h> +-#include <glib/garray.h> ++#include <glib.h> + #include <libart_lgpl/art_rect.h> + #include <libart_lgpl/art_affine.h> + #include <pango/pangoft2.h> +@@ -925,7 +925,8 @@ dia_canvas_redraw_views (DiaCanvas *canv + DiaUndoManager* + dia_canvas_get_undo_manager (DiaCanvas *canvas) + { +- g_return_if_fail (DIA_IS_CANVAS (canvas)); ++ if (! DIA_IS_CANVAS (canvas)) ++ return NULL; + + return canvas->undo_manager; + } Added: head/graphics/diacanvas2/files/patch-diacanvas_dia-default-tool.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diacanvas2/files/patch-diacanvas_dia-default-tool.c Tue May 21 11:35:49 2013 (r318677) @@ -0,0 +1,32 @@ +--- diacanvas/dia-default-tool.c.orig 2013-05-21 09:10:22.000000000 +0000 ++++ diacanvas/dia-default-tool.c 2013-05-21 09:11:26.000000000 +0000 +@@ -302,7 +302,8 @@ dia_default_tool_set_handle_tool (DiaDef + DiaTool* + dia_default_tool_get_handle_tool (DiaDefaultTool *tool) + { +- g_return_if_fail (DIA_IS_DEFAULT_TOOL (tool)); ++ if (!DIA_IS_DEFAULT_TOOL (tool)) ++ return NULL; + + return tool->handle_tool; + } +@@ -323,7 +324,8 @@ dia_default_tool_set_item_tool (DiaDefau + DiaTool* + dia_default_tool_get_item_tool (DiaDefaultTool *tool) + { +- g_return_if_fail (DIA_IS_DEFAULT_TOOL (tool)); ++ if (!DIA_IS_DEFAULT_TOOL (tool)) ++ return NULL; + + return tool->item_tool; + } +@@ -345,7 +347,8 @@ dia_default_tool_set_selection_tool (Dia + DiaTool* + dia_default_tool_get_selection_tool (DiaDefaultTool *tool) + { +- g_return_if_fail (DIA_IS_DEFAULT_TOOL (tool)); ++ if (!DIA_IS_DEFAULT_TOOL (tool)) ++ return NULL; + + return tool->selection_tool; + } Added: head/graphics/diacanvas2/files/patch-diacanvas_dia-shape.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diacanvas2/files/patch-diacanvas_dia-shape.c Tue May 21 11:35:49 2013 (r318677) @@ -0,0 +1,12 @@ +--- diacanvas/dia-shape.c.orig 2013-05-21 09:04:53.000000000 +0000 ++++ diacanvas/dia-shape.c 2013-05-21 09:06:04.000000000 +0000 +@@ -221,7 +221,8 @@ dia_shape_destroy (DiaShape *shape) + DiaShape* + dia_shape_ref (DiaShape *shape) + { +- g_return_if_fail (shape != NULL); ++ if (shape != NULL) ++ return NULL; + + shape->ref_cnt++; + Added: head/graphics/diacanvas2/files/patch-diacanvas_dia-undo-manager.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/diacanvas2/files/patch-diacanvas_dia-undo-manager.c Tue May 21 11:35:49 2013 (r318677) @@ -0,0 +1,32 @@ +--- diacanvas/dia-undo-manager.c.orig 2013-05-21 09:01:02.000000000 +0000 ++++ diacanvas/dia-undo-manager.c 2013-05-21 09:03:46.000000000 +0000 +@@ -195,7 +195,8 @@ dia_undo_manager_base_init (gpointer ifa + gboolean + dia_undo_manager_in_transaction (DiaUndoManager *undo_manager) + { +- g_return_if_fail (DIA_IS_UNDO_MANAGER (undo_manager)); ++ if (!DIA_IS_UNDO_MANAGER (undo_manager)) ++ return FALSE; + + if (!DIA_UNDO_MANAGER_GET_IFACE (undo_manager)->in_transaction) + return FALSE; +@@ -214,7 +215,8 @@ dia_undo_manager_in_transaction (DiaUndo + gboolean + dia_undo_manager_can_undo (DiaUndoManager *undo_manager) + { +- g_return_if_fail (DIA_IS_UNDO_MANAGER (undo_manager)); ++ if (!DIA_IS_UNDO_MANAGER (undo_manager)) ++ return FALSE; + + if (!DIA_UNDO_MANAGER_GET_IFACE (undo_manager)->can_undo) + return FALSE; +@@ -233,7 +235,8 @@ dia_undo_manager_can_undo (DiaUndoManage + gboolean + dia_undo_manager_can_redo (DiaUndoManager *undo_manager) + { +- g_return_if_fail (DIA_IS_UNDO_MANAGER (undo_manager)); ++ if (!DIA_IS_UNDO_MANAGER (undo_manager)) ++ return FALSE; + + if (!DIA_UNDO_MANAGER_GET_IFACE (undo_manager)->can_redo) + return FALSE;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305211135.r4LBZoT5057467>