wok rev 17288
Up: wget (1.16), inkscape (0.48.5).
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Oct 28 09:55:47 2014 +0200 (2014-10-28) |
| parents | 93fdae86db64 |
| children | cce1951ed236 |
| files | inkscape/description.txt inkscape/receipt inkscape/stuff/README inkscape/stuff/inkscape-0.47-gcc45.patch inkscape/stuff/inkscape.desktop inkscape/stuff/inkscape.png inkscape/stuff/patches/0001-Fix_Datamatrix_UI_issue.patch inkscape/stuff/patches/0002-Drop_PS_and_PDF_support_in_MimeType.patch inkscape/stuff/patches/0003-Fix_LP_-911146.patch inkscape/stuff/patches/0004-Fix_FTBFS_on_gcc-4.8.patch inkscape/stuff/patches/0005-Fix_FTBFS_due_to_tests.patch inkscape/stuff/patches/0006-Update_to_new_libwpg.patch inkscape/stuff/patches/series wget/description.txt wget/receipt |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/inkscape/description.txt Tue Oct 28 09:55:47 2014 +0200 1.3 @@ -0,0 +1,13 @@ 1.4 +Inkscape is an illustration editor which has everything needed to create 1.5 +professional-quality computer art. You can use it to make diagrams and 1.6 +illustrations, technical drawings, web graphics, clip art, icons and logos. 1.7 +A collection of hands-on tutorials show you how to combine lines, shapes and 1.8 +text of different types and styles to build up a picture. 1.9 +A selection of powerful vector graphics editing tools comes as standard. There 1.10 +is excellent support for paths, gradients, layers, alpha transparency and text 1.11 +flow control. An extensive library of filters allow you to apply realistic 1.12 +effects and extensions allow you to work with bitmaps, barcodes and printing 1.13 +marks, amongst other things. 1.14 +Most of the common vector formats are supported, including PDF, Adobe 1.15 +Illustrator and AutoCAD files, and it has unrivalled support for the SVG web 1.16 +graphics standard.
2.1 --- a/inkscape/receipt Mon Oct 27 12:48:51 2014 +0100 2.2 +++ b/inkscape/receipt Tue Oct 28 09:55:47 2014 +0200 2.3 @@ -1,9 +1,9 @@ 2.4 # SliTaz package receipt. 2.5 2.6 PACKAGE="inkscape" 2.7 -VERSION="0.48.3.1" 2.8 +VERSION="0.48.5" 2.9 CATEGORY="graphics" 2.10 -SHORT_DESC="Vector drawing application." 2.11 +SHORT_DESC="vector-based drawing program" 2.12 MAINTAINER="pankso@slitaz.org" 2.13 LICENSE="GPL2" 2.14 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.15 @@ -14,19 +14,17 @@ 2.16 DEPENDS="gc gtk+ libxslt libsigc++ glibmm gtkmm libxml2 libpng popt \ 2.17 xorg-libXdamage gsl aspell libgiomm lcms gtkspell libgomp poppler gcc-lib-base" 2.18 BUILD_DEPENDS="gc-dev gtk+-dev libxslt-dev libsigc++-dev glibmm-dev \ 2.19 -gtkmm-dev atkmm-dev popt-dev libgiomm-dev gsl gsl-dev lcms-dev gtkspell gtkspell-dev \ 2.20 -cairomm-dev libboost-dev libxml2-dev zlib-dev autoconf pkg-config intltool \ 2.21 -xorg-libXau-dev xorg-libXdmcp-dev automake libtool" 2.22 +gtkmm-dev atkmm-dev popt-dev libgiomm-dev gsl gsl-dev lcms-dev gtkspell \ 2.23 +gtkspell-dev cairomm-dev libboost-dev libxml2-dev zlib-dev autoconf pkg-config \ 2.24 +intltool xorg-libXau-dev xorg-libXdmcp-dev automake libtool" 2.25 2.26 # Rules to configure and make the package. 2.27 compile_rules() 2.28 { 2.29 - cd $src 2.30 - find src -name '*.h' -o -name '*.c*' | xargs \ 2.31 - sed -i 's|glibmm/i18n|glib/gi18n|' 2.32 - sed -i -e '\|^packaging/autopackage/default\.apspec$|d' configure.ac 2.33 -# InkBoard is now disabled by default, --enable-inkboard now exists 2.34 - 2.35 + for patchfile in $(cat $stuff/patches/series); do 2.36 + patch -p1 -i $stuff/patches/$patchfile 2.37 + done 2.38 + 2.39 ./configure \ 2.40 --prefix=/usr \ 2.41 --mandir=/usr/share/man \ 2.42 @@ -46,5 +44,14 @@ 2.43 rm -rf $fs/usr/share/inkscape/clipart 2.44 rm -rf $fs/usr/share/inkscape/tutorials 2.45 rm -rf $fs/usr/share/inkscape/examples 2.46 - rm -rf $fs/usr/share/inkscape/screens/keys* 2.47 + 2.48 + # Desktop file 2.49 + cp -a $install/usr/share/applications $fs/usr/share 2.50 + DESKTOP=$fs/usr/share/applications/inkscape.desktop 2.51 + sed -i '/^Name/d; s|X-GNOME-Full||g' $DESKTOP 2.52 + sdft $DESKTOP -g -tf -te -i 2.53 + 2.54 + # Icons 2.55 + cp -a $install/usr/share/icons $fs/usr/share 2.56 + rm -rf $fs/usr/share/icons/hicolor/256x256 2.57 }
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/inkscape/stuff/README Tue Oct 28 09:55:47 2014 +0200 3.3 @@ -0,0 +1,2 @@ 3.4 +Debian patches used: 3.5 +https://launchpad.net/debian/+source/inkscape/0.48.5-2
4.1 --- a/inkscape/stuff/inkscape-0.47-gcc45.patch Mon Oct 27 12:48:51 2014 +0100 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,81 +0,0 @@ 4.4 -diff -Naur inkscape-0.47-orig/src/eraser-context.cpp inkscape-0.47/src/eraser-context.cpp 4.5 ---- inkscape-0.47-orig/src/eraser-context.cpp 2010-02-18 08:45:58.000000000 -0500 4.6 -+++ inkscape-0.47/src/eraser-context.cpp 2010-02-18 08:46:26.000000000 -0500 4.7 -@@ -749,7 +749,7 @@ 4.8 - if ( eraserMode ) { 4.9 - toWorkOn = sp_document_partial_items_in_box(sp_desktop_document(desktop), desktop->dkey, bounds); 4.10 - } else { 4.11 -- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.12 -+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.13 - toWorkOn = sp_document_items_at_points(sp_desktop_document(desktop), desktop->dkey, r->getPoints()); 4.14 - } 4.15 - toWorkOn = g_slist_remove( toWorkOn, acid ); 4.16 -diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp inkscape-0.47/src/extension/internal/filter/filter-file.cpp 4.17 ---- inkscape-0.47-orig/src/extension/internal/filter/filter-file.cpp 2010-02-18 08:45:58.000000000 -0500 4.18 -+++ inkscape-0.47/src/extension/internal/filter/filter-file.cpp 2010-02-18 09:07:54.000000000 -0500 4.19 -@@ -161,7 +161,7 @@ 4.20 - mywriter writer; 4.21 - sp_repr_write_stream(node, writer, 0, FALSE, g_quark_from_static_string("svg"), 0, 0); 4.22 - 4.23 -- Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(g_strdup(writer.c_str()))); 4.24 -+ Inkscape::Extension::build_from_mem(xml_str, new Filter(g_strdup(writer.c_str()))); 4.25 - g_free(xml_str); 4.26 - return; 4.27 - } 4.28 -diff -Naur inkscape-0.47-orig/src/extension/internal/filter/filter.cpp inkscape-0.47/src/extension/internal/filter/filter.cpp 4.29 ---- inkscape-0.47-orig/src/extension/internal/filter/filter.cpp 2010-02-18 08:45:58.000000000 -0500 4.30 -+++ inkscape-0.47/src/extension/internal/filter/filter.cpp 2010-02-18 09:21:06.000000000 -0500 4.31 -@@ -217,7 +217,7 @@ 4.32 - "<menu-tip>%s</menu-tip>\n" 4.33 - "</effect>\n" 4.34 - "</inkscape-extension>\n", name, id, submenu, tip); 4.35 -- Inkscape::Extension::build_from_mem(xml_str, new Filter::Filter(filter)); 4.36 -+ Inkscape::Extension::build_from_mem(xml_str, new Filter(filter)); 4.37 - g_free(xml_str); 4.38 - return; 4.39 - } 4.40 -diff -Naur inkscape-0.47-orig/src/flood-context.cpp inkscape-0.47/src/flood-context.cpp 4.41 ---- inkscape-0.47-orig/src/flood-context.cpp 2010-02-18 08:45:58.000000000 -0500 4.42 -+++ inkscape-0.47/src/flood-context.cpp 2010-02-18 08:48:16.000000000 -0500 4.43 -@@ -900,7 +900,7 @@ 4.44 - if (is_point_fill) { 4.45 - fill_points.push_back(Geom::Point(event->button.x, event->button.y)); 4.46 - } else { 4.47 -- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.48 -+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.49 - fill_points = r->getPoints(); 4.50 - } 4.51 - 4.52 -@@ -1206,7 +1206,7 @@ 4.53 - 4.54 - case GDK_BUTTON_RELEASE: 4.55 - if (event->button.button == 1 && !event_context->space_panning) { 4.56 -- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.57 -+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.58 - if (r->is_started()) { 4.59 - // set "busy" cursor 4.60 - desktop->setWaitingCursor(); 4.61 -diff -Naur inkscape-0.47-orig/src/gradient-context.cpp inkscape-0.47/src/gradient-context.cpp 4.62 ---- inkscape-0.47-orig/src/gradient-context.cpp 2010-02-18 08:45:58.000000000 -0500 4.63 -+++ inkscape-0.47/src/gradient-context.cpp 2010-02-18 08:47:33.000000000 -0500 4.64 -@@ -641,7 +641,7 @@ 4.65 - if (!event_context->within_tolerance) { 4.66 - // we've been dragging, either do nothing (grdrag handles that), 4.67 - // or rubberband-select if we have rubberband 4.68 -- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.69 -+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.70 - if (r->is_started() && !event_context->within_tolerance) { 4.71 - // this was a rubberband drag 4.72 - if (r->getMode() == RUBBERBAND_MODE_RECT) { 4.73 -diff -Naur inkscape-0.47-orig/src/select-context.cpp inkscape-0.47/src/select-context.cpp 4.74 ---- inkscape-0.47-orig/src/select-context.cpp 2010-02-18 08:45:58.000000000 -0500 4.75 -+++ inkscape-0.47/src/select-context.cpp 2010-02-18 08:50:11.000000000 -0500 4.76 -@@ -602,7 +602,7 @@ 4.77 - } 4.78 - sc->item = NULL; 4.79 - } else { 4.80 -- Inkscape::Rubberband::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.81 -+ Inkscape::Rubberband *r = Inkscape::Rubberband::get(desktop); 4.82 - if (r->is_started() && !within_tolerance) { 4.83 - // this was a rubberband drag 4.84 - GSList *items = NULL;
5.1 --- a/inkscape/stuff/inkscape.desktop Mon Oct 27 12:48:51 2014 +0100 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,11 +0,0 @@ 5.4 -[Desktop Entry] 5.5 -Encoding=UTF-8 5.6 -Name=Inkscape Vector Graphics Editor 5.7 -Name[fr]=Dessins vectoriel Inkscape 5.8 -Name[pt]=Editor de vetores gráficos Inkscape 5.9 -Name[pt_BR]=Editor de vetores gráficos Inkscape 5.10 -Exec=inkscape 5.11 -Icon=inkscape 5.12 -Type=Application 5.13 -Terminal=false 5.14 -Categories=Application;Graphics;
6.1 Binary file inkscape/stuff/inkscape.png has changed
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/inkscape/stuff/patches/0001-Fix_Datamatrix_UI_issue.patch Tue Oct 28 09:55:47 2014 +0200 7.3 @@ -0,0 +1,158 @@ 7.4 +From: JazzyNico <nicoduf@yahoo.fr> 7.5 +Date: Tue, 2 Jul 2013 10:47:34 +0200 7.6 +Subject: Fix_Datamatrix_UI_issue 7.7 + 7.8 +Prevent invalid input in Datamatrix extension dialog. 7.9 + 7.10 +As reference: 7.11 +- Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127 7.12 +- Bug: https://launchpad.net/bugs/738108 7.13 +- Bug-Debian: http://bugs.debian.org/618835 7.14 +- Bug-Ubuntu: https://launchpad.net/bugs/738108 7.15 +- Last-Update: 2011-06-02 7.16 + 7.17 +Signed-off-by: Matteo F. Vescovi <mfv.debian@gmail.com> 7.18 +--- 7.19 + share/extensions/render_barcode_datamatrix.inx | 38 +++++++++++++++++--- 7.20 + share/extensions/render_barcode_datamatrix.py | 49 ++++++++++++++++++++++++-- 7.21 + 2 files changed, 80 insertions(+), 7 deletions(-) 7.22 + 7.23 +diff --git a/share/extensions/render_barcode_datamatrix.inx b/share/extensions/render_barcode_datamatrix.inx 7.24 +index ea2aa47..ede179e 100644 7.25 +--- a/share/extensions/render_barcode_datamatrix.inx 7.26 ++++ b/share/extensions/render_barcode_datamatrix.inx 7.27 +@@ -4,10 +4,40 @@ 7.28 + <id>il.datamatrix</id> 7.29 + <dependency type="executable" location="extensions">render_barcode_datamatrix.py</dependency> 7.30 + <dependency type="executable" location="extensions">inkex.py</dependency> 7.31 +- <param name="text" type="string" _gui-text="Text">Inkscape</param> 7.32 +- <param name="rows" type="int" min="8" max="144" _gui-text="Rows">10</param> 7.33 +- <param name="cols" type="int" min="10" max="144" _gui-text="Cols">10</param> 7.34 +- <param name="size" type="int" min="1" max="1000" _gui-text="Square Size / px">4</param> 7.35 ++ <param name="text" type="string" _gui-text="Text:">Inkscape</param> 7.36 ++ <param name="symbol" _gui-text="Size, in unit squares:" type="enum"> 7.37 ++ <item value="sq10">10x10</item> 7.38 ++ <item value="sq12">12x12</item> 7.39 ++ <item value="sq14">14x14</item> 7.40 ++ <item value="sq16">16x16</item> 7.41 ++ <item value="sq18">18x18</item> 7.42 ++ <item value="sq20">20x20</item> 7.43 ++ <item value="sq22">22x22</item> 7.44 ++ <item value="sq24">24x24</item> 7.45 ++ <item value="sq26">26x26</item> 7.46 ++ <item value="sq32">32x32</item> 7.47 ++ <item value="sq36">36x36</item> 7.48 ++ <item value="sq40">40x40</item> 7.49 ++ <item value="sq44">44x44</item> 7.50 ++ <item value="sq48">48x48</item> 7.51 ++ <item value="sq52">52x52</item> 7.52 ++ <item value="sq64">64x64</item> 7.53 ++ <item value="sq72">72x72</item> 7.54 ++ <item value="sq80">80x80</item> 7.55 ++ <item value="sq88">88x88</item> 7.56 ++ <item value="sq96">96x96</item> 7.57 ++ <item value="sq104">104x104</item> 7.58 ++ <item value="sq120">120x120</item> 7.59 ++ <item value="sq132">132x132</item> 7.60 ++ <item value="sq144">144x144</item> 7.61 ++ <item value="rect8x18">8x18</item> 7.62 ++ <item value="rect8x32">8x32</item> 7.63 ++ <item value="rect12x26">12x26</item> 7.64 ++ <item value="rect12x36">12x36</item> 7.65 ++ <item value="rect16x36">16x36</item> 7.66 ++ <item value="rect16x48">16x48</item> 7.67 ++ </param> 7.68 ++ <param name="size" type="int" min="1" max="1000" _gui-text="Square Size (px):">4</param> 7.69 + <effect> 7.70 + <object-type>all</object-type> 7.71 + <effects-menu> 7.72 +diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py 7.73 +index e536554..20bcf94 100755 7.74 +--- a/share/extensions/render_barcode_datamatrix.py 7.75 ++++ b/share/extensions/render_barcode_datamatrix.py 7.76 +@@ -57,6 +57,39 @@ import inkex, simplestyle 7.77 + import gettext 7.78 + _ = gettext.gettext 7.79 + 7.80 ++symbols = { 7.81 ++ 'sq10': (10, 10), 7.82 ++ 'sq12': (12, 12), 7.83 ++ 'sq14': (14, 14), 7.84 ++ 'sq16': (16, 16), 7.85 ++ 'sq18': (18, 18), 7.86 ++ 'sq20': (20, 20), 7.87 ++ 'sq22': (22, 22), 7.88 ++ 'sq24': (24, 24), 7.89 ++ 'sq26': (26, 26), 7.90 ++ 'sq32': (32, 32), 7.91 ++ 'sq36': (36, 36), 7.92 ++ 'sq40': (40, 40), 7.93 ++ 'sq44': (44, 44), 7.94 ++ 'sq48': (48, 48), 7.95 ++ 'sq52': (52, 52), 7.96 ++ 'sq64': (64, 64), 7.97 ++ 'sq72': (72, 72), 7.98 ++ 'sq80': (80, 80), 7.99 ++ 'sq88': (88, 88), 7.100 ++ 'sq96': (96, 96), 7.101 ++ 'sq104': (104, 104), 7.102 ++ 'sq120': (120, 120), 7.103 ++ 'sq132': (132, 132), 7.104 ++ 'sq144': (144, 144), 7.105 ++ 'rect8x18': (8, 18), 7.106 ++ 'rect8x32': (8, 32), 7.107 ++ 'rect12x26': (12, 26), 7.108 ++ 'rect12x36': (12, 36), 7.109 ++ 'rect16x36': (16, 36), 7.110 ++ 'rect16x48': (16, 48), 7.111 ++} 7.112 ++ 7.113 + #ENCODING ROUTINES =================================================== 7.114 + # Take an input string and convert it to a sequence (or sequences) 7.115 + # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3) 7.116 +@@ -167,6 +200,7 @@ def get_parameters(nrow, ncol): 7.117 + #RETURN ERROR 7.118 + else: 7.119 + inkex.errormsg(_('Unrecognised DataMatrix size')) 7.120 ++ exit(0) 7.121 + 7.122 + return None 7.123 + 7.124 +@@ -616,6 +650,9 @@ class DataMatrix(inkex.Effect): 7.125 + self.OptionParser.add_option("--text", 7.126 + action="store", type="string", 7.127 + dest="TEXT", default='Inkscape') 7.128 ++ self.OptionParser.add_option("--symbol", 7.129 ++ action="store", type="string", 7.130 ++ dest="SYMBOL", default='') 7.131 + self.OptionParser.add_option("--rows", 7.132 + action="store", type="int", 7.133 + dest="ROWS", default=10) 7.134 +@@ -630,6 +667,12 @@ class DataMatrix(inkex.Effect): 7.135 + 7.136 + so = self.options 7.137 + 7.138 ++ rows = so.ROWS 7.139 ++ cols = so.COLS 7.140 ++ if (so.SYMBOL != '' and (so.SYMBOL in symbols)): 7.141 ++ rows = symbols[so.SYMBOL][0] 7.142 ++ cols = symbols[so.SYMBOL][1] 7.143 ++ 7.144 + if so.TEXT == '': #abort if converting blank text 7.145 + inkex.errormsg(_('Please enter an input string')) 7.146 + else: 7.147 +@@ -644,11 +687,11 @@ class DataMatrix(inkex.Effect): 7.148 + grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in 7.149 + 7.150 + #GENERATE THE DATAMATRIX 7.151 +- encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares 7.152 +- render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements 7.153 ++ encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares 7.154 ++ render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements 7.155 + 7.156 + if __name__ == '__main__': 7.157 + e = DataMatrix() 7.158 + e.affect() 7.159 + 7.160 +-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99 7.161 ++# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/inkscape/stuff/patches/0002-Drop_PS_and_PDF_support_in_MimeType.patch Tue Oct 28 09:55:47 2014 +0200 8.3 @@ -0,0 +1,22 @@ 8.4 +From: Wolfram Quester <wolfi@sigxcpu.org> 8.5 +Date: Tue, 2 Jul 2013 10:57:33 +0200 8.6 +Subject: Drop_PS_and_PDF_support_in_MimeType 8.7 + 8.8 +Signed-off-by: Matteo F. Vescovi <mfv.debian@gmail.com> 8.9 +--- 8.10 + inkscape.desktop.in | 2 +- 8.11 + 1 file changed, 1 insertion(+), 1 deletion(-) 8.12 + 8.13 +diff --git a/inkscape.desktop.in b/inkscape.desktop.in 8.14 +index 5c0de64..62ce1e4 100644 8.15 +--- a/inkscape.desktop.in 8.16 ++++ b/inkscape.desktop.in 8.17 +@@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphics Editor 8.18 + _Comment=Create and edit Scalable Vector Graphics images 8.19 + Type=Application 8.20 + Categories=Graphics;VectorGraphics;GTK; 8.21 +-MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; 8.22 ++MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;image/x-eps;application/illustrator; 8.23 + Exec=inkscape %F 8.24 + TryExec=inkscape 8.25 + Terminal=false
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/inkscape/stuff/patches/0003-Fix_LP_-911146.patch Tue Oct 28 09:55:47 2014 +0200 9.3 @@ -0,0 +1,32 @@ 9.4 +From: Michael Karcher <debian@mkarcher.dialup.fu-berlin.de> 9.5 +Date: Tue, 2 Jul 2013 11:02:23 +0200 9.6 +Subject: Fix_LP_#911146 9.7 + 9.8 +Ensures that filenames passed to extensions are made absolute 9.9 +before changing the current working directory. 9.10 + 9.11 +Signed-off-by: Matteo F. Vescovi <mfv.debian@gmail.com> 9.12 +--- 9.13 + src/extension/implementation/script.cpp | 9 ++++++++- 9.14 + 1 file changed, 8 insertions(+), 1 deletion(-) 9.15 + 9.16 +diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp 9.17 +index 5c485a6..b4e9847 100644 9.18 +--- a/src/extension/implementation/script.cpp 9.19 ++++ b/src/extension/implementation/script.cpp 9.20 +@@ -956,7 +956,14 @@ int Script::execute (const std::list<std::string> &in_command, 9.21 + // assemble the rest of argv 9.22 + std::copy(in_params.begin(), in_params.end(), std::back_inserter(argv)); 9.23 + if (!filein.empty()) { 9.24 +- argv.push_back(filein); 9.25 ++ if(Glib::path_is_absolute(filein)) 9.26 ++ argv.push_back(filein); 9.27 ++ else { 9.28 ++ std::vector<std::string> buildargs; 9.29 ++ buildargs.push_back(Glib::get_current_dir()); 9.30 ++ buildargs.push_back(filein); 9.31 ++ argv.push_back(Glib::build_filename(buildargs)); 9.32 ++ } 9.33 + } 9.34 + 9.35 + int stdout_pipe, stderr_pipe;
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/inkscape/stuff/patches/0004-Fix_FTBFS_on_gcc-4.8.patch Tue Oct 28 09:55:47 2014 +0200 10.3 @@ -0,0 +1,77 @@ 10.4 +From: Mattia Rizzolo <mattia@mapreri.org> 10.5 +Date: Tue, 8 Jul 2014 12:33:57 +0200 10.6 +Subject: Fix_FTBFS_on_gcc-4.8 10.7 + 10.8 +Last-Update: 2014-07-02 10.9 + 10.10 +Signed-off-by: Matteo F. Vescovi <mfvescovi@gmail.com> 10.11 +--- 10.12 + src/libavoid/vpsc.cpp | 2 +- 10.13 + src/libcola/straightener.cpp | 6 +++--- 10.14 + src/libcroco/cr-parser.c | 2 +- 10.15 + src/libvpsc/block.cpp | 2 +- 10.16 + 4 files changed, 6 insertions(+), 6 deletions(-) 10.17 + 10.18 +diff --git a/src/libavoid/vpsc.cpp b/src/libavoid/vpsc.cpp 10.19 +index 19d3603..1646dda 100644 10.20 +--- a/src/libavoid/vpsc.cpp 10.21 ++++ b/src/libavoid/vpsc.cpp 10.22 +@@ -422,7 +422,7 @@ Constraint* IncSolver::mostViolated(Constraints &l) { 10.23 + // downwards. There is always at least 1 element in the 10.24 + // vector because of search. 10.25 + // TODO check this logic and add parens: 10.26 +- if((deletePoint != end) && ((minSlack < ZERO_UPPERBOUND) && !v->active || v->equality)) { 10.27 ++ if((deletePoint != end) && (((minSlack < ZERO_UPPERBOUND) && !v->active) || v->equality)) { 10.28 + *deletePoint = l[l.size()-1]; 10.29 + l.resize(l.size()-1); 10.30 + } 10.31 +diff --git a/src/libcola/straightener.cpp b/src/libcola/straightener.cpp 10.32 +index e237c03..7c73cb9 100644 10.33 +--- a/src/libcola/straightener.cpp 10.34 ++++ b/src/libcola/straightener.cpp 10.35 +@@ -108,7 +108,7 @@ namespace straightener { 10.36 + int compare_events(const void *a, const void *b) { 10.37 + Event *ea=*(Event**)a; 10.38 + Event *eb=*(Event**)b; 10.39 +- if(ea->v!=NULL&&ea->v==eb->v||ea->e!=NULL&&ea->e==eb->e) { 10.40 ++ if((ea->v!=NULL&&ea->v==eb->v)||(ea->e!=NULL&&ea->e==eb->e)) { 10.41 + // when comparing opening and closing from object 10.42 + // open must come first 10.43 + if(ea->type==Open) return -1; 10.44 +@@ -263,8 +263,8 @@ namespace straightener { 10.45 + // node is on an edge 10.46 + Edge *edge=(*i)->edge; 10.47 + if(!edge->isEnd(v->id) 10.48 +- &&(l!=NULL&&!edge->isEnd(l->id)||l==NULL) 10.49 +- &&(r!=NULL&&!edge->isEnd(r->id)||r==NULL)) { 10.50 ++ &&((l!=NULL&&!edge->isEnd(l->id))||l==NULL) 10.51 ++ &&((r!=NULL&&!edge->isEnd(r->id))||r==NULL)) { 10.52 + if(lastNode!=NULL) { 10.53 + //printf(" Rule A: Constraint: v%d +g <= v%d\n",lastNode->id,(*i)->id); 10.54 + cs.push_back(createConstraint(lastNode,*i,dim)); 10.55 +diff --git a/src/libcroco/cr-parser.c b/src/libcroco/cr-parser.c 10.56 +index 5b0a56f..a8e2de5 100644 10.57 +--- a/src/libcroco/cr-parser.c 10.58 ++++ b/src/libcroco/cr-parser.c 10.59 +@@ -2408,7 +2408,7 @@ cr_parser_parse_stylesheet (CRParser * a_this) 10.60 + import_string, 10.61 + NULL, &location) ; 10.62 + 10.63 +- if ((PRIVATE (a_this)->sac_handler->resolve_import == TRUE)) { 10.64 ++ if (PRIVATE (a_this)->sac_handler->resolve_import == TRUE) { 10.65 + /* 10.66 + *TODO: resolve the 10.67 + *import rule. 10.68 +diff --git a/src/libvpsc/block.cpp b/src/libvpsc/block.cpp 10.69 +index 221df53..0bd662f 100644 10.70 +--- a/src/libvpsc/block.cpp 10.71 ++++ b/src/libvpsc/block.cpp 10.72 +@@ -72,7 +72,7 @@ void Block::setUpConstraintHeap(PairingHeap<Constraint*>* &h,bool in) { 10.73 + for (Cit j=cs->begin();j!=cs->end();++j) { 10.74 + Constraint *c=*j; 10.75 + c->timeStamp=blockTimeCtr; 10.76 +- if (c->left->block != this && in || c->right->block != this && !in) { 10.77 ++ if ((c->left->block != this && in) || (c->right->block != this && !in)) { 10.78 + h->insert(c); 10.79 + } 10.80 + }
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/inkscape/stuff/patches/0005-Fix_FTBFS_due_to_tests.patch Tue Oct 28 09:55:47 2014 +0200 11.3 @@ -0,0 +1,482 @@ 11.4 +From: Mattia Rizzolo <mattia@mapreri.org> 11.5 +Date: Tue, 8 Jul 2014 14:14:42 +0200 11.6 +Subject: Fix_FTBFS_due_to_tests 11.7 + 11.8 +Fix FTBFS in the test suite, to let the tests run. 11.9 + 11.10 +Last-Update: 2014-07-02 11.11 + 11.12 +Signed-off-by: Matteo F. Vescovi <mfvescovi@gmail.com> 11.13 +--- 11.14 + src/cxxtests.cpp | 124 +++++++++++++++++++++++++++---------------------------- 11.15 + 1 file changed, 62 insertions(+), 62 deletions(-) 11.16 + 11.17 +diff --git a/src/cxxtests.cpp b/src/cxxtests.cpp 11.18 +index 7324466..76ff6a7 100644 11.19 +--- a/src/cxxtests.cpp 11.20 ++++ b/src/cxxtests.cpp 11.21 +@@ -23,12 +23,12 @@ int main( int argc, char *argv[] ) 11.22 + #include <cxxtest/TestRunner.h> 11.23 + #include <cxxtest/RealDescriptions.h> 11.24 + 11.25 +-#include "../../src/attributes-test.h" 11.26 ++#include "attributes-test.h" 11.27 + 11.28 + static AttributesTest *suite_AttributesTest = 0; 11.29 + 11.30 + static CxxTest::List Tests_AttributesTest = { 0, 0 }; 11.31 +-CxxTest::DynamicSuiteDescription<AttributesTest> suiteDescription_AttributesTest( "../../src/attributes-test.h", 13, "AttributesTest", Tests_AttributesTest, suite_AttributesTest, 24, 25 ); 11.32 ++CxxTest::DynamicSuiteDescription<AttributesTest> suiteDescription_AttributesTest( "attributes-test.h", 13, "AttributesTest", Tests_AttributesTest, suite_AttributesTest, 24, 25 ); 11.33 + 11.34 + static class TestDescription_AttributesTest_testAttributes : public CxxTest::RealTestDescription { 11.35 + public: 11.36 +@@ -36,12 +36,12 @@ public: 11.37 + void runTest() { if ( suite_AttributesTest ) suite_AttributesTest->testAttributes(); } 11.38 + } testDescription_AttributesTest_testAttributes; 11.39 + 11.40 +-#include "../../src/color-profile-test.h" 11.41 ++#include "color-profile-test.h" 11.42 + 11.43 + static ColorProfileTest *suite_ColorProfileTest = 0; 11.44 + 11.45 + static CxxTest::List Tests_ColorProfileTest = { 0, 0 }; 11.46 +-CxxTest::DynamicSuiteDescription<ColorProfileTest> suiteDescription_ColorProfileTest( "../../src/color-profile-test.h", 13, "ColorProfileTest", Tests_ColorProfileTest, suite_ColorProfileTest, 45, 51 ); 11.47 ++CxxTest::DynamicSuiteDescription<ColorProfileTest> suiteDescription_ColorProfileTest( "color-profile-test.h", 13, "ColorProfileTest", Tests_ColorProfileTest, suite_ColorProfileTest, 45, 51 ); 11.48 + 11.49 + static class TestDescription_ColorProfileTest_testSetRenderingIntent : public CxxTest::RealTestDescription { 11.50 + public: 11.51 +@@ -61,12 +61,12 @@ public: 11.52 + void runTest() { if ( suite_ColorProfileTest ) suite_ColorProfileTest->testSetName(); } 11.53 + } testDescription_ColorProfileTest_testSetName; 11.54 + 11.55 +-#include "../../src/dir-util-test.h" 11.56 ++#include "dir-util-test.h" 11.57 + 11.58 + static DirUtilTest suite_DirUtilTest; 11.59 + 11.60 + static CxxTest::List Tests_DirUtilTest = { 0, 0 }; 11.61 +-CxxTest::StaticSuiteDescription suiteDescription_DirUtilTest( "../../src/dir-util-test.h", 9, "DirUtilTest", suite_DirUtilTest, Tests_DirUtilTest ); 11.62 ++CxxTest::StaticSuiteDescription suiteDescription_DirUtilTest( "dir-util-test.h", 9, "DirUtilTest", suite_DirUtilTest, Tests_DirUtilTest ); 11.63 + 11.64 + static class TestDescription_DirUtilTest_testBase : public CxxTest::RealTestDescription { 11.65 + public: 11.66 +@@ -74,12 +74,12 @@ public: 11.67 + void runTest() { suite_DirUtilTest.testBase(); } 11.68 + } testDescription_DirUtilTest_testBase; 11.69 + 11.70 +-#include "../../src/extract-uri-test.h" 11.71 ++#include "extract-uri-test.h" 11.72 + 11.73 + static ExtractURITest suite_ExtractURITest; 11.74 + 11.75 + static CxxTest::List Tests_ExtractURITest = { 0, 0 }; 11.76 +-CxxTest::StaticSuiteDescription suiteDescription_ExtractURITest( "../../src/extract-uri-test.h", 9, "ExtractURITest", suite_ExtractURITest, Tests_ExtractURITest ); 11.77 ++CxxTest::StaticSuiteDescription suiteDescription_ExtractURITest( "extract-uri-test.h", 9, "ExtractURITest", suite_ExtractURITest, Tests_ExtractURITest ); 11.78 + 11.79 + static class TestDescription_ExtractURITest_testBase : public CxxTest::RealTestDescription { 11.80 + public: 11.81 +@@ -99,12 +99,12 @@ public: 11.82 + void runTest() { suite_ExtractURITest.testQuoted(); } 11.83 + } testDescription_ExtractURITest_testQuoted; 11.84 + 11.85 +-#include "../../src/marker-test.h" 11.86 ++#include "marker-test.h" 11.87 + 11.88 + static MarkerTest suite_MarkerTest; 11.89 + 11.90 + static CxxTest::List Tests_MarkerTest = { 0, 0 }; 11.91 +-CxxTest::StaticSuiteDescription suiteDescription_MarkerTest( "../../src/marker-test.h", 14, "MarkerTest", suite_MarkerTest, Tests_MarkerTest ); 11.92 ++CxxTest::StaticSuiteDescription suiteDescription_MarkerTest( "marker-test.h", 14, "MarkerTest", suite_MarkerTest, Tests_MarkerTest ); 11.93 + 11.94 + static class TestDescription_MarkerTest_testMarkerLoc : public CxxTest::RealTestDescription { 11.95 + public: 11.96 +@@ -112,12 +112,12 @@ public: 11.97 + void runTest() { suite_MarkerTest.testMarkerLoc(); } 11.98 + } testDescription_MarkerTest_testMarkerLoc; 11.99 + 11.100 +-#include "../../src/mod360-test.h" 11.101 ++#include "mod360-test.h" 11.102 + 11.103 + static Mod360Test suite_Mod360Test; 11.104 + 11.105 + static CxxTest::List Tests_Mod360Test = { 0, 0 }; 11.106 +-CxxTest::StaticSuiteDescription suiteDescription_Mod360Test( "../../src/mod360-test.h", 12, "Mod360Test", suite_Mod360Test, Tests_Mod360Test ); 11.107 ++CxxTest::StaticSuiteDescription suiteDescription_Mod360Test( "mod360-test.h", 12, "Mod360Test", suite_Mod360Test, Tests_Mod360Test ); 11.108 + 11.109 + static class TestDescription_Mod360Test_testMod360 : public CxxTest::RealTestDescription { 11.110 + public: 11.111 +@@ -125,12 +125,12 @@ public: 11.112 + void runTest() { suite_Mod360Test.testMod360(); } 11.113 + } testDescription_Mod360Test_testMod360; 11.114 + 11.115 +-#include "../../src/round-test.h" 11.116 ++#include "round-test.h" 11.117 + 11.118 + static RoundTest *suite_RoundTest = 0; 11.119 + 11.120 + static CxxTest::List Tests_RoundTest = { 0, 0 }; 11.121 +-CxxTest::DynamicSuiteDescription<RoundTest> suiteDescription_RoundTest( "../../src/round-test.h", 10, "RoundTest", Tests_RoundTest, suite_RoundTest, 50, 51 ); 11.122 ++CxxTest::DynamicSuiteDescription<RoundTest> suiteDescription_RoundTest( "round-test.h", 10, "RoundTest", Tests_RoundTest, suite_RoundTest, 50, 51 ); 11.123 + 11.124 + static class TestDescription_RoundTest_testNonNegRound : public CxxTest::RealTestDescription { 11.125 + public: 11.126 +@@ -144,12 +144,12 @@ public: 11.127 + void runTest() { if ( suite_RoundTest ) suite_RoundTest->testNonPosRoung(); } 11.128 + } testDescription_RoundTest_testNonPosRoung; 11.129 + 11.130 +-#include "../../src/preferences-test.h" 11.131 ++#include "preferences-test.h" 11.132 + 11.133 + static PreferencesTest suite_PreferencesTest; 11.134 + 11.135 + static CxxTest::List Tests_PreferencesTest = { 0, 0 }; 11.136 +-CxxTest::StaticSuiteDescription suiteDescription_PreferencesTest( "../../src/preferences-test.h", 29, "PreferencesTest", suite_PreferencesTest, Tests_PreferencesTest ); 11.137 ++CxxTest::StaticSuiteDescription suiteDescription_PreferencesTest( "preferences-test.h", 29, "PreferencesTest", suite_PreferencesTest, Tests_PreferencesTest ); 11.138 + 11.139 + static class TestDescription_PreferencesTest_testStartingState : public CxxTest::RealTestDescription { 11.140 + public: 11.141 +@@ -193,12 +193,12 @@ public: 11.142 + void runTest() { suite_PreferencesTest.testPreferencesEntryMethods(); } 11.143 + } testDescription_PreferencesTest_testPreferencesEntryMethods; 11.144 + 11.145 +-#include "../../src/sp-style-elem-test.h" 11.146 ++#include "sp-style-elem-test.h" 11.147 + 11.148 + static SPStyleElemTest *suite_SPStyleElemTest = 0; 11.149 + 11.150 + static CxxTest::List Tests_SPStyleElemTest = { 0, 0 }; 11.151 +-CxxTest::DynamicSuiteDescription<SPStyleElemTest> suiteDescription_SPStyleElemTest( "../../src/sp-style-elem-test.h", 12, "SPStyleElemTest", Tests_SPStyleElemTest, suite_SPStyleElemTest, 43, 48 ); 11.152 ++CxxTest::DynamicSuiteDescription<SPStyleElemTest> suiteDescription_SPStyleElemTest( "sp-style-elem-test.h", 12, "SPStyleElemTest", Tests_SPStyleElemTest, suite_SPStyleElemTest, 43, 48 ); 11.153 + 11.154 + static class TestDescription_SPStyleElemTest_testSetType : public CxxTest::RealTestDescription { 11.155 + public: 11.156 +@@ -224,12 +224,12 @@ public: 11.157 + void runTest() { if ( suite_SPStyleElemTest ) suite_SPStyleElemTest->testReadContent(); } 11.158 + } testDescription_SPStyleElemTest_testReadContent; 11.159 + 11.160 +-#include "../../src/style-test.h" 11.161 ++#include "style-test.h" 11.162 + 11.163 + static StyleTest *suite_StyleTest = 0; 11.164 + 11.165 + static CxxTest::List Tests_StyleTest = { 0, 0 }; 11.166 +-CxxTest::DynamicSuiteDescription<StyleTest> suiteDescription_StyleTest( "../../src/style-test.h", 11, "StyleTest", Tests_StyleTest, suite_StyleTest, 37, 43 ); 11.167 ++CxxTest::DynamicSuiteDescription<StyleTest> suiteDescription_StyleTest( "style-test.h", 11, "StyleTest", Tests_StyleTest, suite_StyleTest, 37, 43 ); 11.168 + 11.169 + static class TestDescription_StyleTest_testOne : public CxxTest::RealTestDescription { 11.170 + public: 11.171 +@@ -237,12 +237,12 @@ public: 11.172 + void runTest() { if ( suite_StyleTest ) suite_StyleTest->testOne(); } 11.173 + } testDescription_StyleTest_testOne; 11.174 + 11.175 +-#include "../../src/verbs-test.h" 11.176 ++#include "verbs-test.h" 11.177 + 11.178 + static VerbsTest suite_VerbsTest; 11.179 + 11.180 + static CxxTest::List Tests_VerbsTest = { 0, 0 }; 11.181 +-CxxTest::StaticSuiteDescription suiteDescription_VerbsTest( "../../src/verbs-test.h", 7, "VerbsTest", suite_VerbsTest, Tests_VerbsTest ); 11.182 ++CxxTest::StaticSuiteDescription suiteDescription_VerbsTest( "verbs-test.h", 7, "VerbsTest", suite_VerbsTest, Tests_VerbsTest ); 11.183 + 11.184 + static class TestDescription_VerbsTest_testEnumLength : public CxxTest::RealTestDescription { 11.185 + public: 11.186 +@@ -262,12 +262,12 @@ public: 11.187 + void runTest() { suite_VerbsTest.testFetch(); } 11.188 + } testDescription_VerbsTest_testFetch; 11.189 + 11.190 +-#include "../../src/display/curve-test.h" 11.191 ++#include "display/curve-test.h" 11.192 + 11.193 + static CurveTest *suite_CurveTest = 0; 11.194 + 11.195 + static CxxTest::List Tests_CurveTest = { 0, 0 }; 11.196 +-CxxTest::DynamicSuiteDescription<CurveTest> suiteDescription_CurveTest( "../../src/display/curve-test.h", 8, "CurveTest", Tests_CurveTest, suite_CurveTest, 35, 36 ); 11.197 ++CxxTest::DynamicSuiteDescription<CurveTest> suiteDescription_CurveTest( "display/curve-test.h", 8, "CurveTest", Tests_CurveTest, suite_CurveTest, 35, 36 ); 11.198 + 11.199 + static class TestDescription_CurveTest_testGetSegmentCount : public CxxTest::RealTestDescription { 11.200 + public: 11.201 +@@ -329,12 +329,12 @@ public: 11.202 + void runTest() { if ( suite_CurveTest ) suite_CurveTest->testPenultimatePoint(); } 11.203 + } testDescription_CurveTest_testPenultimatePoint; 11.204 + 11.205 +-#include "../../src/helper/units-test.h" 11.206 ++#include "helper/units-test.h" 11.207 + 11.208 + static UnitsTest *suite_UnitsTest = 0; 11.209 + 11.210 + static CxxTest::List Tests_UnitsTest = { 0, 0 }; 11.211 +-CxxTest::DynamicSuiteDescription<UnitsTest> suiteDescription_UnitsTest( "../../src/helper/units-test.h", 7, "UnitsTest", Tests_UnitsTest, suite_UnitsTest, 17, 18 ); 11.212 ++CxxTest::DynamicSuiteDescription<UnitsTest> suiteDescription_UnitsTest( "helper/units-test.h", 7, "UnitsTest", Tests_UnitsTest, suite_UnitsTest, 17, 18 ); 11.213 + 11.214 + static class TestDescription_UnitsTest_testConversions : public CxxTest::RealTestDescription { 11.215 + public: 11.216 +@@ -348,12 +348,12 @@ public: 11.217 + void runTest() { if ( suite_UnitsTest ) suite_UnitsTest->testUnitTable(); } 11.218 + } testDescription_UnitsTest_testUnitTable; 11.219 + 11.220 +-#include "../../src/libnr/in-svg-plane-test.h" 11.221 ++#include "libnr/in-svg-plane-test.h" 11.222 + 11.223 + static InSvgPlaneTest *suite_InSvgPlaneTest = 0; 11.224 + 11.225 + static CxxTest::List Tests_InSvgPlaneTest = { 0, 0 }; 11.226 +-CxxTest::DynamicSuiteDescription<InSvgPlaneTest> suiteDescription_InSvgPlaneTest( "../../src/libnr/in-svg-plane-test.h", 9, "InSvgPlaneTest", Tests_InSvgPlaneTest, suite_InSvgPlaneTest, 31, 32 ); 11.227 ++CxxTest::DynamicSuiteDescription<InSvgPlaneTest> suiteDescription_InSvgPlaneTest( "libnr/in-svg-plane-test.h", 9, "InSvgPlaneTest", Tests_InSvgPlaneTest, suite_InSvgPlaneTest, 31, 32 ); 11.228 + 11.229 + static class TestDescription_InSvgPlaneTest_testInSvgPlane : public CxxTest::RealTestDescription { 11.230 + public: 11.231 +@@ -361,12 +361,12 @@ public: 11.232 + void runTest() { if ( suite_InSvgPlaneTest ) suite_InSvgPlaneTest->testInSvgPlane(); } 11.233 + } testDescription_InSvgPlaneTest_testInSvgPlane; 11.234 + 11.235 +-#include "../../src/libnr/nr-compose-test.h" 11.236 ++#include "libnr/nr-compose-test.h" 11.237 + 11.238 + static NrComposeTest *suite_NrComposeTest = 0; 11.239 + 11.240 + static CxxTest::List Tests_NrComposeTest = { 0, 0 }; 11.241 +-CxxTest::DynamicSuiteDescription<NrComposeTest> suiteDescription_NrComposeTest( "../../src/libnr/nr-compose-test.h", 35, "NrComposeTest", Tests_NrComposeTest, suite_NrComposeTest, 110, 111 ); 11.242 ++CxxTest::DynamicSuiteDescription<NrComposeTest> suiteDescription_NrComposeTest( "libnr/nr-compose-test.h", 35, "NrComposeTest", Tests_NrComposeTest, suite_NrComposeTest, 110, 111 ); 11.243 + 11.244 + static class TestDescription_NrComposeTest_testnr_R8G8B8A8_N_EMPTY_R8G8B8A8_N : public CxxTest::RealTestDescription { 11.245 + public: 11.246 +@@ -518,12 +518,12 @@ public: 11.247 + void runTest() { if ( suite_NrComposeTest ) suite_NrComposeTest->testnr_R8G8B8_R8G8B8_R8G8B8A8_P_A8(); } 11.248 + } testDescription_NrComposeTest_testnr_R8G8B8_R8G8B8_R8G8B8A8_P_A8; 11.249 + 11.250 +-#include "../../src/libnr/nr-matrix-test.h" 11.251 ++#include "libnr/nr-matrix-test.h" 11.252 + 11.253 + static NrMatrixTest *suite_NrMatrixTest = 0; 11.254 + 11.255 + static CxxTest::List Tests_NrMatrixTest = { 0, 0 }; 11.256 +-CxxTest::DynamicSuiteDescription<NrMatrixTest> suiteDescription_NrMatrixTest( "../../src/libnr/nr-matrix-test.h", 23, "NrMatrixTest", Tests_NrMatrixTest, suite_NrMatrixTest, 44, 45 ); 11.257 ++CxxTest::DynamicSuiteDescription<NrMatrixTest> suiteDescription_NrMatrixTest( "libnr/nr-matrix-test.h", 23, "NrMatrixTest", Tests_NrMatrixTest, suite_NrMatrixTest, 44, 45 ); 11.258 + 11.259 + static class TestDescription_NrMatrixTest_testCtorsAssignmentOp : public CxxTest::RealTestDescription { 11.260 + public: 11.261 +@@ -585,12 +585,12 @@ public: 11.262 + void runTest() { if ( suite_NrMatrixTest ) suite_NrMatrixTest->testMatrixStarScale(); } 11.263 + } testDescription_NrMatrixTest_testMatrixStarScale; 11.264 + 11.265 +-#include "../../src/libnr/nr-point-fns-test.h" 11.266 ++#include "libnr/nr-point-fns-test.h" 11.267 + 11.268 + static NrPointFnsTest *suite_NrPointFnsTest = 0; 11.269 + 11.270 + static CxxTest::List Tests_NrPointFnsTest = { 0, 0 }; 11.271 +-CxxTest::DynamicSuiteDescription<NrPointFnsTest> suiteDescription_NrPointFnsTest( "../../src/libnr/nr-point-fns-test.h", 12, "NrPointFnsTest", Tests_NrPointFnsTest, suite_NrPointFnsTest, 37, 38 ); 11.272 ++CxxTest::DynamicSuiteDescription<NrPointFnsTest> suiteDescription_NrPointFnsTest( "libnr/nr-point-fns-test.h", 12, "NrPointFnsTest", Tests_NrPointFnsTest, suite_NrPointFnsTest, 37, 38 ); 11.273 + 11.274 + static class TestDescription_NrPointFnsTest_testL1 : public CxxTest::RealTestDescription { 11.275 + public: 11.276 +@@ -634,12 +634,12 @@ public: 11.277 + void runTest() { if ( suite_NrPointFnsTest ) suite_NrPointFnsTest->testIsUnitVector(); } 11.278 + } testDescription_NrPointFnsTest_testIsUnitVector; 11.279 + 11.280 +-#include "../../src/libnr/nr-rotate-test.h" 11.281 ++#include "libnr/nr-rotate-test.h" 11.282 + 11.283 + static NrRotateTest *suite_NrRotateTest = 0; 11.284 + 11.285 + static CxxTest::List Tests_NrRotateTest = { 0, 0 }; 11.286 +-CxxTest::DynamicSuiteDescription<NrRotateTest> suiteDescription_NrRotateTest( "../../src/libnr/nr-rotate-test.h", 13, "NrRotateTest", Tests_NrRotateTest, suite_NrRotateTest, 29, 30 ); 11.287 ++CxxTest::DynamicSuiteDescription<NrRotateTest> suiteDescription_NrRotateTest( "libnr/nr-rotate-test.h", 13, "NrRotateTest", Tests_NrRotateTest, suite_NrRotateTest, 29, 30 ); 11.288 + 11.289 + static class TestDescription_NrRotateTest_testCtorsCompares : public CxxTest::RealTestDescription { 11.290 + public: 11.291 +@@ -677,12 +677,12 @@ public: 11.292 + void runTest() { if ( suite_NrRotateTest ) suite_NrRotateTest->testOpDivRotateRotate(); } 11.293 + } testDescription_NrRotateTest_testOpDivRotateRotate; 11.294 + 11.295 +-#include "../../src/libnr/nr-rotate-fns-test.h" 11.296 ++#include "libnr/nr-rotate-fns-test.h" 11.297 + 11.298 + static NrRotateFnsTest *suite_NrRotateFnsTest = 0; 11.299 + 11.300 + static CxxTest::List Tests_NrRotateFnsTest = { 0, 0 }; 11.301 +-CxxTest::DynamicSuiteDescription<NrRotateFnsTest> suiteDescription_NrRotateFnsTest( "../../src/libnr/nr-rotate-fns-test.h", 8, "NrRotateFnsTest", Tests_NrRotateFnsTest, suite_NrRotateFnsTest, 19, 20 ); 11.302 ++CxxTest::DynamicSuiteDescription<NrRotateFnsTest> suiteDescription_NrRotateFnsTest( "libnr/nr-rotate-fns-test.h", 8, "NrRotateFnsTest", Tests_NrRotateFnsTest, suite_NrRotateFnsTest, 19, 20 ); 11.303 + 11.304 + static class TestDescription_NrRotateFnsTest_testRotateDegrees : public CxxTest::RealTestDescription { 11.305 + public: 11.306 +@@ -690,12 +690,12 @@ public: 11.307 + void runTest() { if ( suite_NrRotateFnsTest ) suite_NrRotateFnsTest->testRotateDegrees(); } 11.308 + } testDescription_NrRotateFnsTest_testRotateDegrees; 11.309 + 11.310 +-#include "../../src/libnr/nr-scale-test.h" 11.311 ++#include "libnr/nr-scale-test.h" 11.312 + 11.313 + static NrScaleTest *suite_NrScaleTest = 0; 11.314 + 11.315 + static CxxTest::List Tests_NrScaleTest = { 0, 0 }; 11.316 +-CxxTest::DynamicSuiteDescription<NrScaleTest> suiteDescription_NrScaleTest( "../../src/libnr/nr-scale-test.h", 6, "NrScaleTest", Tests_NrScaleTest, suite_NrScaleTest, 20, 21 ); 11.317 ++CxxTest::DynamicSuiteDescription<NrScaleTest> suiteDescription_NrScaleTest( "libnr/nr-scale-test.h", 6, "NrScaleTest", Tests_NrScaleTest, suite_NrScaleTest, 20, 21 ); 11.318 + 11.319 + static class TestDescription_NrScaleTest_testXY_CtorArrayOperator : public CxxTest::RealTestDescription { 11.320 + public: 11.321 +@@ -739,12 +739,12 @@ public: 11.322 + void runTest() { if ( suite_NrScaleTest ) suite_NrScaleTest->testOpDivScaleScale(); } 11.323 + } testDescription_NrScaleTest_testOpDivScaleScale; 11.324 + 11.325 +-#include "../../src/libnr/nr-translate-test.h" 11.326 ++#include "libnr/nr-translate-test.h" 11.327 + 11.328 + static NrTranslateTest *suite_NrTranslateTest = 0; 11.329 + 11.330 + static CxxTest::List Tests_NrTranslateTest = { 0, 0 }; 11.331 +-CxxTest::DynamicSuiteDescription<NrTranslateTest> suiteDescription_NrTranslateTest( "../../src/libnr/nr-translate-test.h", 11, "NrTranslateTest", Tests_NrTranslateTest, suite_NrTranslateTest, 28, 29 ); 11.332 ++CxxTest::DynamicSuiteDescription<NrTranslateTest> suiteDescription_NrTranslateTest( "libnr/nr-translate-test.h", 11, "NrTranslateTest", Tests_NrTranslateTest, suite_NrTranslateTest, 28, 29 ); 11.333 + 11.334 + static class TestDescription_NrTranslateTest_testCtorsArrayOperator : public CxxTest::RealTestDescription { 11.335 + public: 11.336 +@@ -776,12 +776,12 @@ public: 11.337 + void runTest() { if ( suite_NrTranslateTest ) suite_NrTranslateTest->testIdentity(); } 11.338 + } testDescription_NrTranslateTest_testIdentity; 11.339 + 11.340 +-#include "../../src/libnr/nr-types-test.h" 11.341 ++#include "libnr/nr-types-test.h" 11.342 + 11.343 + static NrTypesTest *suite_NrTypesTest = 0; 11.344 + 11.345 + static CxxTest::List Tests_NrTypesTest = { 0, 0 }; 11.346 +-CxxTest::DynamicSuiteDescription<NrTypesTest> suiteDescription_NrTypesTest( "../../src/libnr/nr-types-test.h", 8, "NrTypesTest", Tests_NrTypesTest, suite_NrTypesTest, 23, 24 ); 11.347 ++CxxTest::DynamicSuiteDescription<NrTypesTest> suiteDescription_NrTypesTest( "libnr/nr-types-test.h", 8, "NrTypesTest", Tests_NrTypesTest, suite_NrTypesTest, 23, 24 ); 11.348 + 11.349 + static class TestDescription_NrTypesTest_testXYValues : public CxxTest::RealTestDescription { 11.350 + public: 11.351 +@@ -843,12 +843,12 @@ public: 11.352 + void runTest() { if ( suite_NrTypesTest ) suite_NrTypesTest->testNormalize(); } 11.353 + } testDescription_NrTypesTest_testNormalize; 11.354 + 11.355 +-#include "../../src/svg/css-ostringstream-test.h" 11.356 ++#include "svg/css-ostringstream-test.h" 11.357 + 11.358 + static CSSOStringStreamTest *suite_CSSOStringStreamTest = 0; 11.359 + 11.360 + static CxxTest::List Tests_CSSOStringStreamTest = { 0, 0 }; 11.361 +-CxxTest::DynamicSuiteDescription<CSSOStringStreamTest> suiteDescription_CSSOStringStreamTest( "../../src/svg/css-ostringstream-test.h", 20, "CSSOStringStreamTest", Tests_CSSOStringStreamTest, suite_CSSOStringStreamTest, 26, 27 ); 11.362 ++CxxTest::DynamicSuiteDescription<CSSOStringStreamTest> suiteDescription_CSSOStringStreamTest( "svg/css-ostringstream-test.h", 20, "CSSOStringStreamTest", Tests_CSSOStringStreamTest, suite_CSSOStringStreamTest, 26, 27 ); 11.363 + 11.364 + static class TestDescription_CSSOStringStreamTest_testFloats : public CxxTest::RealTestDescription { 11.365 + public: 11.366 +@@ -868,12 +868,12 @@ public: 11.367 + void runTest() { if ( suite_CSSOStringStreamTest ) suite_CSSOStringStreamTest->testConcat(); } 11.368 + } testDescription_CSSOStringStreamTest_testConcat; 11.369 + 11.370 +-#include "../../src/svg/stringstream-test.h" 11.371 ++#include "svg/stringstream-test.h" 11.372 + 11.373 + static StringStreamTest *suite_StringStreamTest = 0; 11.374 + 11.375 + static CxxTest::List Tests_StringStreamTest = { 0, 0 }; 11.376 +-CxxTest::DynamicSuiteDescription<StringStreamTest> suiteDescription_StringStreamTest( "../../src/svg/stringstream-test.h", 21, "StringStreamTest", Tests_StringStreamTest, suite_StringStreamTest, 27, 28 ); 11.377 ++CxxTest::DynamicSuiteDescription<StringStreamTest> suiteDescription_StringStreamTest( "svg/stringstream-test.h", 21, "StringStreamTest", Tests_StringStreamTest, suite_StringStreamTest, 27, 28 ); 11.378 + 11.379 + static class TestDescription_StringStreamTest_testFloats : public CxxTest::RealTestDescription { 11.380 + public: 11.381 +@@ -893,12 +893,12 @@ public: 11.382 + void runTest() { if ( suite_StringStreamTest ) suite_StringStreamTest->testConcat(); } 11.383 + } testDescription_StringStreamTest_testConcat; 11.384 + 11.385 +-#include "../../src/svg/svg-affine-test.h" 11.386 ++#include "svg/svg-affine-test.h" 11.387 + 11.388 + static SvgAffineTest *suite_SvgAffineTest = 0; 11.389 + 11.390 + static CxxTest::List Tests_SvgAffineTest = { 0, 0 }; 11.391 +-CxxTest::DynamicSuiteDescription<SvgAffineTest> suiteDescription_SvgAffineTest( "../../src/svg/svg-affine-test.h", 12, "SvgAffineTest", Tests_SvgAffineTest, suite_SvgAffineTest, 46, 47 ); 11.392 ++CxxTest::DynamicSuiteDescription<SvgAffineTest> suiteDescription_SvgAffineTest( "svg/svg-affine-test.h", 12, "SvgAffineTest", Tests_SvgAffineTest, suite_SvgAffineTest, 46, 47 ); 11.393 + 11.394 + static class TestDescription_SvgAffineTest_testReadIdentity : public CxxTest::RealTestDescription { 11.395 + public: 11.396 +@@ -984,12 +984,12 @@ public: 11.397 + void runTest() { if ( suite_SvgAffineTest ) suite_SvgAffineTest->testReadFailures(); } 11.398 + } testDescription_SvgAffineTest_testReadFailures; 11.399 + 11.400 +-#include "../../src/svg/svg-color-test.h" 11.401 ++#include "svg/svg-color-test.h" 11.402 + 11.403 + static SVGColorTest *suite_SVGColorTest = 0; 11.404 + 11.405 + static CxxTest::List Tests_SVGColorTest = { 0, 0 }; 11.406 +-CxxTest::DynamicSuiteDescription<SVGColorTest> suiteDescription_SVGColorTest( "../../src/svg/svg-color-test.h", 9, "SVGColorTest", Tests_SVGColorTest, suite_SVGColorTest, 35, 36 ); 11.407 ++CxxTest::DynamicSuiteDescription<SVGColorTest> suiteDescription_SVGColorTest( "svg/svg-color-test.h", 9, "SVGColorTest", Tests_SVGColorTest, suite_SVGColorTest, 35, 36 ); 11.408 + 11.409 + static class TestDescription_SVGColorTest_testWrite : public CxxTest::RealTestDescription { 11.410 + public: 11.411 +@@ -1009,12 +1009,12 @@ public: 11.412 + void runTest() { if ( suite_SVGColorTest ) suite_SVGColorTest->testIccColor(); } 11.413 + } testDescription_SVGColorTest_testIccColor; 11.414 + 11.415 +-#include "../../src/svg/svg-length-test.h" 11.416 ++#include "svg/svg-length-test.h" 11.417 + 11.418 + static SvgLengthTest *suite_SvgLengthTest = 0; 11.419 + 11.420 + static CxxTest::List Tests_SvgLengthTest = { 0, 0 }; 11.421 +-CxxTest::DynamicSuiteDescription<SvgLengthTest> suiteDescription_SvgLengthTest( "../../src/svg/svg-length-test.h", 10, "SvgLengthTest", Tests_SvgLengthTest, suite_SvgLengthTest, 29, 30 ); 11.422 ++CxxTest::DynamicSuiteDescription<SvgLengthTest> suiteDescription_SvgLengthTest( "svg/svg-length-test.h", 10, "SvgLengthTest", Tests_SvgLengthTest, suite_SvgLengthTest, 29, 30 ); 11.423 + 11.424 + static class TestDescription_SvgLengthTest_testRead : public CxxTest::RealTestDescription { 11.425 + public: 11.426 +@@ -1058,12 +1058,12 @@ public: 11.427 + void runTest() { if ( suite_SvgLengthTest ) suite_SvgLengthTest->testPlaces(); } 11.428 + } testDescription_SvgLengthTest_testPlaces; 11.429 + 11.430 +-#include "../../src/svg/svg-path-geom-test.h" 11.431 ++#include "svg/svg-path-geom-test.h" 11.432 + 11.433 + static SvgPathGeomTest *suite_SvgPathGeomTest = 0; 11.434 + 11.435 + static CxxTest::List Tests_SvgPathGeomTest = { 0, 0 }; 11.436 +-CxxTest::DynamicSuiteDescription<SvgPathGeomTest> suiteDescription_SvgPathGeomTest( "../../src/svg/svg-path-geom-test.h", 13, "SvgPathGeomTest", Tests_SvgPathGeomTest, suite_SvgPathGeomTest, 69, 70 ); 11.437 ++CxxTest::DynamicSuiteDescription<SvgPathGeomTest> suiteDescription_SvgPathGeomTest( "svg/svg-path-geom-test.h", 13, "SvgPathGeomTest", Tests_SvgPathGeomTest, suite_SvgPathGeomTest, 69, 70 ); 11.438 + 11.439 + static class TestDescription_SvgPathGeomTest_testReadRectanglesAbsoluteClosed : public CxxTest::RealTestDescription { 11.440 + public: 11.441 +@@ -1179,12 +1179,12 @@ public: 11.442 + void runTest() { if ( suite_SvgPathGeomTest ) suite_SvgPathGeomTest->testMinexpPrecision(); } 11.443 + } testDescription_SvgPathGeomTest_testMinexpPrecision; 11.444 + 11.445 +-#include "../../src/xml/repr-action-test.h" 11.446 ++#include "xml/repr-action-test.h" 11.447 + 11.448 + static XmlReprActionTest *suite_XmlReprActionTest = 0; 11.449 + 11.450 + static CxxTest::List Tests_XmlReprActionTest = { 0, 0 }; 11.451 +-CxxTest::DynamicSuiteDescription<XmlReprActionTest> suiteDescription_XmlReprActionTest( "../../src/xml/repr-action-test.h", 11, "XmlReprActionTest", Tests_XmlReprActionTest, suite_XmlReprActionTest, 33, 34 ); 11.452 ++CxxTest::DynamicSuiteDescription<XmlReprActionTest> suiteDescription_XmlReprActionTest( "xml/repr-action-test.h", 11, "XmlReprActionTest", Tests_XmlReprActionTest, suite_XmlReprActionTest, 33, 34 ); 11.453 + 11.454 + static class TestDescription_XmlReprActionTest_testRollbackOfNodeAddition : public CxxTest::RealTestDescription { 11.455 + public: 11.456 +@@ -1204,12 +1204,12 @@ public: 11.457 + void runTest() { if ( suite_XmlReprActionTest ) suite_XmlReprActionTest->testRollbackOfNodeReordering(); } 11.458 + } testDescription_XmlReprActionTest_testRollbackOfNodeReordering; 11.459 + 11.460 +-#include "../../src/xml/quote-test.h" 11.461 ++#include "xml/quote-test.h" 11.462 + 11.463 + static XmlQuoteTest *suite_XmlQuoteTest = 0; 11.464 + 11.465 + static CxxTest::List Tests_XmlQuoteTest = { 0, 0 }; 11.466 +-CxxTest::DynamicSuiteDescription<XmlQuoteTest> suiteDescription_XmlQuoteTest( "../../src/xml/quote-test.h", 15, "XmlQuoteTest", Tests_XmlQuoteTest, suite_XmlQuoteTest, 26, 27 ); 11.467 ++CxxTest::DynamicSuiteDescription<XmlQuoteTest> suiteDescription_XmlQuoteTest( "xml/quote-test.h", 15, "XmlQuoteTest", Tests_XmlQuoteTest, suite_XmlQuoteTest, 26, 27 ); 11.468 + 11.469 + static class TestDescription_XmlQuoteTest_testXmlQuotedStrlen : public CxxTest::RealTestDescription { 11.470 + public: 11.471 +@@ -1223,12 +1223,12 @@ public: 11.472 + void runTest() { if ( suite_XmlQuoteTest ) suite_XmlQuoteTest->testXmlQuoteStrdup(); } 11.473 + } testDescription_XmlQuoteTest_testXmlQuoteStrdup; 11.474 + 11.475 +-#include "../../src/util/list-container-test.h" 11.476 ++#include "util/list-container-test.h" 11.477 + 11.478 + static ListContainerTest *suite_ListContainerTest = 0; 11.479 + 11.480 + static CxxTest::List Tests_ListContainerTest = { 0, 0 }; 11.481 +-CxxTest::DynamicSuiteDescription<ListContainerTest> suiteDescription_ListContainerTest( "../../src/util/list-container-test.h", 28, "ListContainerTest", Tests_ListContainerTest, suite_ListContainerTest, 38, 39 ); 11.482 ++CxxTest::DynamicSuiteDescription<ListContainerTest> suiteDescription_ListContainerTest( "util/list-container-test.h", 28, "ListContainerTest", Tests_ListContainerTest, suite_ListContainerTest, 38, 39 ); 11.483 + 11.484 + static class TestDescription_ListContainerTest_testRangeConstructor : public CxxTest::RealTestDescription { 11.485 + public:
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/inkscape/stuff/patches/0006-Update_to_new_libwpg.patch Tue Oct 28 09:55:47 2014 +0200 12.3 @@ -0,0 +1,111 @@ 12.4 +From: David Tardon <dtardon@redhat.com> 12.5 +Date: Tue, 27 May 2014 16:47:39 +0200 12.6 +Subject: Update_to_new_libwpg 12.7 + 12.8 +--- 12.9 + configure.ac | 19 ++--------------- 12.10 + src/extension/internal/wpg-input.cpp | 41 ++++++++++++------------------------ 12.11 + 2 files changed, 15 insertions(+), 45 deletions(-) 12.12 + 12.13 +diff --git a/configure.ac b/configure.ac 12.14 +index fcff879..4bce58c 100644 12.15 +--- a/configure.ac 12.16 ++++ b/configure.ac 12.17 +@@ -676,23 +676,8 @@ dnl ****************************** 12.18 + 12.19 + with_libwpg=no 12.20 + 12.21 +-PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no) 12.22 +-if test "x$with_libwpg01" = "xyes"; then 12.23 +- AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x]) 12.24 +- with_libwpg=yes 12.25 +- AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS) 12.26 +- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS) 12.27 +-fi 12.28 +-AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes") 12.29 +- 12.30 +-PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no) 12.31 +-if test "x$with_libwpg02" = "xyes"; then 12.32 +- AC_DEFINE(WITH_LIBWPG02,1,[Build in libwpg 0.2.x]) 12.33 +- with_libwpg=yes 12.34 +- AC_SUBST(LIBWPG_LIBS, $LIBWPG02_LIBS) 12.35 +- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG02_CFLAGS) 12.36 +-fi 12.37 +-AM_CONDITIONAL(WITH_LIBWPG02, test "x$with_libwpg02" = "xyes") 12.38 ++PKG_CHECK_MODULES(LIBWPG, libwpg-0.3 librevenge-0.0 librevenge-stream-0.0, with_libwpg=yes, with_libwpg=no) 12.39 ++AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg" = "xyes") 12.40 + 12.41 + if test "x$with_libwpg" = "xyes"; then 12.42 + AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg]) 12.43 +diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp 12.44 +index 5c5cb65..71c7b44 100644 12.45 +--- a/src/extension/internal/wpg-input.cpp 12.46 ++++ b/src/extension/internal/wpg-input.cpp 12.47 +@@ -48,17 +48,8 @@ 12.48 + #include "extension/input.h" 12.49 + #include "document.h" 12.50 + 12.51 +-// Take a guess and fallback to 0.1.x if no configure has run 12.52 +-#if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02) 12.53 +-#define WITH_LIBWPG01 1 12.54 +-#endif 12.55 +- 12.56 + #include "libwpg/libwpg.h" 12.57 +-#if WITH_LIBWPG01 12.58 +-#include "libwpg/WPGStreamImplementation.h" 12.59 +-#elif WITH_LIBWPG02 12.60 +-#include "libwpd-stream/libwpd-stream.h" 12.61 +-#endif 12.62 ++#include "librevenge-stream/librevenge-stream.h" 12.63 + 12.64 + using namespace libwpg; 12.65 + 12.66 +@@ -69,17 +60,9 @@ namespace Internal { 12.67 + 12.68 + SPDocument * 12.69 + WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) { 12.70 +-#if WITH_LIBWPG01 12.71 +- WPXInputStream* input = new libwpg::WPGFileStream(uri); 12.72 +-#elif WITH_LIBWPG02 12.73 +- WPXInputStream* input = new WPXFileStream(uri); 12.74 +-#endif 12.75 +- if (input->isOLEStream()) { 12.76 +-#if WITH_LIBWPG01 12.77 +- WPXInputStream* olestream = input->getDocumentOLEStream(); 12.78 +-#elif WITH_LIBWPG02 12.79 +- WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN"); 12.80 +-#endif 12.81 ++ librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(uri); 12.82 ++ if (input->isStructured()) { 12.83 ++ librevenge::RVNGInputStream* olestream = input->getSubStreamByName("PerfectOffice_MAIN"); 12.84 + if (olestream) { 12.85 + delete input; 12.86 + input = olestream; 12.87 +@@ -94,15 +77,17 @@ WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) { 12.88 + return NULL; 12.89 + } 12.90 + 12.91 +-#if WITH_LIBWPG01 12.92 +- libwpg::WPGString output; 12.93 +-#elif WITH_LIBWPG02 12.94 +- WPXString output; 12.95 +-#endif 12.96 +- if (!libwpg::WPGraphics::generateSVG(input, output)) { 12.97 ++ librevenge::RVNGStringVector vec; 12.98 ++ librevenge::RVNGSVGDrawingGenerator generator(vec, ""); 12.99 ++ 12.100 ++ if (!libwpg::WPGraphics::parse(input, &generator) || vec.empty() || vec[0].empty()) 12.101 ++ { 12.102 + delete input; 12.103 + return NULL; 12.104 +- } 12.105 ++ } 12.106 ++ 12.107 ++ librevenge::RVNGString output("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n"); 12.108 ++ output.append(vec[0]); 12.109 + 12.110 + //printf("I've got a doc: \n%s", painter.document.c_str()); 12.111 + 12.112 +-- 12.113 +1.9.3 12.114 +
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/inkscape/stuff/patches/series Tue Oct 28 09:55:47 2014 +0200 13.3 @@ -0,0 +1,6 @@ 13.4 +0001-Fix_Datamatrix_UI_issue.patch 13.5 +0002-Drop_PS_and_PDF_support_in_MimeType.patch 13.6 +0003-Fix_LP_-911146.patch 13.7 +0004-Fix_FTBFS_on_gcc-4.8.patch 13.8 +0005-Fix_FTBFS_due_to_tests.patch 13.9 +0006-Update_to_new_libwpg.patch
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/wget/description.txt Tue Oct 28 09:55:47 2014 +0200 14.3 @@ -0,0 +1,14 @@ 14.4 +Wget is a network utility to retrieve files from the web using HTTP(S) and FTP, 14.5 +the two most widely used internet protocols. It works non-interactively, so it 14.6 +will work in the background, after having logged off. The program supports 14.7 +recursive retrieval of web-authoring pages as well as FTP sites -- you can use 14.8 +Wget to make mirrors of archives and home pages or to travel the web like a WWW 14.9 +robot. 14.10 +Wget works particularly well with slow or unstable connections by continuing to 14.11 +retrieve a document until the document is fully downloaded. Re-getting files 14.12 +from where it left off works on servers (both HTTP and FTP) that support it. 14.13 +Both HTTP and FTP retrievals can be time stamped, so Wget can see if the remote 14.14 +file has changed since the last retrieval and automatically retrieve the new 14.15 +version if it has. 14.16 +Wget supports proxy servers; this can lighten the network load, speed up 14.17 +retrieval, and provide access behind firewalls.
15.1 --- a/wget/receipt Mon Oct 27 12:48:51 2014 +0100 15.2 +++ b/wget/receipt Tue Oct 28 09:55:47 2014 +0200 15.3 @@ -1,9 +1,9 @@ 15.4 # SliTaz package receipt. 15.5 15.6 PACKAGE="wget" 15.7 -VERSION="1.14" 15.8 +VERSION="1.16" 15.9 CATEGORY="utilities" 15.10 -SHORT_DESC="retrieve files from the web" 15.11 +SHORT_DESC="retrieves files from the web" 15.12 MAINTAINER="sygne@ombres.eu" 15.13 LICENSE="GPL3" 15.14 TARBALL="$PACKAGE-$VERSION.tar.xz" 15.15 @@ -30,7 +30,7 @@ 15.16 # Rules to gen a SliTaz package suitable for Tazpkg. 15.17 genpkg_rules() 15.18 { 15.19 - mkdir -p $fs/usr 15.20 + mkdir -p $fs/usr 15.21 cp -a $install/usr/bin $fs/usr 15.22 } 15.23