diff --git a/inkscape-polyutil-newpoly.patch b/inkscape-polyutil-newpoly.patch new file mode 100644 index 0000000..4b9b0e5 --- /dev/null +++ b/inkscape-polyutil-newpoly.patch @@ -0,0 +1,10 @@ +--- src/libavoid/polyutil.cpp ++++ src/libavoid/polyutil.cpp +@@ -35,6 +35,7 @@ + { + Polygn newpoly; + ++ newpoly.id = 0; + newpoly.pn = size; + newpoly.ps = (Point *) calloc(size, sizeof(Point)); + if (!newpoly.ps) diff --git a/inkscape-session-manager-strcmp.patch b/inkscape-session-manager-strcmp.patch new file mode 100644 index 0000000..e52a951 --- /dev/null +++ b/inkscape-session-manager-strcmp.patch @@ -0,0 +1,11 @@ +--- 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.changes b/inkscape.changes index f5d7679..b724af6 100644 --- a/inkscape.changes +++ b/inkscape.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 23 11:22:41 CET 2007 - prusnak@suse.cz + +- fixed build errors + * polyutil-newpoly.patch - uninitialized structure + * session-manager-strcmp.patch - comparing char* w/ string literal + ------------------------------------------------------------------- Mon Jan 22 18:01:04 CET 2007 - sbrabec@suse.cz diff --git a/inkscape.spec b/inkscape.spec index eeac65f..618152d 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.44.1 -Release: 39 +Release: 40 Provides: sodipodi Obsoletes: sodipodi PreReq: /bin/rm /bin/ln /bin/sh /usr/bin/perl @@ -32,6 +32,8 @@ 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 URL: http://www.inkscape.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,6 +96,8 @@ Authors: %patch8 %patch9 %patch11 +%patch12 +%patch13 pushd ../gc* %patch10 popd @@ -167,6 +171,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/??/man?/*.* %changelog -n inkscape +* 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 - Prefix changed to /usr. - Spec file cleanup.