[109938] trunk/dports/gnome/dia

[ryandesign at macports.org]

Revision: 109938
          https://trac.macports.org/changeset/109938
Author:   ryandesign at macports.org
Date:     2013-08-22 05:31:37 -0700 (Thu, 22 Aug 2013)
Log Message:
-----------
dia: fix crash on start caused by glib2 @2.36 removing a feature dia was using (#39027)

Modified Paths:
--------------
    trunk/dports/gnome/dia/Portfile

Added Paths:
-----------
    trunk/dports/gnome/dia/files/0004-7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0.patch

Modified: trunk/dports/gnome/dia/Portfile
===================================================================
--- trunk/dports/gnome/dia/Portfile	2013-08-22 12:15:44 UTC (rev 109937)
+++ trunk/dports/gnome/dia/Portfile	2013-08-22 12:31:37 UTC (rev 109938)
@@ -6,7 +6,7 @@
 
 name            dia
 version         0.97.2
-revision        3
+revision        4
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     nomaintainer
 license         GPL-2+
@@ -38,6 +38,11 @@
     0002-ae61326cf5e7aaba6e72af757a5cd33efe8280a1.patch \
     0003-3a589dedfbf2b0ada111a3e2cb6b14837f2c8b5e.patch
 
+# backport patches for glib 2.36 compatibility and to fix crash on
+# start (#39027)
+patchfiles-append \
+    0004-7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0.patch
+
 post-patch {
     reinplace s/isspecial/char_isspecial/ \
         ${worksrcpath}/objects/GRAFCET/boolequation.c

Added: trunk/dports/gnome/dia/files/0004-7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0.patch
===================================================================
--- trunk/dports/gnome/dia/files/0004-7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0.patch	                        (rev 0)
+++ trunk/dports/gnome/dia/files/0004-7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0.patch	2013-08-22 12:31:37 UTC (rev 109938)
@@ -0,0 +1,100 @@
+From 7ac3e9ffac09f99a1aa2fe97a4dc0a688c9746b0 Mon Sep 17 00:00:00 2001
+From: Hans Breuer <hans at breuer.org>
+Date: Sat, 16 Mar 2013 16:56:58 +0000
+Subject: Bug 694025 - GLib drop support for adding interfaces after class_init
+
+Without this Dia crashes at startup with new GLib version and the
+DiaGdkRenderer being default. Make a new DiaGdkInteractiveRenderer which
+follows the pattern also used for DiaCairoInteraciveRenderer. This should
+be functional equivalent to what was there before and should work for all
+current GLib versions.
+
+(cherry picked from commit 213bdfe956bf8fe57c86316f68a09408fef1647e)
+---
+diff --git a/app/render_gdk.c b/app/render_gdk.c
+index 60ccb7a..b1e7ba4 100644
+--- a/app/render_gdk.c
++++ b/app/render_gdk.c
+@@ -50,7 +50,21 @@ static void copy_to_window (DiaRenderer *renderer,
+                 gpointer window,
+                 int x, int y, int width, int height);
+ 
+-static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
++typedef struct _DiaGdkInteractiveRenderer DiaGdkInteractiveRenderer;
++struct _DiaGdkInteractiveRenderer
++{
++  DiaGdkRenderer parent_instance; /*!< inheritance in object oriented C */
++};
++typedef struct _DiaGdkInteractiveRendererClass DiaGdkInteractiveRendererClass;
++struct _DiaGdkInteractiveRendererClass
++{
++  DiaGdkRendererClass parent_class; /*!< the base class */
++};
++#define DIA_TYPE_GDK_INTERACTIVE_RENDERER           (dia_gdk_interactive_renderer_get_type ())
++#define DIA_GDK_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_GDK_INTERACTIVE_RENDERER, DiaGdkInteractiveRenderer))
++
++static void
++dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
+ {
+   iface->clip_region_clear = clip_region_clear;
+   iface->clip_region_add_rect = clip_region_add_rect;
+@@ -61,35 +75,35 @@ static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface)
+   iface->set_size = set_size;
+ }
+ 
++G_DEFINE_TYPE_WITH_CODE (DiaGdkInteractiveRenderer, dia_gdk_interactive_renderer, DIA_TYPE_GDK_RENDERER,
++			 G_IMPLEMENT_INTERFACE (DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE, dia_gdk_renderer_iface_init));
++
++static void
++dia_gdk_interactive_renderer_class_init(DiaGdkInteractiveRendererClass *klass)
++{
++}
++static void
++dia_gdk_interactive_renderer_init(DiaGdkInteractiveRenderer *object)
++{
++  DiaGdkInteractiveRenderer *ia_renderer = DIA_GDK_INTERACTIVE_RENDERER (object);
++  DiaGdkRenderer *renderer = DIA_GDK_RENDERER(object);
++  DiaRenderer *dia_renderer = DIA_RENDERER(object);
++  
++  dia_renderer->is_interactive = 1;
++
++  renderer->gc = NULL;
++  renderer->pixmap = NULL;
++  renderer->clip_region = NULL;
++}
++
+ DiaRenderer *
+ new_gdk_renderer(DDisplay *ddisp)
+ {
+   DiaGdkRenderer *renderer;
+   GType renderer_type = 0;
+ 
+-  renderer = g_object_new (DIA_TYPE_GDK_RENDERER, NULL);
++  renderer = g_object_new (DIA_TYPE_GDK_INTERACTIVE_RENDERER, NULL);
+   renderer->transform = dia_transform_new (&ddisp->visible, &ddisp->zoom_factor);
+-  if (!DIA_GET_INTERACTIVE_RENDERER_INTERFACE (renderer))
+-    {
+-      static const GInterfaceInfo irenderer_iface_info = 
+-      {
+-        (GInterfaceInitFunc) dia_gdk_renderer_iface_init,
+-        NULL,           /* iface_finalize */
+-        NULL            /* iface_data     */
+-      };
+-
+-      renderer_type = DIA_TYPE_GDK_RENDERER;
+-      /* register the interactive renderer interface */
+-      g_type_add_interface_static (renderer_type,
+-                                   DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE,
+-                                   &irenderer_iface_info);
+-
+-    }
+-  renderer->parent_instance.is_interactive = 1;
+-  renderer->gc = NULL;
+-
+-  renderer->pixmap = NULL;
+-  renderer->clip_region = NULL;
+ 
+   return DIA_RENDERER(renderer);
+ }
+--
+cgit v0.9.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130822/26e5c7f5/attachment-0001.html>