c68497ff47
with GCC 4.4 as well
109 lines
6.0 KiB
Diff
109 lines
6.0 KiB
Diff
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/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 @@
|
|
<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/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 @@
|
|
<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/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 @@
|
|
<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/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 @@
|
|
<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/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 @@
|
|
<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/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 @@
|
|
<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>
|