OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Jan-2006 22:04:55
Branch: HEAD Handle: 2006010221045400
Added files:
openpkg-src/dia dia.patch
Modified files:
openpkg-src/dia dia.spec
Log:
fix building under GCC 4 world order
Summary:
Revision Changes Path
1.1 +12 -0 openpkg-src/dia/dia.patch
1.28 +3 -1 openpkg-src/dia/dia.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dia/dia.patch
============================================================================
$ cvs diff -u -r0 -r1.1 dia.patch
--- /dev/null 2006-01-02 22:04:53 +0100
+++ dia.patch 2006-01-02 22:04:55 +0100
@@ -0,0 +1,12 @@
+Index: objects/custom/shape_info.h
+--- objects/custom/shape_info.h.orig 2004-08-16 09:56:15 +0200
++++ objects/custom/shape_info.h 2006-01-02 21:50:52 +0100
+@@ -166,7 +166,7 @@
+
+ void shape_info_realise(ShapeInfo* info);
+ void shape_info_print(ShapeInfo *info);
+-void parse_path(ShapeInfo *info, const char *path_str, DiaSvgGraphicStyle
*s);
++static void parse_path(ShapeInfo *info, const char *path_str,
DiaSvgGraphicStyle *s);
+
+ /*MC 11/03 handy g_new0 variant for struct with variable size */
+ #define g_new0_ext(struct_type, ext_size) \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dia/dia.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 dia.spec
--- openpkg-src/dia/dia.spec 1 Jan 2006 13:13:06 -0000 1.27
+++ openpkg-src/dia/dia.spec 2 Jan 2006 21:04:54 -0000 1.28
@@ -37,10 +37,11 @@
Group: Graphics
License: GPL
Version: %{V_major}
-Release: 20050206
+Release: 20060102
# list of sources
Source0:
ftp://ftp.gnome.org/pub/gnome/sources/dia/%{V_major}/dia-%{V_major}.tar.bz2
+Patch0: dia.patch
# build information
Prefix: %{l_prefix}
@@ -77,6 +78,7 @@
%prep
%setup -q -n dia-%{V_major}
+ %patch -p0
%build
%{l_shtool} subst \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
