From 2539ea1bd9182eb1d94e85ac16c8ffaed16d663b95607bdf874c4d4c529a9d79 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 29 Mar 2007 20:18:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/inkscape?expand=0&rev=5 --- inkscape-0.44.1.tar.bz2 | 3 - inkscape-0.45.1.tar.bz2 | 3 + inkscape-buffer-overrun.patch | 84 +++++++++++++++++++++++++++ inkscape-enable-perl.patch | 11 ---- inkscape-session-manager-strcmp.patch | 11 ---- inkscape-siox-max.patch | 11 ---- inkscape.changes | 9 +++ inkscape.spec | 27 +++++---- 8 files changed, 112 insertions(+), 47 deletions(-) delete mode 100644 inkscape-0.44.1.tar.bz2 create mode 100644 inkscape-0.45.1.tar.bz2 create mode 100644 inkscape-buffer-overrun.patch delete mode 100644 inkscape-enable-perl.patch delete mode 100644 inkscape-session-manager-strcmp.patch delete mode 100644 inkscape-siox-max.patch diff --git a/inkscape-0.44.1.tar.bz2 b/inkscape-0.44.1.tar.bz2 deleted file mode 100644 index 3b4d0d2..0000000 --- a/inkscape-0.44.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eab952a73f5fe2e19425ef988de21e4d1bd91b277842934f6027ef7aad60ec7e -size 7184912 diff --git a/inkscape-0.45.1.tar.bz2 b/inkscape-0.45.1.tar.bz2 new file mode 100644 index 0000000..3cfc45b --- /dev/null +++ b/inkscape-0.45.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:859068d81173c57f812c6679cac8ac6ced196e4e6232f29008282a6fa9beaabd +size 8834980 diff --git a/inkscape-buffer-overrun.patch b/inkscape-buffer-overrun.patch new file mode 100644 index 0000000..3a4dc83 --- /dev/null +++ b/inkscape-buffer-overrun.patch @@ -0,0 +1,84 @@ +Index: inkscape-0.45.1/src/io/inkscapestream.h +=================================================================== +--- inkscape-0.45.1.orig/src/io/inkscapestream.h ++++ inkscape-0.45.1/src/io/inkscapestream.h +@@ -13,6 +13,7 @@ + + + #include ++#include + + namespace Inkscape + { +Index: inkscape-0.45.1/src/dom/cssparser.h +=================================================================== +--- inkscape-0.45.1.orig/src/dom/cssparser.h ++++ inkscape-0.45.1/src/dom/cssparser.h +@@ -71,6 +71,7 @@ public: + */ + virtual bool parseFile(const DOMString &str); + ++#include + + protected: + +Index: inkscape-0.45.1/src/dom/lsimpl.h +=================================================================== +--- inkscape-0.45.1.orig/src/dom/lsimpl.h ++++ inkscape-0.45.1/src/dom/lsimpl.h +@@ -35,6 +35,7 @@ + #include "events.h" + #include "traversal.h" + #include "ls.h" ++#include + + + #include "xmlreader.h" +Index: inkscape-0.45.1/src/dom/uri.h +=================================================================== +--- inkscape-0.45.1.orig/src/dom/uri.h ++++ inkscape-0.45.1/src/dom/uri.h +@@ -34,6 +34,7 @@ + + #include "dom.h" + ++#include + + namespace org + { +Index: inkscape-0.45.1/src/dom/xmlreader.h +=================================================================== +--- inkscape-0.45.1.orig/src/dom/xmlreader.h ++++ inkscape-0.45.1/src/dom/xmlreader.h +@@ -41,6 +41,7 @@ namespace w3c + namespace dom + { + ++#include + + + class XmlReader +Index: inkscape-0.45.1/src/dom/svg/svgparser.h +=================================================================== +--- inkscape-0.45.1.orig/src/dom/svg/svgparser.h ++++ inkscape-0.45.1/src/dom/svg/svgparser.h +@@ -43,6 +43,7 @@ namespace dom + namespace svg + { + ++#include + + class SvgParser + { +Index: inkscape-0.45.1/src/dom/util/ziptool.h +=================================================================== +--- inkscape-0.45.1.orig/src/dom/util/ziptool.h ++++ inkscape-0.45.1/src/dom/util/ziptool.h +@@ -37,6 +37,7 @@ + #include + #include + ++#include + + //######################################################################## + //# A D L E R 3 2 diff --git a/inkscape-enable-perl.patch b/inkscape-enable-perl.patch deleted file mode 100644 index bccd501..0000000 --- a/inkscape-enable-perl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile_insert -+++ src/Makefile_insert -@@ -290,7 +290,7 @@ - $(FREETYPE_LIBS) \ - $(kdeldadd) \ - $(win32ldflags) \ -- $(PERL_LIBS) \ -+ $(PERL_LDFLAGS) \ - $(PYTHON_LIBS) \ - $(LIBLOUDMOUTH_LIBS) - diff --git a/inkscape-session-manager-strcmp.patch b/inkscape-session-manager-strcmp.patch deleted file mode 100644 index e52a951..0000000 --- a/inkscape-session-manager-strcmp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/jabber_whiteboard/session-manager.cpp -+++ src/jabber_whiteboard/session-manager.cpp -@@ -590,7 +590,7 @@ - GError* error = NULL; - char* type, * seq; - -- if (recipientJID == NULL || recipientJID == "") { -+ if (recipientJID == NULL || !strlen(recipientJID) ) { - g_warning("Null recipient JID specified; not sending message."); - return NO_RECIPIENT_JID; - } else { diff --git a/inkscape-siox-max.patch b/inkscape-siox-max.patch deleted file mode 100644 index d39df41..0000000 --- a/inkscape-siox-max.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/trace/siox.cpp -+++ src/trace/siox.cpp -@@ -1632,7 +1632,7 @@ - { - float max= -1000000.0f; - for (int i=0; i max) -+ if (cm[i] > max) - max=cm[i]; - - if (max<=0.0 || max==1.0) diff --git a/inkscape.changes b/inkscape.changes index 4d6c54a..be0ac9e 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Mar 29 09:52:37 CST 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 14:23:33 CET 2007 - sbrabec@suse.cz diff --git a/inkscape.spec b/inkscape.spec index fd5f355..325e288 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,5 +1,5 @@ # -# spec file for package inkscape (Version 0.44.1) +# spec file for package inkscape (Version 0.45.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,14 +11,14 @@ # norootforbuild Name: inkscape -BuildRequires: cairomm docbook-toys gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel python-devel python-gtk-devel sgml-skel update-desktop-files +BuildRequires: cairomm docbook-toys gcc-c++ gtkmm24-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel liblcms-devel libwnck-devel libxslt-devel loudmouth-devel perl python-devel python-gtk-devel sgml-skel update-desktop-files License: GNU General Public License (GPL) Group: Productivity/Graphics/Vector Editors Requires: cairomm ghostscript-fonts-std python-gtk python-numeric pstoedit libwmf gzip skencil /usr/bin/gs Autoreqprov: on Summary: Inkscape Vector Illustration Program -Version: 0.44.1 -Release: 41 +Version: 0.45.1 +Release: 1 Provides: sodipodi Obsoletes: sodipodi PreReq: /bin/rm /bin/ln /bin/sh /usr/bin/perl @@ -29,11 +29,9 @@ Patch4: inkscape-swigfix.patch Patch6: inkscape-invalid-conversion.patch Patch7: inkscape-bug-189159.patch Patch8: inkscape-configure.patch -Patch9: inkscape-siox-max.patch Patch10: gc6.4.dif -Patch11: inkscape-enable-perl.patch -Patch12: inkscape-session-manager-strcmp.patch Patch13: inkscape-polyutil-newpoly.patch +Patch14: inkscape-buffer-overrun.patch URL: http://www.inkscape.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,10 +92,8 @@ Authors: %patch6 %patch7 %patch8 -%patch9 -%patch11 -%patch12 %patch13 +%patch14 -p1 pushd ../gc* %patch10 popd @@ -135,6 +131,7 @@ make %{?jobs:-j%jobs} %install make DESTDIR=$RPM_BUILD_ROOT install +rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale/en_US@piglatin %suse_update_desktop_file -N "Inkscape" -G "SVG Vector Illustrator" inkscape Office FlowChart %find_lang %{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/inkscape/extensions-optional @@ -169,8 +166,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/inkscape.png %doc %{_mandir}/man?/*.* %doc %{_mandir}/??/man?/*.* +# FIXME +%dir %{_mandir}/fr/man1 -%changelog -n inkscape +%changelog +* 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 - Removed remaining references to /opt/gnome (#240571). * Tue Jan 23 2007 - prusnak@suse.cz