From e31fe651573dd617dd27e146c9864d613c7cc904 Mon Sep 17 00:00:00 2001 From: su_v Date: Fri, 25 Jan 2013 11:17:25 +0100 Subject: 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) --- configure.ac | 2 +- share/extensions/Makefile.am | 7 ++++--- share/extensions/ccx_input-uniconv.inx | 15 +++++++++++++++ share/extensions/ccx_input.inx | 15 --------------- share/extensions/cdr_input-uniconv.inx | 17 +++++++++++++++++ share/extensions/cdt_input-uniconv.inx | 15 +++++++++++++++ share/extensions/cdt_input.inx | 15 --------------- share/extensions/cmx_input-uniconv.inx | 15 +++++++++++++++ share/extensions/cmx_input.inx | 15 --------------- 9 files changed, 67 insertions(+), 49 deletions(-) create mode 100644 share/extensions/ccx_input-uniconv.inx delete mode 100644 share/extensions/ccx_input.inx create mode 100644 share/extensions/cdr_input-uniconv.inx create mode 100644 share/extensions/cdt_input-uniconv.inx delete mode 100644 share/extensions/cdt_input.inx create mode 100644 share/extensions/cmx_input-uniconv.inx delete mode 100644 share/extensions/cmx_input.inx 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-uniconv.inx b/share/extensions/ccx_input-uniconv.inx new file mode 100644 index 000000000..040a2891a --- /dev/null +++ b/share/extensions/ccx_input-uniconv.inx @@ -0,0 +1,15 @@ + + + <_name>Corel DRAW Compressed Exchange files input (UC) + org.inkscape.input.ccx.uniconvertor + uniconv-ext.py + + .ccx + application/x-xccx + <_filetypename>Corel DRAW Compressed Exchange files (UC) (.ccx) + <_filetypetooltip>Open compressed exchange files saved in Corel DRAW (UC) + + + diff --git a/share/extensions/ccx_input.inx b/share/extensions/ccx_input.inx deleted file mode 100644 index 4dcd43b8e..000000000 --- a/share/extensions/ccx_input.inx +++ /dev/null @@ -1,15 +0,0 @@ - - - <_name>Corel DRAW Compressed Exchange files input - org.inkscape.input.ccx - uniconv-ext.py - - .ccx - application/x-xccx - <_filetypename>Corel DRAW Compressed Exchange files (.ccx) - <_filetypetooltip>Open compressed exchange files saved in Corel DRAW - - - 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 @@ + + + <_name>Corel DRAW Input (UC) + org.inkscape.input.cdr.uniconvertor + + uniconv-ext.py + + .cdr + image/x-xcdr + <_filetypename>Corel DRAW 7-X4 files (UC) (*.cdr) + <_filetypetooltip>Open files saved in Corel DRAW 7-X4 (UC) + org.inkscape.output.cdr + + + diff --git a/share/extensions/cdt_input-uniconv.inx b/share/extensions/cdt_input-uniconv.inx new file mode 100644 index 000000000..78d5c6a97 --- /dev/null +++ b/share/extensions/cdt_input-uniconv.inx @@ -0,0 +1,15 @@ + + + <_name>Corel DRAW templates input (UC) + org.inkscape.input.cdt.uniconvertor + uniconv-ext.py + + .cdt + application/x-xcdt + <_filetypename>Corel DRAW 7-13 template files (UC) (.cdt) + <_filetypetooltip>Open files saved in Corel DRAW 7-13 (UC) + + + diff --git a/share/extensions/cdt_input.inx b/share/extensions/cdt_input.inx deleted file mode 100644 index 6bed364f6..000000000 --- a/share/extensions/cdt_input.inx +++ /dev/null @@ -1,15 +0,0 @@ - - - <_name>Corel DRAW templates input - org.inkscape.input.cdt - uniconv-ext.py - - .cdt - application/x-xcdt - <_filetypename>Corel DRAW 7-13 template files (.cdt) - <_filetypetooltip>Open files saved in Corel DRAW 7-13 - - - diff --git a/share/extensions/cmx_input-uniconv.inx b/share/extensions/cmx_input-uniconv.inx new file mode 100644 index 000000000..7840302d5 --- /dev/null +++ b/share/extensions/cmx_input-uniconv.inx @@ -0,0 +1,15 @@ + + + <_name>Corel DRAW Presentation Exchange files input (UC) + org.inkscape.input.cmx.uniconvertor + uniconv-ext.py + + .cmx + application/x-xcmx + <_filetypename>Corel DRAW Presentation Exchange files (UC) (.cmx) + <_filetypetooltip>Open presentation exchange files saved in Corel DRAW (UC) + + + diff --git a/share/extensions/cmx_input.inx b/share/extensions/cmx_input.inx deleted file mode 100644 index 96f84d6b2..000000000 --- a/share/extensions/cmx_input.inx +++ /dev/null @@ -1,15 +0,0 @@ - - - <_name>Corel DRAW Presentation Exchange files input - org.inkscape.input.cmx - uniconv-ext.py - - .cmx - application/x-xcmx - <_filetypename>Corel DRAW Presentation Exchange files (.cmx) - <_filetypetooltip>Open presentation exchange files saved in Corel DRAW - - - -- cgit v1.2.3