| 1 |
tetromino 12/04/08 01:14:53 |
| 2 |
|
| 3 |
Added: dia-0.97.2-glib-2.31.patch |
| 4 |
Log: |
| 5 |
Fix building against >=glib-2.31 (bug #401331, thanks to Maciej Piechotka for reporting). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-office/dia/files/dia-0.97.2-glib-2.31.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/files/dia-0.97.2-glib-2.31.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/dia/files/dia-0.97.2-glib-2.31.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: dia-0.97.2-glib-2.31.patch |
| 16 |
=================================================================== |
| 17 |
From e3d41e6dd3488a29d23f53c57526871a9b79e9bf Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 19 |
Date: Sat, 7 Apr 2012 20:43:27 -0400 |
| 20 |
Subject: [PATCH] Do not include glib subheaders directly |
| 21 |
|
| 22 |
Otherwise, dia cannot build against >=glib-2.31 |
| 23 |
|
| 24 |
https://bugzilla.gnome.org/show_bug.cgi?id=673712 |
| 25 |
--- |
| 26 |
objects/custom/shape_typeinfo.c | 2 +- |
| 27 |
tests/test-boundingbox.c | 3 --- |
| 28 |
tests/test-objects.c | 4 ---- |
| 29 |
3 files changed, 1 insertions(+), 8 deletions(-) |
| 30 |
|
| 31 |
diff --git a/objects/custom/shape_typeinfo.c b/objects/custom/shape_typeinfo.c |
| 32 |
index c6133b1..3fb3d73 100644 |
| 33 |
--- a/objects/custom/shape_typeinfo.c |
| 34 |
+++ b/objects/custom/shape_typeinfo.c |
| 35 |
@@ -27,7 +27,7 @@ |
| 36 |
#include "custom_util.h" |
| 37 |
#include <string.h> |
| 38 |
#include <stdarg.h> |
| 39 |
-#include <glib/gstrfuncs.h> |
| 40 |
+#include <glib.h> |
| 41 |
#include <glib/gstdio.h> |
| 42 |
#include <libxml/parser.h> |
| 43 |
|
| 44 |
diff --git a/tests/test-boundingbox.c b/tests/test-boundingbox.c |
| 45 |
index 7adaab5..a13d018 100644 |
| 46 |
--- a/tests/test-boundingbox.c |
| 47 |
+++ b/tests/test-boundingbox.c |
| 48 |
@@ -28,9 +28,6 @@ |
| 49 |
#include <glib.h> |
| 50 |
#include <glib-object.h> |
| 51 |
|
| 52 |
-#if GLIB_CHECK_VERSION(2,16,0) |
| 53 |
-#include <glib/gtestutils.h> |
| 54 |
-#endif |
| 55 |
#include "dialib.h" |
| 56 |
|
| 57 |
/* |
| 58 |
diff --git a/tests/test-objects.c b/tests/test-objects.c |
| 59 |
index 57d5675..c5980a5 100644 |
| 60 |
--- a/tests/test-objects.c |
| 61 |
+++ b/tests/test-objects.c |
| 62 |
@@ -28,10 +28,6 @@ |
| 63 |
#include <glib.h> |
| 64 |
#include <glib-object.h> |
| 65 |
|
| 66 |
-#if GLIB_CHECK_VERSION(2,16,0) |
| 67 |
-#include <glib/gtestutils.h> |
| 68 |
-#endif |
| 69 |
- |
| 70 |
#include "object.h" |
| 71 |
#include "plug-ins.h" |
| 72 |
#include "dialib.h" |
| 73 |
-- |
| 74 |
1.7.8.5 |
Archives