- gcc4 fix, release 6.

Changed files:
    dia-gcc4.patch -> 1.1
    dia.spec -> 1.116

diff --git a/dia-gcc4.patch b/dia-gcc4.patch
new file mode 100644 (file)
index 0000000..e4610c1
--- /dev/null
+++ b/dia-gcc4.patch
@@ -0,0 +1,25 @@
+--- dia-0.94/objects/custom/shape_info.c.orig  2004-08-16 09:56:15.000000000 +0200
++++ dia-0.94/objects/custom/shape_info.c       2005-05-11 19:55:34.000000000 +0200
+@@ -116,7 +116,7 @@
+ /* routine to chomp off the start of the string */
+ #define path_chomp(path) while (path[0]!='\0'&&strchr(" \t\n\r,", path[0])) path++
+ 
+-static void
++void
+ parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle *s)
+ {
+   enum {
+--- dia-0.94/plug-ins/python/pydia-object.h.orig       2004-08-16 09:56:20.000000000 +0200
++++ dia-0.94/plug-ins/python/pydia-object.h    2005-05-11 20:11:57.000000000 +0200
+@@ -20,10 +20,9 @@
+ #ifndef PYDIA_OBJECT_H
+ #define PYDIA_OBJECT_H
+ 
++#include <object.h>
+ #include <Python.h>
+ 
+-#include "object.h"
+-
+ typedef struct {
+     PyObject_HEAD
+     DiaObject *object;

diff --git a/dia.spec b/dia.spec
index 03e872469ccd45303103d6c7564efb15587867a9..d9560a7d6506f088ff247ac9c233e49d76aa28cf 100644 (file)
--- a/dia.spec
+++ b/dia.spec
@@ -11,7 +11,7 @@ Summary(uk):  
 Summary(zh_CN):        »ùÓÚGTK+µÄÁ÷³Ìͼ³ÌÐò
 Name:          dia
 Version:       0.94
-Release:       5
+Release:       6
 Epoch:         1
 License:       GPL
 Group:         X11/Applications/Graphics
@@ -25,6 +25,7 @@ Source0:      http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.94/%{name}-%{version}.
 Patch2:                %{name}-locale-names.patch
 Patch3:                %{name}-python.patch
 Patch4:                %{name}-desktop.patch
+Patch5:                %{name}-gcc4.patch
 URL:           http://www.gnome.org/projects/dia/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -98,6 +99,7 @@ PostScript(TM).
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 mv po/{no,nb}.po