rpms/inkscape
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Rediff patches for zero fuzz

Browse Source 
- Use uniconvertor to handle CDR and WMF (#458845)
This commit is contained in:
Lubomir Rintel 2008-08-13 22:19:19 +00:00
parent 8d2d97e293
commit 9bea88ae1c
2 changed files with 122 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
inkscape-0.46+devel-uniconv.patch Normal file
View File

@ -0,0 +1,113 @@
See https://bugs.launchpad.net/inkscape/+bug/226383
https://bugzilla.redhat.com/show_bug.cgi?id=458845
Lubomir Rintel <lkundrak@v3.sk>
diff -up inkscape-0.46+devel/inkscape.desktop.in.uniconv inkscape-0.46+devel/inkscape.desktop.in
--- inkscape-0.46+devel/inkscape.desktop.in.uniconv 2008-08-14 00:04:02.000000000 +0200
+++ inkscape-0.46+devel/inkscape.desktop.in 2008-08-14 00:10:28.000000000 +0200
@@ -5,7 +5,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;
FilePattern=inkscape;
Exec=inkscape %F
TryExec=inkscape
diff -up inkscape-0.46+devel/share/extensions/ccx_input.inx.uniconv inkscape-0.46+devel/share/extensions/ccx_input.inx
--- inkscape-0.46+devel/share/extensions/ccx_input.inx.uniconv 2008-08-14 00:15:10.000000000 +0200
+++ inkscape-0.46+devel/share/extensions/ccx_input.inx 2008-08-14 00:14:20.000000000 +0200
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Corel DRAW Compressed Exchange files input</_name>
<id>org.inkscape.input.ccx</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.ccx</extension>
diff -up inkscape-0.46+devel/share/extensions/cdr_input.inx.uniconv inkscape-0.46+devel/share/extensions/cdr_input.inx
--- inkscape-0.46+devel/share/extensions/cdr_input.inx.uniconv 2008-08-14 00:15:10.000000000 +0200
+++ inkscape-0.46+devel/share/extensions/cdr_input.inx 2008-08-14 00:14:20.000000000 +0200
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Corel DRAW Input</_name>
<id>org.inkscape.input.cdr</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.cdr</extension>
diff -up inkscape-0.46+devel/share/extensions/cdt_input.inx.uniconv inkscape-0.46+devel/share/extensions/cdt_input.inx
--- inkscape-0.46+devel/share/extensions/cdt_input.inx.uniconv 2008-08-14 00:15:10.000000000 +0200
+++ inkscape-0.46+devel/share/extensions/cdt_input.inx 2008-08-14 00:14:20.000000000 +0200
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Corel DRAW templates input</_name>
<id>org.inkscape.input.cdt</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.cdt</extension>
diff -up inkscape-0.46+devel/share/extensions/cgm_input.inx.uniconv inkscape-0.46+devel/share/extensions/cgm_input.inx
--- inkscape-0.46+devel/share/extensions/cgm_input.inx.uniconv 2008-08-14 00:15:10.000000000 +0200
+++ inkscape-0.46+devel/share/extensions/cgm_input.inx 2008-08-14 00:14:20.000000000 +0200
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Computer Graphics Metafile files input</_name>
<id>org.inkscape.input.cgm</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.cgm</extension>
diff -up inkscape-0.46+devel/share/extensions/cmx_input.inx.uniconv inkscape-0.46+devel/share/extensions/cmx_input.inx
--- inkscape-0.46+devel/share/extensions/cmx_input.inx.uniconv 2008-08-14 00:15:10.000000000 +0200
+++ inkscape-0.46+devel/share/extensions/cmx_input.inx 2008-08-14 00:14:20.000000000 +0200
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Corel DRAW Presentation Exchange files input</_name>
<id>org.inkscape.input.cmx</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.cmx</extension>
diff -up inkscape-0.46+devel/share/extensions/sk1_input.inx.uniconv inkscape-0.46+devel/share/extensions/sk1_input.inx
--- inkscape-0.46+devel/share/extensions/sk1_input.inx.uniconv 2008-08-14 00:15:10.000000000 +0200
+++ inkscape-0.46+devel/share/extensions/sk1_input.inx 2008-08-14 00:14:20.000000000 +0200
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>sK1 vector graphics files input</_name>
<id>org.inkscape.input.sk1</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.sk1</extension>
diff -up inkscape-0.46+devel/share/extensions/uniconv-ext.py.uniconv inkscape-0.46+devel/share/extensions/uniconv-ext.py
--- inkscape-0.46+devel/share/extensions/uniconv-ext.py.uniconv 2008-08-14 00:01:21.000000000 +0200
+++ inkscape-0.46+devel/share/extensions/uniconv-ext.py 2008-08-14 00:01:31.000000000 +0200
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fi
import sys
from run_command import run
-run('uniconv "%s" "%%s"' % sys.argv[1].replace("%","%%"), "UniConvertor")
+run('uniconvertor "%s" "%%s"' % sys.argv[1].replace("%","%%"), "UniConvertor")
# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
diff -up inkscape-0.46+devel/share/extensions/wmf_input.inx.uniconv inkscape-0.46+devel/share/extensions/wmf_input.inx
--- inkscape-0.46+devel/share/extensions/wmf_input.inx.uniconv 2008-08-14 00:15:10.000000000 +0200
+++ inkscape-0.46+devel/share/extensions/wmf_input.inx 2008-08-14 00:14:20.000000000 +0200
@@ -2,7 +2,7 @@
<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
<_name>Windows Metafile Input</_name>
<id>org.inkscape.input.wmf</id>
- <dependency type="executable" location="path">uniconv</dependency>
+ <dependency type="executable" location="path">uniconvertor</dependency>
<dependency type="executable" location="extensions">uniconv-ext.py</dependency>
<input>
<extension>.wmf</extension>

11
inkscape.spec
View File

@ -1,6 +1,6 @@
Name: inkscape
Version: 0.47
Release: 0.1.20080705svn%{?dist}
Release: 0.2.20080705svn%{?dist}
Summary: Vector-based drawing program using SVG
Group: Applications/Productivity
@ -8,11 +8,12 @@ License: GPLv2+
URL: http://inkscape.sourceforge.net/
#Source0: http://download.sourceforge.net/inkscape/%{name}-%{version}.tar.bz2
Source0: %{name}-0.46+devel.tar.gz
Patch0: inkscape-16571-cxxinclude.patch
Patch0: inkscape-0.46-cxxinclude.patch
Patch1: inkscape-0.46+devel-desktop.patch
Patch2: inkscape-0.46+devel-icons.patch
Patch5: inkscape-0.46-gtk2.13.3.patch
Patch6: inkscape-0.46-poppler-0.8.3.patch
Patch7: inkscape-0.46+devel-uniconv.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -53,6 +54,7 @@ Requires: perl(Image::Magick)
Requires: numpy
Requires: PyXML
Requires: python-lxml
Requires: uniconvertor
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
@ -78,6 +80,7 @@ C and C++, using the Gtk+ toolkit and optionally some Gnome libraries.
%patch2 -p1 -b .icons
%patch5 -p1 -b .gtk2.13.3
%patch6 -p1 -b .poppler-0.8.3
%patch7 -p1 -b .uniconv
find -type f -regex '.*\.\(cpp\|h\)' -perm +111 -exec chmod -x {} ';'
find share/extensions/ -type f -regex '.*\.py' -perm +111 -exec chmod -x {} ';'
dos2unix -k -q share/extensions/*.py
@ -137,6 +140,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%changelog
* Wed Aug 13 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.2.20080705svn
- Rediff patches for zero fuzz
- Use uniconvertor to handle CDR and WMF (#458845)
* Wed Jul 09 2008 Lubomir Rintel <lkundrak@v3.sk> - 0.47-0.1.20080705svn
- Subversion snapshot