From f5f16cfd93a737191796769224128d7cd2482bd50ee08625ec5f96bb3415ba9f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 29 Jan 2008 00:38:06 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=11 --- inkscape-g_assert.patch | 318 ++++++++++++++++++++++++++++++++++++++++ inkscape.changes | 5 + inkscape.spec | 88 +++++------ 3 files changed, 369 insertions(+), 42 deletions(-) create mode 100644 inkscape-g_assert.patch diff --git a/inkscape-g_assert.patch b/inkscape-g_assert.patch new file mode 100644 index 0000000..e7bc0f1 --- /dev/null +++ b/inkscape-g_assert.patch @@ -0,0 +1,318 @@ +=== modified file 'src/attributes.cpp' +--- src/attributes.cpp 2008-01-28 23:20:47 +0000 ++++ src/attributes.cpp 2008-01-28 23:21:23 +0000 +@@ -17,6 +17,7 @@ + # include "config.h" + #endif + ++#include + #include + #include "attributes.h" + + +=== modified file 'src/color-rgba.h' +--- src/color-rgba.h 2008-01-28 23:20:47 +0000 ++++ src/color-rgba.h 2008-01-28 23:35:51 +0000 +@@ -12,6 +12,7 @@ + #ifndef SEEN_COLOR_RGBA_H + #define SEEN_COLOR_RGBA_H + ++#include + #include + #include "libnr/nr-pixops.h" + #include "decimal-round.h" + +=== modified file 'src/display/bezier-utils.cpp' +--- src/display/bezier-utils.cpp 2008-01-28 23:20:47 +0000 ++++ src/display/bezier-utils.cpp 2008-01-28 23:33:40 +0000 +@@ -33,6 +33,7 @@ + # include + #endif + ++#include + #include + #include + #include "bezier-utils.h" + +=== modified file 'src/helper/sp-marshal.cpp' +--- src/helper/sp-marshal.cpp 2008-01-28 23:20:47 +0000 ++++ src/helper/sp-marshal.cpp 2008-01-28 23:37:47 +0000 +@@ -57,10 +57,10 @@ + /* NONE:POINTER,BOOLEAN (./helper/sp-marshal.list:5) */ + void + sp_marshal_VOID__POINTER_BOOLEAN (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef void (*GMarshalFunc_VOID__POINTER_BOOLEAN) (gpointer data1, +@@ -94,10 +94,10 @@ + /* NONE:POINTER,UINT (./helper/sp-marshal.list:6) */ + void + sp_marshal_VOID__POINTER_UINT (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef void (*GMarshalFunc_VOID__POINTER_UINT) (gpointer data1, +@@ -131,10 +131,10 @@ + /* NONE:POINTER,DOUBLE (./helper/sp-marshal.list:7) */ + void + sp_marshal_VOID__POINTER_DOUBLE (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef void (*GMarshalFunc_VOID__POINTER_DOUBLE) (gpointer data1, +@@ -168,10 +168,10 @@ + /* NONE:DOUBLE,DOUBLE (./helper/sp-marshal.list:8) */ + void + sp_marshal_VOID__DOUBLE_DOUBLE (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef void (*GMarshalFunc_VOID__DOUBLE_DOUBLE) (gpointer data1, +@@ -205,10 +205,10 @@ + /* NONE:STRING,BOOL (./helper/sp-marshal.list:9) */ + void + sp_marshal_VOID__STRING_BOOLEAN (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef void (*GMarshalFunc_VOID__STRING_BOOLEAN) (gpointer data1, +@@ -242,10 +242,10 @@ + /* BOOLEAN:NONE (./helper/sp-marshal.list:10) */ + void + sp_marshal_BOOLEAN__VOID (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef gboolean (*GMarshalFunc_BOOLEAN__VOID) (gpointer data1, +@@ -279,10 +279,10 @@ + /* BOOLEAN:UINT (./helper/sp-marshal.list:11) */ + void + sp_marshal_BOOLEAN__UINT (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef gboolean (*GMarshalFunc_BOOLEAN__UINT) (gpointer data1, +@@ -318,10 +318,10 @@ + /* BOOLEAN:POINTER (./helper/sp-marshal.list:12) */ + void + sp_marshal_BOOLEAN__POINTER (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER) (gpointer data1, +@@ -357,10 +357,10 @@ + /* BOOLEAN:POINTER,UINT (./helper/sp-marshal.list:13) */ + void + sp_marshal_BOOLEAN__POINTER_UINT (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_UINT) (gpointer data1, +@@ -398,10 +398,10 @@ + /* BOOLEAN:POINTER,POINTER (./helper/sp-marshal.list:14) */ + void + sp_marshal_BOOLEAN__POINTER_POINTER (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer data1, +@@ -439,10 +439,10 @@ + /* INT:POINTER,POINTER (./helper/sp-marshal.list:15) */ + void + sp_marshal_INT__POINTER_POINTER (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef gint (*GMarshalFunc_INT__POINTER_POINTER) (gpointer data1, +@@ -480,10 +480,10 @@ + /* DOUBLE:POINTER,UINT (./helper/sp-marshal.list:16) */ + void + sp_marshal_DOUBLE__POINTER_UINT (GClosure *closure, +- GValue *return_value, ++ GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, +- gpointer invocation_hint, ++ gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) + { + typedef gdouble (*GMarshalFunc_DOUBLE__POINTER_UINT) (gpointer data1, + +=== modified file 'src/helper/units.cpp' +--- src/helper/units.cpp 2008-01-28 23:20:47 +0000 ++++ src/helper/units.cpp 2008-01-28 23:38:40 +0000 +@@ -19,6 +19,7 @@ + # include "config.h" + #endif + ++#include + #include "helper/units.h" + #include + #include "unit-constants.h" + +=== modified file 'src/io/resource.cpp' +--- src/io/resource.cpp 2008-01-28 23:20:47 +0000 ++++ src/io/resource.cpp 2008-01-28 23:40:15 +0000 +@@ -16,6 +16,8 @@ + #include "config.h" + #endif + ++#include ++ + #include + #include + #include + +=== modified file 'src/libnr/nr-matrix.h' +--- src/libnr/nr-matrix.h 2008-01-28 23:20:47 +0000 ++++ src/libnr/nr-matrix.h 2008-01-28 23:26:28 +0000 +@@ -17,6 +17,7 @@ + * This code is in public domain. + */ + ++#include + #include + + #include "libnr/nr-coord.h" + +=== modified file 'src/svg/svg-color.cpp' +--- src/svg/svg-color.cpp 2008-01-28 23:20:47 +0000 ++++ src/svg/svg-color.cpp 2008-01-28 23:49:06 +0000 +@@ -22,6 +22,7 @@ + #include "svg-icc-color.h" + #include + #include ++#include + #include + #include + #include + +=== modified file 'src/svg/svg-path.cpp' +--- src/svg/svg-path.cpp 2008-01-28 23:20:47 +0000 ++++ src/svg/svg-path.cpp 2008-01-28 23:49:27 +0000 +@@ -27,6 +27,7 @@ + */ + + #include ++#include + #include + #include + #include + +=== modified file 'src/xml/composite-node-observer.cpp' +--- src/xml/composite-node-observer.cpp 2008-01-28 23:20:47 +0000 ++++ src/xml/composite-node-observer.cpp 2008-01-28 23:49:50 +0000 +@@ -12,6 +12,7 @@ + * + */ + ++#include + #include + #include "algorithms/find-if-before.h" + #include "xml/composite-node-observer.h" + +=== modified file 'src/xml/event.cpp' +--- src/xml/event.cpp 2008-01-28 23:20:47 +0000 ++++ src/xml/event.cpp 2008-01-28 23:52:19 +0000 +@@ -13,6 +13,7 @@ + * Released under GNU GPL, read the file 'COPYING' for more information + */ + ++#include + #include "event.h" + #include "event-fns.h" + #include "util/reverse-list.h" + +=== modified file 'src/xml/node-fns.cpp' +--- src/xml/node-fns.cpp 2008-01-28 23:20:47 +0000 ++++ src/xml/node-fns.cpp 2008-01-28 23:50:19 +0000 +@@ -2,6 +2,7 @@ + # include "config.h" + #endif + ++#include + #include + #include + #include + +=== modified file 'src/xml/repr-css.cpp' +--- src/xml/repr-css.cpp 2008-01-28 23:20:47 +0000 ++++ src/xml/repr-css.cpp 2008-01-28 23:50:05 +0000 +@@ -4,7 +4,7 @@ + + #define SP_REPR_CSS_C + +- ++#include + #include + #include + #include "xml/repr.h" + +=== modified file 'src/xml/simple-node.h' +--- src/xml/simple-node.h 2008-01-28 23:20:47 +0000 ++++ src/xml/simple-node.h 2008-01-28 23:50:38 +0000 +@@ -15,6 +15,7 @@ + #ifndef SEEN_INKSCAPE_XML_SIMPLE_NODE_H + #define SEEN_INKSCAPE_XML_SIMPLE_NODE_H + ++#include + #include "xml/node.h" + #include "xml/attribute-record.h" + #include "xml/transaction-logger.h" + diff --git a/inkscape.changes b/inkscape.changes index b33a337..bfeb5a3 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 28 17:59:41 CST 2008 - maw@suse.de + +- Add inkscape-g_assert.patch. + ------------------------------------------------------------------- Fri Jan 11 10:41:20 CET 2008 - coolo@suse.de diff --git a/inkscape.spec b/inkscape.spec index f65a80a..b2241a4 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -18,7 +18,7 @@ Requires: cairomm ghostscript-fonts-std python-gtk python-numeric pstoedit AutoReqProv: on Summary: Inkscape Vector Illustration Program Version: 0.45.1 -Release: 119 +Release: 120 Provides: sodipodi Obsoletes: sodipodi PreReq: /bin/rm /bin/ln /bin/sh /usr/bin/perl @@ -34,6 +34,7 @@ Patch10: gc6.4.patch Patch13: %{name}-polyutil-newpoly.patch Patch14: %{name}-buffer-overrun.patch Patch15: inkscape-0.45.1-gcc43.patch +Patch16: inkscape-g_assert.patch Url: http://www.inkscape.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -99,6 +100,7 @@ Authors: %patch13 %patch14 -p1 %patch15 -p1 +%patch16 pushd ../gc* %patch10 popd @@ -179,46 +181,48 @@ rm -rf $RPM_BUILD_ROOT %files lang -f %{name}.lang %changelog -* Fri Jan 11 2008 - coolo@suse.de +* Mon Jan 28 2008 maw@suse.de +- Add inkscape-g_assert.patch. +* Fri Jan 11 2008 coolo@suse.de - take more gcc43 patches from SVN -* Sat Nov 10 2007 - mauro@suse.de +* Sat Nov 10 2007 mauro@suse.de - Added inkscape-0.45.1-gcc43.patch + Fixes issues with gcc 4.3. -* Wed Aug 08 2007 - maw@suse.de +* Tue Aug 07 2007 maw@suse.de - Use %%fdupes - Split off a -lang subpackage. -* Thu May 10 2007 - prusnak@suse.cz +* Thu May 10 2007 prusnak@suse.cz - recommends pyxml [#271758] -* Wed Apr 18 2007 - aj@suse.de +* Wed Apr 18 2007 aj@suse.de - Fix spec list so that package builds again. -* Thu Mar 29 2007 - maw@suse.de +* Thu Mar 29 2007 maw@suse.de - Update to version 0.45 - Remove upstreamed inkscape-siox-max.patch - Remove now-unnecessary inkscape-session-manager-strcmp.patch and inkscape-enable-perl.patch - Add inkscape-buffer-overrun.patch -* Wed Jan 31 2007 - sbrabec@suse.cz +* Wed Jan 31 2007 sbrabec@suse.cz - Removed remaining references to /opt/gnome (#240571). -* Tue Jan 23 2007 - prusnak@suse.cz +* Tue Jan 23 2007 prusnak@suse.cz - fixed build errors * polyutil-newpoly.patch - uninitialized structure * session-manager-strcmp.patch - comparing char* w/ string literal -* Mon Jan 22 2007 - sbrabec@suse.cz +* Mon Jan 22 2007 sbrabec@suse.cz - Prefix changed to /usr. - Spec file cleanup. -* Thu Jan 04 2007 - prusnak@suse.cz +* Thu Jan 04 2007 prusnak@suse.cz - fixed illegal comparison (siox-max.patch) [#231224] -* Mon Nov 06 2006 - jhargadon@suse.de +* Mon Nov 06 2006 jhargadon@suse.de - applied a patch that fixes a problem where the package would not compile with the --with-perl option. -* Sat Oct 21 2006 - schwab@suse.de +* Sat Oct 21 2006 schwab@suse.de - Don't use obsolete macro. -* Fri Oct 13 2006 - danw@suse.de +* Fri Oct 13 2006 danw@suse.de - Remove dead patches -* Thu Oct 05 2006 - jhargadon@suse.de +* Thu Oct 05 2006 jhargadon@suse.de - added --datadir=%%prefix/share as a configuration option. This is a work around for bug #204719 -* Fri Sep 29 2006 - jhargadon@suse.de +* Fri Sep 29 2006 jhargadon@suse.de - update to version 0.44.1 - Layers dialog - Outline mode, many performance improvements @@ -232,61 +236,61 @@ rm -rf $RPM_BUILD_ROOT - Persistent rotation centers, Paste Size command - many bug fixes - removed the --with-perl option from configuration in the specfile -* Sat Sep 09 2006 - meissner@suse.de +* Sat Sep 09 2006 meissner@suse.de - use RPM_OPT_FLAGS. -* Wed Aug 16 2006 - cthiel@suse.de +* Wed Aug 16 2006 cthiel@suse.de - buildrequire python-gtk-devel instead of python-gtk -* Fri Jul 07 2006 - jpr@suse.de +* Fri Jul 07 2006 jpr@suse.de - add patch to not use freetype2 internals -* Sat Feb 18 2006 - stbinner@suse.de +* Sat Feb 18 2006 stbinner@suse.de - fix typo .desktop file -* Sat Feb 18 2006 - gekker@suse.de +* Fri Feb 17 2006 gekker@suse.de - fixup .desktop file for UI team -* Tue Jan 31 2006 - ro@suse.de +* Mon Jan 30 2006 ro@suse.de - take fix from swig to swig-generated source file -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Nov 23 2005 - sbrabec@suse.cz +* Wed Nov 23 2005 sbrabec@suse.cz - Updated to version 0.43 (#134655). - Enabled Inkboard Collaborative Editing. -* Mon Nov 07 2005 - sbrabec@suse.cz +* Mon Nov 07 2005 sbrabec@suse.cz - Fixed qualification and type conversion errors. -* Thu Aug 25 2005 - nadvornik@suse.cz +* Thu Aug 25 2005 nadvornik@suse.cz - updated to bugfix release 0.42.2 [#112918] -* Mon Aug 01 2005 - ro@suse.de +* Mon Aug 01 2005 ro@suse.de - added dir to filelist /usr/share/man/fr/man1 -* Fri Jul 29 2005 - sbrabec@suse.cz +* Fri Jul 29 2005 sbrabec@suse.cz - Updated to version 0.42. -* Tue May 31 2005 - schwab@suse.de +* Tue May 31 2005 schwab@suse.de - Fix more invalid casts. -* Wed May 18 2005 - ro@suse.de +* Wed May 18 2005 ro@suse.de - fix build with current pkgconfig -* Thu Apr 28 2005 - sbrabec@suse.cz +* Thu Apr 28 2005 sbrabec@suse.cz - Build boehm-gc with -fPIC and -fno-strict-aliasing. -* Wed Apr 27 2005 - ro@suse.de +* Wed Apr 27 2005 ro@suse.de - remove boehm-gc from nfb (dropped) - use private copy of gc6.4 -* Tue Apr 26 2005 - sbrabec@suse.cz +* Tue Apr 26 2005 sbrabec@suse.cz - Install missing translation files. -* Mon Apr 11 2005 - sbrabec@suse.cz +* Mon Apr 11 2005 sbrabec@suse.cz - Fixed invalid casts. -* Mon Mar 21 2005 - sbrabec@suse.cz +* Mon Mar 21 2005 sbrabec@suse.cz - Bi-arch fix (#66780). - Require skencil needed for PS/EPS input (#66780). -* Mon Feb 28 2005 - sbrabec@suse.cz +* Mon Feb 28 2005 sbrabec@suse.cz - Added needed Requires and triggers for optional extensions (#66780). - Turned on perl, python and gnome-print support. -* Mon Feb 21 2005 - sbrabec@suse.cz +* Mon Feb 21 2005 sbrabec@suse.cz - Updated to version 0.41. - Worked around problems with boehm-gc detection. -* Fri Feb 11 2005 - sbrabec@suse.cz +* Fri Feb 11 2005 sbrabec@suse.cz - Updated to version 0.40. -* Fri Feb 11 2005 - ro@suse.de +* Thu Feb 10 2005 ro@suse.de - change to libsigc++12 in neededforbuild -* Tue Nov 02 2004 - mmj@suse.de +* Tue Nov 02 2004 mmj@suse.de - Locale rename: no -> nb -* Thu Aug 12 2004 - hhetter@suse.de +* Thu Aug 12 2004 hhetter@suse.de - Obsolete and Provide sodipodi -* Mon Aug 02 2004 - hhetter@suse.de +* Mon Aug 02 2004 hhetter@suse.de - initial SuSE package