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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=25

Browse Source
This commit is contained in:
OBS User unknown 2009-05-04 16:12:24 +00:00 committed by Git OBS Bridge
parent 15a484b247
commit 3161224020
3 changed files with 386 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

375
inkscape-gcc44.patch Normal file
View File

@ -0,0 +1,375 @@
Index: src/dom/lsimpl.cpp
===================================================================
--- src/dom/lsimpl.cpp.orig
+++ src/dom/lsimpl.cpp
@@ -33,6 +33,7 @@
#include "lsimpl.h"
#include <stdarg.h>
+#include <cstdio>
namespace org
{
Index: src/dom/domimpl.cpp
===================================================================
--- src/dom/domimpl.cpp.orig
+++ src/dom/domimpl.cpp
@@ -28,6 +28,7 @@
*/
+#include <cstdio>
#include "domimpl.h"
namespace org
Index: src/dom/io/domstream.h
===================================================================
--- src/dom/io/domstream.h.orig
+++ src/dom/io/domstream.h
@@ -30,7 +30,7 @@
*/
-
+#include <cstdio>
#include <dom/dom.h>
namespace org
Index: src/dom/io/uristream.cpp
===================================================================
--- src/dom/io/uristream.cpp.orig
+++ src/dom/io/uristream.cpp
@@ -41,6 +41,8 @@
#include "uristream.h"
+#include <cstdio>
+#include <string.h>
Index: src/dom/io/socket.cpp
===================================================================
--- src/dom/io/socket.cpp.orig
+++ src/dom/io/socket.cpp
@@ -35,6 +35,7 @@
#include <sys/filio.h> // needed on Solaris 8
#endif
+#include <cstdio>
#include "socket.h"
#include "dom/util/thread.h"
Index: src/dom/io/domstream.cpp
===================================================================
--- src/dom/io/domstream.cpp.orig
+++ src/dom/io/domstream.cpp
@@ -34,6 +34,7 @@
*
*/
+#include <cstdio>
#include <math.h>
#include <stdarg.h>
Index: src/dom/xpathtoken.h
===================================================================
--- src/dom/xpathtoken.h.orig
+++ src/dom/xpathtoken.h
@@ -35,6 +35,7 @@
#include <math.h>
+#include <cstdio>
#include <vector>
namespace org
Index: src/prefix.cpp
===================================================================
--- src/prefix.cpp.orig
+++ src/prefix.cpp
@@ -355,7 +355,8 @@ br_strndup (char *str, size_t size)
char *
br_extract_dir (const char *path)
{
- char *end, *result;
+ const char *end;
+ char *result;
br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
@@ -390,7 +391,8 @@ br_extract_dir (const char *path)
char *
br_extract_prefix (const char *path)
{
- char *end, *tmp, *result;
+ const char *end;
+ char *tmp, *result;
br_return_val_if_fail (path != (char*)NULL, (char*)NULL);
Index: src/2geom/sbasis-math.cpp
===================================================================
--- src/2geom/sbasis-math.cpp.orig
+++ src/2geom/sbasis-math.cpp
@@ -37,12 +37,12 @@
#include "sbasis-math.h"
//#define ZERO 1e-3
+#include <stdio.h>
+#include <math.h>
-namespace Geom {
+namespace Geom {
-#include <stdio.h>
-#include <math.h>
//-|x|-----------------------------------------------------------------------
Piecewise<SBasis> abs(SBasis const &f){
Index: src/xml/event.cpp
===================================================================
--- src/xml/event.cpp.orig
+++ src/xml/event.cpp
@@ -14,6 +14,7 @@
*/
#include <glib.h> // g_assert()
+#include <cstdio>
#include "event.h"
#include "event-fns.h"
Index: src/dialogs/export.cpp
===================================================================
--- src/dialogs/export.cpp.orig
+++ src/dialogs/export.cpp
@@ -20,6 +20,9 @@
# include "config.h"
#endif
+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
+#include <png.h>
+
#include <gtk/gtk.h>
#include <gtkmm/box.h>
#include <gtkmm/buttonbox.h>
@@ -60,7 +63,6 @@
#include "io/sys.h"
#include "helper/png-write.h"
-#include <png.h>
#define SP_EXPORT_MIN_SIZE 1.0
@@ -1041,7 +1043,7 @@ create_progress_dialog (GtkObject *base,
static gchar *
filename_add_extension (const gchar *filename, const gchar *extension)
{
- gchar *dot;
+ const gchar *dot;
dot = strrchr (filename, '.');
if ( !dot )
Index: src/sp-image.cpp
===================================================================
--- src/sp-image.cpp.orig
+++ src/sp-image.cpp
@@ -17,6 +17,9 @@
# include "config.h"
#endif
+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
+#include <png.h>
+
#include <cstring>
#include <string>
#include <libnr/nr-matrix-fns.h>
@@ -41,7 +44,6 @@
#include "libnr/nr-matrix-fns.h"
#include "io/sys.h"
-#include <png.h>
#if ENABLE_LCMS
#include "color-profile-fns.h"
#include "color-profile.h"
Index: src/document.cpp
===================================================================
--- src/document.cpp.orig
+++ src/document.cpp
@@ -746,7 +746,7 @@ Glib::ustring SPDocument::getLanguage()
}
if ( NULL != document_language ) {
- gchar *pos = strchr(document_language, '_');
+ const char *pos = strchr(document_language, '_');
if ( NULL != pos ) {
return Glib::ustring(document_language, pos - document_language);
}
Index: src/libavoid/vertices.h
===================================================================
--- src/libavoid/vertices.h.orig
+++ src/libavoid/vertices.h
@@ -27,6 +27,7 @@
#include <set>
#include <map>
#include <iostream>
+#include <cstdio>
#include "libavoid/geomtypes.h"
namespace Avoid {
Index: src/libnr/nr-matrix-fns.cpp
===================================================================
--- src/libnr/nr-matrix-fns.cpp.orig
+++ src/libnr/nr-matrix-fns.cpp
@@ -1,4 +1,5 @@
#include <libnr/nr-matrix-fns.h>
+#include <cstdio>
namespace NR {
Index: src/main.cpp
===================================================================
--- src/main.cpp.orig
+++ src/main.cpp
@@ -28,6 +28,9 @@
#endif
#include "path-prefix.h"
+// This has to be included prior to anything that includes setjmp.h, it croaks otherwise
+#include <png.h>
+
#include <gtk/gtkmessagedialog.h>
#ifdef HAVE_IEEEFP_H
@@ -111,7 +114,6 @@ using Inkscape::Extension::Internal::Pri
#include "main-cmdlineact.h"
-#include <png.h>
#include <errno.h>
enum {
Index: src/io/inkscapestream.h
===================================================================
--- src/io/inkscapestream.h.orig
+++ src/io/inkscapestream.h
@@ -12,6 +12,7 @@
*/
+#include <cstdio>
#include <glibmm.h>
#include <glib.h>
Index: src/io/gzipstream.cpp
===================================================================
--- src/io/gzipstream.cpp.orig
+++ src/io/gzipstream.cpp
@@ -14,6 +14,7 @@
*/
#include "gzipstream.h"
+#include <cstdio>
#include <cstring>
#include <string>
Index: src/streams-handles.cpp
===================================================================
--- src/streams-handles.cpp.orig
+++ src/streams-handles.cpp
@@ -12,6 +12,7 @@
#include "streams-handles.h"
#include "uri.h"
+#include <cstdio>
#include <iostream>
namespace Inkscape {
Index: src/streams-zlib.cpp
===================================================================
--- src/streams-zlib.cpp.orig
+++ src/streams-zlib.cpp
@@ -9,6 +9,7 @@
* Released under GNU LGPL, read the file 'COPYING.LIB' for more information
*/
+#include <cstdio>
#include <cstring>
#include <string>
#include <string.h>
Index: src/dom/svg/svgtypes.h
===================================================================
--- src/dom/svg/svgtypes.h.orig
+++ src/dom/svg/svgtypes.h
@@ -47,6 +47,7 @@
#include "dom/smil.h"
+#include <cstdio>
#include <math.h>
Index: src/dom/svg/svgparser.cpp
===================================================================
--- src/dom/svg/svgparser.cpp.orig
+++ src/dom/svg/svgparser.cpp
@@ -32,6 +32,7 @@
#include "dom/cssparser.h"
#include "dom/charclass.h"
+#include <cstdio>
#include <stdarg.h>
#define SVG_NAMESPACE "http://www.w3.org/2000/svg"
Index: src/io/sys.cpp
===================================================================
--- src/io/sys.cpp.orig
+++ src/io/sys.cpp
@@ -22,6 +22,7 @@
#include <glibmm/ustring.h>
#include <gtk/gtkmessagedialog.h>
+#include <cstdio>
#include "prefs-utils.h"
#include "sys.h"
Index: src/2geom/svg-path-parser.h
===================================================================
--- src/2geom/svg-path-parser.h.orig
+++ src/2geom/svg-path-parser.h
@@ -32,6 +32,7 @@
#ifndef SEEN_SVG_PATH_PARSER_H
#define SEEN_SVG_PATH_PARSER_H
+#include <cstdio>
#include <vector>
#include <iterator>
#include <stdexcept>
Index: src/libnr/nr-matrix.cpp
===================================================================
--- src/libnr/nr-matrix.cpp.orig
+++ src/libnr/nr-matrix.cpp
@@ -11,6 +11,7 @@
* This code is in public domain
*/
+#include <cstdio>
#include <cstdlib>
#include "nr-matrix.h"
Index: src/libnr/nr-object.cpp
===================================================================
--- src/libnr/nr-object.cpp.orig
+++ src/libnr/nr-object.cpp
@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
);
memset(object, 0xf0, c->isize);
- object->klass = c;
c->cpp_ctor(object);
+ object->klass = c;
nr_class_tree_object_invoke_init (c, object);
return object;

5
inkscape.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 28 13:14:17 CEST 2009 - vuntz@novell.com
- Add inkscape-gcc44.patch to fix build with gcc 4.4.
-------------------------------------------------------------------
Fri Apr 3 11:38:25 CEST 2009 - vuntz@novell.com

7
inkscape.spec
View File

@ -25,7 +25,7 @@ Group: Productivity/Graphics/Vector Editors
Requires: ghostscript-fonts-std python-gtk pstoedit gzip /usr/bin/gs
Summary: Inkscape Vector Illustration Program
Version: 0.46
Release: 65
Release: 66
# package in <= NLD9 and SuSE Linux <= 9.1
Provides: sodipodi
Obsoletes: sodipodi
@ -49,6 +49,8 @@ Patch16: inkscape-gtk-clist.patch
Patch17: inkscape-lp237574-poppler.patch
# PATCH-FIX-OPENSUSE inkscape-remove-datetime.patch vuntz@novell.com -- Do not put date/time in the compiled binary (needed for build-compare)
Patch18: inkscape-remove-datetime.patch
# PATCH-FIX-UPSTREAM inkscape-gcc44.patch vuntz@novell.com -- Taken from svn
Patch19: inkscape-gcc44.patch
Url: http://www.inkscape.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-lang = %{version}
@ -434,6 +436,7 @@ Authors:
%patch16 -p0
%patch17 -p1
%patch18 -p1
%patch19 -p0
pushd ../gc*
%patch10
popd
@ -539,6 +542,8 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}.lang
%changelog
* Tue Apr 28 2009 vuntz@novell.com
- Add inkscape-gcc44.patch to fix build with gcc 4.4.
* Fri Apr 03 2009 vuntz@novell.com
- Remove python-numeric Requires: there's no reference to it
anywhere in the code, so it wasn't needed.