pool/dia
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 94865 from home:dimstar:branches:GNOME:Apps

Browse Source 
Fix build with glib 2.31

OBS-URL: https://build.opensuse.org/request/show/94865
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/dia?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2011-12-01 21:10:58 +00:00 committed by Git OBS Bridge
parent 4e83288f49
commit 3a7b5f2b00
3 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dia-glib-2.31.patch Normal file
View File

@ -0,0 +1,52 @@
Index: dia-0.97.1/objects/custom/shape_typeinfo.c
===================================================================
--- dia-0.97.1.orig/objects/custom/shape_typeinfo.c
+++ dia-0.97.1/objects/custom/shape_typeinfo.c
@@ -27,7 +27,7 @@
#include "custom_util.h"
#include <string.h>
#include <stdarg.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
#include <glib/gstdio.h>
#include <libxml/parser.h>
Index: dia-0.97.1/plug-ins/pgf/render_pgf.c
===================================================================
--- dia-0.97.1.orig/plug-ins/pgf/render_pgf.c
+++ dia-0.97.1/plug-ins/pgf/render_pgf.c
@@ -61,7 +61,7 @@ TODO:
#endif
#include <errno.h>
-#include <glib/gprintf.h>
+#include <glib.h>
#include <glib/gstdio.h>
#include "intl.h"
Index: dia-0.97.1/tests/test-boundingbox.c
===================================================================
--- dia-0.97.1.orig/tests/test-boundingbox.c
+++ dia-0.97.1/tests/test-boundingbox.c
@@ -28,7 +28,7 @@
#include <glib.h>
#include <glib-object.h>
-#if GLIB_CHECK_VERSION(2,16,0)
+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
#include <glib/gtestutils.h>
#endif
#include "dialib.h"
Index: dia-0.97.1/tests/test-objects.c
===================================================================
--- dia-0.97.1.orig/tests/test-objects.c
+++ dia-0.97.1/tests/test-objects.c
@@ -28,7 +28,7 @@
#include <glib.h>
#include <glib-object.h>
-#if GLIB_CHECK_VERSION(2,16,0)
+#if GLIB_CHECK_VERSION(2,16,0) && !GLIB_CHECK_VERSION(2,31,0)
#include <glib/gtestutils.h>
#endif

5
dia.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Dec 1 21:09:34 UTC 2011 - dimstar@opensuse.org
- Add dia-glib-2.31.patch: Fix build with glib 2.31.
-------------------------------------------------------------------
Fri Sep 30 20:07:54 UTC 2011 - coolo@suse.com

3
dia.spec
View File

@ -57,6 +57,8 @@ Patch14: dia-python-acinclude.patch
Patch17: dia-remove-datetime.patch
# PATCH-FIX-UPSTREAM dia-swig-2x.patch bgo#651127 idoenmez@suse.de -- Support swig 2.x
Patch18: dia-swig-2x.patch
# PATCH-FIX-UPSTREAM dia-glib-2.31.patch bgo#655335 dimstar@opensuse.org -- Fix build with glib 2.31.
Patch19: dia-glib-2.31.patch
Url: http://live.gnome.org/Dia
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang
@ -82,6 +84,7 @@ translation-update-upstream
%patch14
%patch17 -p1
%patch18
%patch19 -p1
cp $RPM_SOURCE_DIR/font-test*dia .
%build