testing/dia: fix build with recent glib

3 files changed, 82 insertions, 3 deletions

diff --git a/testing/dia/APKBUILD b/testing/dia/APKBUILD
index c23f67152e..fb851e3195 100644
--- a/testing/dia/APKBUILD
+++ b/testing/dia/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dia
 pkgver=0.97.2
-pkgrel=1
+pkgrel=2
 pkgdesc="a GTK+ based diagram creation program"
 url="http://live.gnome.org/Dia"
 arch="all"
@@ -13,7 +13,10 @@ install=""
 subpackages="$pkgname-doc $pkgname-lang"
 source="http://ftp.gnome.org/pub/gnome/sources/dia/${pkgver%.*}/dia-$pkgver.tar.xz
 	isinf.patch
-	isfinite.patch"
+	isfinite.patch
+	dia-noglib.patch
+	dia-unregister-import.patch
+	"
 
 _builddir="$srcdir"/dia-$pkgver
 prepare() {
@@ -45,4 +48,6 @@ package() {
 
 md5sums="1e1180a513fb567709b09bc19f12105e  dia-0.97.2.tar.xz
 cbbc32d417297b855353f86b484b369b  isinf.patch
-eda8e89483e97473d983b048f834861a  isfinite.patch"
+eda8e89483e97473d983b048f834861a  isfinite.patch
+74ac2916d6e30cad4b2843a86ee2faad  dia-noglib.patch
+888dd98e05d657e27842acdb0d91d73b  dia-unregister-import.patch"
diff --git a/testing/dia/dia-noglib.patch b/testing/dia/dia-noglib.patch
new file mode 100644
index 0000000000..d91477a978
--- /dev/null
+++ b/testing/dia/dia-noglib.patch
@@ -0,0 +1,37 @@
+--- ./objects/custom/shape_typeinfo.c.orig	2011-12-08 12:41:12.136625698 +0000
++++ ./objects/custom/shape_typeinfo.c	2011-12-08 12:41:44.584639234 +0000
+@@ -27,8 +27,7 @@
+ #include "custom_util.h"
+ #include <string.h>
+ #include <stdarg.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstdio.h>
++#include <glib.h>
+ #include <libxml/parser.h>
+ 
+ /*
+--- ./tests/test-boundingbox.c.orig	2012-02-25 20:05:15.571090400 -0600
++++ ./tests/test-boundingbox.c	2012-02-25 20:07:28.884033790 -0600
+@@ -28,9 +28,6 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
+-#if GLIB_CHECK_VERSION(2,16,0)
+-#include <glib/gtestutils.h>
+-#endif
+ #include "dialib.h"
+ 
+ /*
+--- ./tests/test-objects.c.orig	2012-02-25 20:08:16.230051224 -0600
++++ ./tests/test-objects.c	2012-02-25 20:08:31.849036318 -0600
+@@ -28,10 +28,6 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
+-#if GLIB_CHECK_VERSION(2,16,0)
+-#include <glib/gtestutils.h>
+-#endif
+-
+ #include "object.h"
+ #include "plug-ins.h"
+ #include "dialib.h"
diff --git a/testing/dia/dia-unregister-import.patch b/testing/dia/dia-unregister-import.patch
new file mode 100644
index 0000000000..15feba0cac
--- /dev/null
+++ b/testing/dia/dia-unregister-import.patch
@@ -0,0 +1,37 @@
+From a6e2409b85414b3d82dacd390ce9c9f007e254e8 Mon Sep 17 00:00:00 2001
+From: Jiri Popelka <jpopelka@redhat.com>
+Date: Wed, 5 Sep 2012 11:12:59 +0200
+Subject: [PATCH] Unregister vdx, xfig import filters during plugin unloading.
+
+---
+ plug-ins/vdx/vdx.c   | 1 +
+ plug-ins/xfig/xfig.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/plug-ins/vdx/vdx.c b/plug-ins/vdx/vdx.c
+index 64bc4b0..82ddc4b 100644
+--- a/plug-ins/vdx/vdx.c
++++ b/plug-ins/vdx/vdx.c
+@@ -43,6 +43,7 @@ static void
+ _plugin_unload (PluginInfo *info)
+ {
+     filter_unregister_export(&vdx_export_filter);
++    filter_unregister_import(&vdx_import_filter);
+ }
+ 
+ 
+diff --git a/plug-ins/xfig/xfig.c b/plug-ins/xfig/xfig.c
+index 966c294..10d68aa 100644
+--- a/plug-ins/xfig/xfig.c
++++ b/plug-ins/xfig/xfig.c
+@@ -41,6 +41,7 @@ static void
+ _plugin_unload (PluginInfo *info)
+ {
+     filter_unregister_export(&xfig_export_filter);
++    filter_unregister_import(&xfig_import_filter);
+ }
+ 
+ 
+-- 
+1.7.11.4
+