From 7e3410188d98c17291a2b90ebe1d36dda3534b53 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sun, 7 Sep 2014 17:34:16 +0200 Subject: [PATCH] dia: update to 0.97.3. --- srcpkgs/dia/patches/changedFTincluding.patch | 13 --- srcpkgs/dia/patches/glib-crash.patch | 98 -------------------- srcpkgs/dia/template | 6 +- 3 files changed, 3 insertions(+), 114 deletions(-) delete mode 100644 srcpkgs/dia/patches/changedFTincluding.patch delete mode 100644 srcpkgs/dia/patches/glib-crash.patch diff --git a/srcpkgs/dia/patches/changedFTincluding.patch b/srcpkgs/dia/patches/changedFTincluding.patch deleted file mode 100644 index 045c44fe2f0..00000000000 --- a/srcpkgs/dia/patches/changedFTincluding.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- plug-ins/postscript/diapsft2renderer.c.orig 2014-05-07 13:13:51.997988792 +0200 -+++ plug-ins/postscript/diapsft2renderer.c 2014-05-07 13:14:35.810986950 +0200 -@@ -29,8 +29,8 @@ - #include - #include - /* I'd really rather avoid this */ --#include --#include -+#include -+#include - - #define DPI 300 - diff --git a/srcpkgs/dia/patches/glib-crash.patch b/srcpkgs/dia/patches/glib-crash.patch deleted file mode 100644 index f37140bc5b4..00000000000 --- a/srcpkgs/dia/patches/glib-crash.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 213bdfe956bf8fe57c86316f68a09408fef1647e Mon Sep 17 00:00:00 2001 -From: Hans Breuer -Date: Sat, 16 Mar 2013 17:56:58 +0100 -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. - -diff --git a/app/render_gdk.c b/app/render_gdk.c -index f6692dd..23e4226 100644 ---- app/render_gdk.c -+++ app/render_gdk.c -@@ -63,7 +63,21 @@ static void draw_object_highlighted (DiaRenderer *renderer, - DiaObject *object, - DiaHighlightType type); - --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; -@@ -75,35 +89,35 @@ static void dia_gdk_renderer_iface_init (DiaInteractiveRendererInterface* iface) - iface->draw_object_highlighted = draw_object_highlighted; - } - -+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.10.1 diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template index 8deb5624944..42a76512ada 100644 --- a/srcpkgs/dia/template +++ b/srcpkgs/dia/template @@ -1,13 +1,13 @@ # Template file for 'dia' pkgname=dia -version=0.97.2 -revision=2 +version=0.97.3 +revision=1 short_desc="GTK+ based diagram creation program" maintainer="Martin Riese " license="GPL-2" homepage="https://wiki.gnome.org/Apps/Dia" distfiles="http://ftp.gnome.org/pub/gnome/sources/dia/0.97/dia-${version}.tar.xz" -checksum="a761478fb98697f71b00d3041d7c267f3db4b94fe33ac07c689cb89c4fe5eae1" +checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34 build_style=gnu-configure hostmakedepends="pkg-config intltool freetype-devel libxml2-devel" makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"