libcdr: lower min version to 0.0.8, keep fallback input extensions for UC-based import (renamed, new id)

(internal extension has priority over script-based ones for same mime-type)

(bzr r12059.1.2)

6 files changed, 34 insertions, 16 deletions

diff --git a/configure.ac b/configure.ac
index 62d8ff11f..b62663fb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -717,7 +717,7 @@ AC_ARG_ENABLE(wpg,
 with_libcdr=no
 
 if test "x$enable_cdr" = "xyes"; then
-	PKG_CHECK_MODULES(LIBCDR, libcdr-0.0 >= 0.0.9 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libcdr=yes, with_libcdr=no)
+	PKG_CHECK_MODULES(LIBCDR, libcdr-0.0 >= 0.0.8 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libcdr=yes, with_libcdr=no)
 
 	if test "x$with_libcdr" = "xyes"; then
 		AC_DEFINE(WITH_LIBCDR,1,[Build in libcdr])
diff --git a/share/extensions/Makefile.am b/share/extensions/Makefile.am
index 63a9d143c..5770d79e7 100644
--- a/share/extensions/Makefile.am
+++ b/share/extensions/Makefile.am
@@ -195,10 +195,11 @@ modules = \
 	addnodes.inx \
 	ai_input.inx \
 	aisvg.inx \
-	ccx_input.inx \
-	cdt_input.inx \
+	ccx_input-uniconv.inx \
+	cdr_input-uniconv.inx \
+	cdt_input-uniconv.inx \
 	cgm_input.inx \
-	cmx_input.inx \
+	cmx_input-uniconv.inx \
 	color_blackandwhite.inx\
 	color_brighter.inx\
 	color_custom.inx \
diff --git a/share/extensions/ccx_input.inx b/share/extensions/ccx_input-uniconv.inx
index 4dcd43b8e..040a2891a 100644
--- a/share/extensions/ccx_input.inx
+++ b/share/extensions/ccx_input-uniconv.inx
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Corel DRAW Compressed Exchange files input</_name>
-    <id>org.inkscape.input.ccx</id>
+    <_name>Corel DRAW Compressed Exchange files input (UC)</_name>
+    <id>org.inkscape.input.ccx.uniconvertor</id>
     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
     <input>
         <extension>.ccx</extension>
         <mimetype>application/x-xccx</mimetype>
-        <_filetypename>Corel DRAW Compressed Exchange files (.ccx)</_filetypename>
-        <_filetypetooltip>Open compressed exchange files saved in Corel DRAW</_filetypetooltip>
+        <_filetypename>Corel DRAW Compressed Exchange files (UC) (.ccx)</_filetypename>
+        <_filetypetooltip>Open compressed exchange files saved in Corel DRAW (UC)</_filetypetooltip>
     </input>
     <script>
         <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
diff --git a/share/extensions/cdr_input-uniconv.inx b/share/extensions/cdr_input-uniconv.inx
new file mode 100644
index 000000000..6fd7f90ab
--- /dev/null
+++ b/share/extensions/cdr_input-uniconv.inx
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
+    <_name>Corel DRAW Input (UC)</_name>
+    <id>org.inkscape.input.cdr.uniconvertor</id>
+    <!-- the uniconv or uniconvertor dependency will be tested by uniconv-ext.py -->
+    <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
+    <input>
+        <extension>.cdr</extension>
+        <mimetype>image/x-xcdr</mimetype>
+        <_filetypename>Corel DRAW 7-X4 files (UC) (*.cdr)</_filetypename>
+        <_filetypetooltip>Open files saved in Corel DRAW 7-X4 (UC)</_filetypetooltip>
+        <output_extension>org.inkscape.output.cdr</output_extension>
+    </input>
+    <script>
+        <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
+    </script>
+</inkscape-extension>
diff --git a/share/extensions/cdt_input.inx b/share/extensions/cdt_input-uniconv.inx
index 6bed364f6..78d5c6a97 100644
--- a/share/extensions/cdt_input.inx
+++ b/share/extensions/cdt_input-uniconv.inx
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Corel DRAW templates input</_name>
-    <id>org.inkscape.input.cdt</id>
+    <_name>Corel DRAW templates input (UC)</_name>
+    <id>org.inkscape.input.cdt.uniconvertor</id>
     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
     <input>
         <extension>.cdt</extension>
         <mimetype>application/x-xcdt</mimetype>
-        <_filetypename>Corel DRAW 7-13 template files (.cdt)</_filetypename>
-        <_filetypetooltip>Open files saved in Corel DRAW 7-13</_filetypetooltip>
+        <_filetypename>Corel DRAW 7-13 template files (UC) (.cdt)</_filetypename>
+        <_filetypetooltip>Open files saved in Corel DRAW 7-13 (UC)</_filetypetooltip>
     </input>
     <script>
         <command reldir="extensions" interpreter="python">uniconv-ext.py</command>
diff --git a/share/extensions/cmx_input.inx b/share/extensions/cmx_input-uniconv.inx
index 96f84d6b2..7840302d5 100644
--- a/share/extensions/cmx_input.inx
+++ b/share/extensions/cmx_input-uniconv.inx
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension">
-    <_name>Corel DRAW Presentation Exchange files input</_name>
-    <id>org.inkscape.input.cmx</id>
+    <_name>Corel DRAW Presentation Exchange files input (UC)</_name>
+    <id>org.inkscape.input.cmx.uniconvertor</id>
     <dependency type="executable" location="extensions">uniconv-ext.py</dependency>
     <input>
         <extension>.cmx</extension>
         <mimetype>application/x-xcmx</mimetype>
-        <_filetypename>Corel DRAW Presentation Exchange files (.cmx)</_filetypename>
-        <_filetypetooltip>Open presentation exchange files saved in Corel DRAW</_filetypetooltip>
+        <_filetypename>Corel DRAW Presentation Exchange files (UC) (.cmx)</_filetypename>
+        <_filetypetooltip>Open presentation exchange files saved in Corel DRAW (UC)</_filetypetooltip>
     </input>
     <script>
         <command reldir="extensions" interpreter="python">uniconv-ext.py</command>