From ad3c2f2896497a5ebe46ea394dd95fa70235567e Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Apr 10 2009 13:34:27 +0000 Subject: - Update to newer snapshot - Fix doc/incview reversed subpackage content --- diff --git a/inkscape-0.46+devel-uniconv.patch b/inkscape-0.46+devel-uniconv.patch deleted file mode 100644 index 2c34a9a..0000000 --- a/inkscape-0.46+devel-uniconv.patch +++ /dev/null @@ -1,108 +0,0 @@ -See https://bugs.launchpad.net/inkscape/+bug/226383 -https://bugzilla.redhat.com/show_bug.cgi?id=458845 - -Lubomir Rintel - -diff -up inkscape/inkscape.desktop.in.uniconv inkscape/inkscape.desktop.in ---- inkscape/inkscape.desktop.in.uniconv 2009-01-06 11:38:13.000000000 +0100 -+++ inkscape/inkscape.desktop.in 2009-01-06 11:38:39.000000000 +0100 -@@ -4,7 +4,7 @@ _Name=Inkscape Vector Graphics Editor - _Comment=Create and edit Scalable Vector Graphics images - Type=Application - Categories=Graphics;VectorGraphics;GTK; --MimeType=image/svg+xml;image/svg+xml-compressed; -+MimeType=image/svg+xml;image/svg+xml-compressed;image/cgm;image/x-wmf;application/vnd.corel-draw;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr; - Exec=inkscape %F - TryExec=inkscape - Terminal=false -diff -up inkscape/share/extensions/ccx_input.inx.uniconv inkscape/share/extensions/ccx_input.inx ---- inkscape/share/extensions/ccx_input.inx.uniconv 2009-01-05 14:23:27.000000000 +0100 -+++ inkscape/share/extensions/ccx_input.inx 2009-01-06 11:37:02.000000000 +0100 -@@ -2,7 +2,7 @@ - - <_name>Corel DRAW Compressed Exchange files input - org.inkscape.input.ccx -- uniconv -+ uniconvertor - uniconv-ext.py - - .ccx -diff -up inkscape/share/extensions/cdr_input.inx.uniconv inkscape/share/extensions/cdr_input.inx -diff -up inkscape/share/extensions/cdt_input.inx.uniconv inkscape/share/extensions/cdt_input.inx ---- inkscape/share/extensions/cdt_input.inx.uniconv 2009-01-05 14:23:28.000000000 +0100 -+++ inkscape/share/extensions/cdt_input.inx 2009-01-06 11:37:02.000000000 +0100 -@@ -2,7 +2,7 @@ - - <_name>Corel DRAW templates input - org.inkscape.input.cdt -- uniconv -+ uniconvertor - uniconv-ext.py - - .cdt -diff -up inkscape/share/extensions/cgm_input.inx.uniconv inkscape/share/extensions/cgm_input.inx ---- inkscape/share/extensions/cgm_input.inx.uniconv 2009-01-05 14:23:26.000000000 +0100 -+++ inkscape/share/extensions/cgm_input.inx 2009-01-06 11:37:02.000000000 +0100 -@@ -2,7 +2,7 @@ - - <_name>Computer Graphics Metafile files input - org.inkscape.input.cgm -- uniconv -+ uniconvertor - uniconv-ext.py - - .cgm -diff -up inkscape/share/extensions/cmx_input.inx.uniconv inkscape/share/extensions/cmx_input.inx ---- inkscape/share/extensions/cmx_input.inx.uniconv 2009-01-05 14:23:26.000000000 +0100 -+++ inkscape/share/extensions/cmx_input.inx 2009-01-06 11:37:02.000000000 +0100 -@@ -2,7 +2,7 @@ - - <_name>Corel DRAW Presentation Exchange files input - org.inkscape.input.cmx -- uniconv -+ uniconvertor - uniconv-ext.py - - .cmx -diff -up inkscape/share/extensions/sk1_input.inx.uniconv inkscape/share/extensions/sk1_input.inx ---- inkscape/share/extensions/sk1_input.inx.uniconv 2009-01-05 14:23:27.000000000 +0100 -+++ inkscape/share/extensions/sk1_input.inx 2009-01-06 11:37:02.000000000 +0100 -@@ -2,7 +2,7 @@ - - <_name>sK1 vector graphics files input - org.inkscape.input.sk1 -- uniconv -+ uniconvertor - uniconv-ext.py - - .sk1 -diff -up inkscape/share/extensions/uniconv-ext.py.uniconv inkscape/share/extensions/uniconv-ext.py ---- inkscape/share/extensions/uniconv-ext.py.uniconv 2009-01-05 14:23:28.000000000 +0100 -+++ inkscape/share/extensions/uniconv-ext.py 2009-01-06 11:41:29.000000000 +0100 -@@ -28,14 +28,10 @@ from subprocess import Popen, PIPE - cmd = 'none' - - try: -- p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait() -- if p!=127 : cmd = 'uniconv' - p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait() - if p!=127 : cmd = 'uniconvertor' - except ImportError: - from popen2 import Popen3 -- p = Popen3('uniconv', True).wait() -- if p!=32512 : cmd = 'uniconv' - p = Popen3('uniconvertor', True).wait() - if p!=32512 : cmd = 'uniconvertor' - -diff -up inkscape/share/extensions/wmf_input.inx.uniconv inkscape/share/extensions/wmf_input.inx ---- inkscape/share/extensions/wmf_input.inx.uniconv 2009-01-05 14:23:28.000000000 +0100 -+++ inkscape/share/extensions/wmf_input.inx 2009-01-06 11:37:02.000000000 +0100 -@@ -2,7 +2,7 @@ - - <_name>Windows Metafile Input - org.inkscape.input.wmf -- uniconv -+ uniconvertor - uniconv-ext.py - - .wmf diff --git a/inkscape-20090227svn-gcc44.patch b/inkscape-20090227svn-gcc44.patch deleted file mode 100644 index 0d2fcd4..0000000 --- a/inkscape-20090227svn-gcc44.patch +++ /dev/null @@ -1,29 +0,0 @@ -One more typing fix for GCC 4.4, and fix a NULL dereference on startup. - -Lubomir Rintel - -diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp ---- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 2009-01-28 22:12:57.000000000 +0100 -+++ inkscape/src/extension/internal/bitmap/imagemagick.cpp 2009-03-02 17:05:57.000000000 +0100 -@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha - char *search = (char *) g_strndup(xlink, 30); - if (strstr(search, "base64") != (char*)NULL) { - // 7 = strlen("base64") + strlen(",") -- char* pureBase64 = strstr(xlink, "base64") + 7; -+ const char* pureBase64 = strstr(xlink, "base64") + 7; - Magick::Blob blob; - blob.base64(pureBase64); - image->read(blob); -diff -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp ---- inkscape/src/libnr/nr-object.cpp.gcc44 2009-03-02 17:06:46.000000000 +0100 -+++ inkscape/src/libnr/nr-object.cpp 2009-03-02 17:06:58.000000000 +0100 -@@ -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; diff --git a/inkscape-20090410svn-formats.patch b/inkscape-20090410svn-formats.patch new file mode 100644 index 0000000..e0f27a4 --- /dev/null +++ b/inkscape-20090410svn-formats.patch @@ -0,0 +1,16 @@ +See https://bugzilla.redhat.com/show_bug.cgi?id=458845 + +Lubomir Rintel + +diff -up inkscape/inkscape.desktop.in.uniconv inkscape/inkscape.desktop.in +--- inkscape/inkscape.desktop.in.uniconv 2009-01-06 11:38:13.000000000 +0100 ++++ inkscape/inkscape.desktop.in 2009-01-06 11:38:39.000000000 +0100 +@@ -4,7 +4,7 @@ _Name=Inkscape Vector Graphics Editor + _Comment=Create and edit Scalable Vector Graphics images + Type=Application + Categories=Graphics;VectorGraphics;GTK; +-MimeType=image/svg+xml;image/svg+xml-compressed; ++MimeType=image/svg+xml;image/svg+xml-compressed;image/cgm;image/x-wmf;application/vnd.corel-draw;application/x-xccx;application/x-xcgm;application/x-xcdt;application/x-xsk1;application/x-xcmx;image/x-xcdr; + Exec=inkscape %F + TryExec=inkscape + Terminal=false diff --git a/inkscape-20090410svn-gcc44.patch b/inkscape-20090410svn-gcc44.patch new file mode 100644 index 0000000..726e924 --- /dev/null +++ b/inkscape-20090410svn-gcc44.patch @@ -0,0 +1,40 @@ +One more typing fix for GCC 4.4, and fix a NULL dereference on startup. + +Lubomir Rintel + +diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp +--- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 2009-01-28 22:12:57.000000000 +0100 ++++ inkscape/src/extension/internal/bitmap/imagemagick.cpp 2009-04-10 12:34:09.189576256 +0200 +@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha + char *search = (char *) g_strndup(xlink, 30); + if (strstr(search, "base64") != (char*)NULL) { + // 7 = strlen("base64") + strlen(",") +- char* pureBase64 = strstr(xlink, "base64") + 7; ++ const char* pureBase64 = strstr(xlink, "base64") + 7; + Magick::Blob blob; + blob.base64(pureBase64); + image->read(blob); +diff -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp +--- inkscape/src/libnr/nr-object.cpp.gcc44 2008-05-04 07:14:00.000000000 +0200 ++++ inkscape/src/libnr/nr-object.cpp 2009-04-10 12:34:09.190577328 +0200 +@@ -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; +diff -up inkscape/src/widgets/ege-paint-def.cpp.gcc44 inkscape/src/widgets/ege-paint-def.cpp +--- inkscape/src/widgets/ege-paint-def.cpp.gcc44 2009-04-10 14:31:06.349578336 +0200 ++++ inkscape/src/widgets/ege-paint-def.cpp 2009-04-10 14:31:20.011577660 +0200 +@@ -45,6 +45,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/inkscape-20090410svn-uniconv.patch b/inkscape-20090410svn-uniconv.patch new file mode 100644 index 0000000..a434116 --- /dev/null +++ b/inkscape-20090410svn-uniconv.patch @@ -0,0 +1,38 @@ +uniconvertor and uniconv are looked in in reversed order +(therefore we can call uniconv that's different from the uniconvertor one) +https://bugs.launchpad.net/inkscape/+bug/226383 + +Lubomir Rintel + +diff -up inkscape/share/extensions/uniconv-ext.py.uniconv inkscape/share/extensions/uniconv-ext.py +--- inkscape/share/extensions/uniconv-ext.py.uniconv 2009-03-01 18:06:19.000000000 +0100 ++++ inkscape/share/extensions/uniconv-ext.py 2009-04-10 15:22:21.916579400 +0200 +@@ -28,19 +28,21 @@ cmd = None + + try: + from subprocess import Popen, PIPE +- p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait() ++ p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait() + if p==0 : +- cmd = 'uniconv' ++ cmd = 'uniconvertor' + else: +- p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait() ++ p = Popen('uniconv', shell=True, stdout=PIPE, stderr=PIPE).wait() + if p==0 : +- cmd = 'uniconvertor' ++ cmd = 'uniconv' + except ImportError: + from popen2 import Popen3 +- p = Popen3('uniconv', True).wait() +- if p!=32512 : cmd = 'uniconv' + p = Popen3('uniconvertor', True).wait() +- if p!=32512 : cmd = 'uniconvertor' ++ if p!=32512 : ++ cmd = 'uniconvertor' ++ else: ++ p = Popen3('uniconv', True).wait() ++ if p!=32512 : cmd = 'uniconv' + + if cmd == None: + # there's no succeffully-returning uniconv command; try to get the module directly (on Windows) diff --git a/inkscape.spec b/inkscape.spec index aa1aa53..63f9328 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -1,25 +1,22 @@ -# Preserve lot of debugging information for now. This effectively -# disables FORTIFY_SOURCE, so it must be enabled before Gold -%define optflags %(rpm --eval %%optflags |sed 's/-O2/-O0/') - Name: inkscape Version: 0.47 -Release: 0.6.20090301svn%{?dist} +Release: 0.6.20090410svn%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity License: GPLv2+ URL: http://inkscape.sourceforge.net/ #Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2 -# svn export -r20798 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@20798 inkscape +# svn export -r21114 https://inkscape.svn.sourceforge.net/svnroot/inkscape/inkscape/trunk@21114 inkscape # tar cf - inkscape |lzma -9 -c >inkscape.tar.lzma # Chuck the SVN snapshot specific blocks when bumping to a release: # perl -e 'while (<>) {/^# BEGIN SVN/ .. /^# END SVN/ or print}' - 0.47-0.6.20090410svn +- Update to newer snapshot +- Fix doc/incview reversed subpackage content + * Wed Mar 04 2009 Lubomir Rintel - 0.47-0.6.20090301svn - Rebuild for new ImageMagick diff --git a/sources b/sources index b71be9c..d01d873 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8803034773154e5d90e3bdac7de7ab30 inkscape.tar.lzma +b2f839c29e8ad5c3eab82c2540c6e12d inkscape.tar.lzma