# HG changeset patch # User Pascal Bellard # Date 1425459997 -3600 # Node ID 3be9dc20fd83b3d8b53db38fe953df4fc604b05e # Parent bd1b2ae8dac1d6e5ab0ae1db70d14ffab788cd92 inkscape: remove obsolate patches diff -r bd1b2ae8dac1 -r 3be9dc20fd83 inkscape/stuff/patches/0001-Fix_Datamatrix_UI_issue.patch --- a/inkscape/stuff/patches/0001-Fix_Datamatrix_UI_issue.patch Wed Mar 04 00:19:44 2015 -0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,158 +0,0 @@ -From: JazzyNico -Date: Tue, 2 Jul 2013 10:47:34 +0200 -Subject: Fix_Datamatrix_UI_issue - -Prevent invalid input in Datamatrix extension dialog. - -As reference: -- Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127 -- Bug: https://launchpad.net/bugs/738108 -- Bug-Debian: http://bugs.debian.org/618835 -- Bug-Ubuntu: https://launchpad.net/bugs/738108 -- Last-Update: 2011-06-02 - -Signed-off-by: Matteo F. Vescovi ---- - share/extensions/render_barcode_datamatrix.inx | 38 +++++++++++++++++--- - share/extensions/render_barcode_datamatrix.py | 49 ++++++++++++++++++++++++-- - 2 files changed, 80 insertions(+), 7 deletions(-) - -diff --git a/share/extensions/render_barcode_datamatrix.inx b/share/extensions/render_barcode_datamatrix.inx -index ea2aa47..ede179e 100644 ---- a/share/extensions/render_barcode_datamatrix.inx -+++ b/share/extensions/render_barcode_datamatrix.inx -@@ -4,10 +4,40 @@ - il.datamatrix - render_barcode_datamatrix.py - inkex.py -- Inkscape -- 10 -- 10 -- 4 -+ Inkscape -+ -+ 10x10 -+ 12x12 -+ 14x14 -+ 16x16 -+ 18x18 -+ 20x20 -+ 22x22 -+ 24x24 -+ 26x26 -+ 32x32 -+ 36x36 -+ 40x40 -+ 44x44 -+ 48x48 -+ 52x52 -+ 64x64 -+ 72x72 -+ 80x80 -+ 88x88 -+ 96x96 -+ 104x104 -+ 120x120 -+ 132x132 -+ 144x144 -+ 8x18 -+ 8x32 -+ 12x26 -+ 12x36 -+ 16x36 -+ 16x48 -+ -+ 4 - - all - -diff --git a/share/extensions/render_barcode_datamatrix.py b/share/extensions/render_barcode_datamatrix.py -index e536554..20bcf94 100755 ---- a/share/extensions/render_barcode_datamatrix.py -+++ b/share/extensions/render_barcode_datamatrix.py -@@ -57,6 +57,39 @@ import inkex, simplestyle - import gettext - _ = gettext.gettext - -+symbols = { -+ 'sq10': (10, 10), -+ 'sq12': (12, 12), -+ 'sq14': (14, 14), -+ 'sq16': (16, 16), -+ 'sq18': (18, 18), -+ 'sq20': (20, 20), -+ 'sq22': (22, 22), -+ 'sq24': (24, 24), -+ 'sq26': (26, 26), -+ 'sq32': (32, 32), -+ 'sq36': (36, 36), -+ 'sq40': (40, 40), -+ 'sq44': (44, 44), -+ 'sq48': (48, 48), -+ 'sq52': (52, 52), -+ 'sq64': (64, 64), -+ 'sq72': (72, 72), -+ 'sq80': (80, 80), -+ 'sq88': (88, 88), -+ 'sq96': (96, 96), -+ 'sq104': (104, 104), -+ 'sq120': (120, 120), -+ 'sq132': (132, 132), -+ 'sq144': (144, 144), -+ 'rect8x18': (8, 18), -+ 'rect8x32': (8, 32), -+ 'rect12x26': (12, 26), -+ 'rect12x36': (12, 36), -+ 'rect16x36': (16, 36), -+ 'rect16x48': (16, 48), -+} -+ - #ENCODING ROUTINES =================================================== - # Take an input string and convert it to a sequence (or sequences) - # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3) -@@ -167,6 +200,7 @@ def get_parameters(nrow, ncol): - #RETURN ERROR - else: - inkex.errormsg(_('Unrecognised DataMatrix size')) -+ exit(0) - - return None - -@@ -616,6 +650,9 @@ class DataMatrix(inkex.Effect): - self.OptionParser.add_option("--text", - action="store", type="string", - dest="TEXT", default='Inkscape') -+ self.OptionParser.add_option("--symbol", -+ action="store", type="string", -+ dest="SYMBOL", default='') - self.OptionParser.add_option("--rows", - action="store", type="int", - dest="ROWS", default=10) -@@ -630,6 +667,12 @@ class DataMatrix(inkex.Effect): - - so = self.options - -+ rows = so.ROWS -+ cols = so.COLS -+ if (so.SYMBOL != '' and (so.SYMBOL in symbols)): -+ rows = symbols[so.SYMBOL][0] -+ cols = symbols[so.SYMBOL][1] -+ - if so.TEXT == '': #abort if converting blank text - inkex.errormsg(_('Please enter an input string')) - else: -@@ -644,11 +687,11 @@ class DataMatrix(inkex.Effect): - grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in - - #GENERATE THE DATAMATRIX -- encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares -- render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements -+ encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares -+ render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements - - if __name__ == '__main__': - e = DataMatrix() - e.affect() - --# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99 -+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 diff -r bd1b2ae8dac1 -r 3be9dc20fd83 inkscape/stuff/patches/0003-Fix_LP_-911146.patch --- a/inkscape/stuff/patches/0003-Fix_LP_-911146.patch Wed Mar 04 00:19:44 2015 -0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -From: Michael Karcher -Date: Tue, 2 Jul 2013 11:02:23 +0200 -Subject: Fix_LP_#911146 - -Ensures that filenames passed to extensions are made absolute -before changing the current working directory. - -Signed-off-by: Matteo F. Vescovi ---- - src/extension/implementation/script.cpp | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp -index 5c485a6..b4e9847 100644 ---- a/src/extension/implementation/script.cpp -+++ b/src/extension/implementation/script.cpp -@@ -956,7 +956,14 @@ int Script::execute (const std::list &in_command, - // assemble the rest of argv - std::copy(in_params.begin(), in_params.end(), std::back_inserter(argv)); - if (!filein.empty()) { -- argv.push_back(filein); -+ if(Glib::path_is_absolute(filein)) -+ argv.push_back(filein); -+ else { -+ std::vector buildargs; -+ buildargs.push_back(Glib::get_current_dir()); -+ buildargs.push_back(filein); -+ argv.push_back(Glib::build_filename(buildargs)); -+ } - } - - int stdout_pipe, stderr_pipe; diff -r bd1b2ae8dac1 -r 3be9dc20fd83 inkscape/stuff/patches/0004-Fix_FTBFS_on_gcc-4.8.patch --- a/inkscape/stuff/patches/0004-Fix_FTBFS_on_gcc-4.8.patch Wed Mar 04 00:19:44 2015 -0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -From: Mattia Rizzolo -Date: Tue, 8 Jul 2014 12:33:57 +0200 -Subject: Fix_FTBFS_on_gcc-4.8 - -Last-Update: 2014-07-02 - -Signed-off-by: Matteo F. Vescovi ---- - src/libavoid/vpsc.cpp | 2 +- - src/libcola/straightener.cpp | 6 +++--- - src/libcroco/cr-parser.c | 2 +- - src/libvpsc/block.cpp | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/libavoid/vpsc.cpp b/src/libavoid/vpsc.cpp -index 19d3603..1646dda 100644 ---- a/src/libavoid/vpsc.cpp -+++ b/src/libavoid/vpsc.cpp -@@ -422,7 +422,7 @@ Constraint* IncSolver::mostViolated(Constraints &l) { - // downwards. There is always at least 1 element in the - // vector because of search. - // TODO check this logic and add parens: -- if((deletePoint != end) && ((minSlack < ZERO_UPPERBOUND) && !v->active || v->equality)) { -+ if((deletePoint != end) && (((minSlack < ZERO_UPPERBOUND) && !v->active) || v->equality)) { - *deletePoint = l[l.size()-1]; - l.resize(l.size()-1); - } -diff --git a/src/libcola/straightener.cpp b/src/libcola/straightener.cpp -index e237c03..7c73cb9 100644 ---- a/src/libcola/straightener.cpp -+++ b/src/libcola/straightener.cpp -@@ -108,7 +108,7 @@ namespace straightener { - int compare_events(const void *a, const void *b) { - Event *ea=*(Event**)a; - Event *eb=*(Event**)b; -- if(ea->v!=NULL&&ea->v==eb->v||ea->e!=NULL&&ea->e==eb->e) { -+ if((ea->v!=NULL&&ea->v==eb->v)||(ea->e!=NULL&&ea->e==eb->e)) { - // when comparing opening and closing from object - // open must come first - if(ea->type==Open) return -1; -@@ -263,8 +263,8 @@ namespace straightener { - // node is on an edge - Edge *edge=(*i)->edge; - if(!edge->isEnd(v->id) -- &&(l!=NULL&&!edge->isEnd(l->id)||l==NULL) -- &&(r!=NULL&&!edge->isEnd(r->id)||r==NULL)) { -+ &&((l!=NULL&&!edge->isEnd(l->id))||l==NULL) -+ &&((r!=NULL&&!edge->isEnd(r->id))||r==NULL)) { - if(lastNode!=NULL) { - //printf(" Rule A: Constraint: v%d +g <= v%d\n",lastNode->id,(*i)->id); - cs.push_back(createConstraint(lastNode,*i,dim)); -diff --git a/src/libcroco/cr-parser.c b/src/libcroco/cr-parser.c -index 5b0a56f..a8e2de5 100644 ---- a/src/libcroco/cr-parser.c -+++ b/src/libcroco/cr-parser.c -@@ -2408,7 +2408,7 @@ cr_parser_parse_stylesheet (CRParser * a_this) - import_string, - NULL, &location) ; - -- if ((PRIVATE (a_this)->sac_handler->resolve_import == TRUE)) { -+ if (PRIVATE (a_this)->sac_handler->resolve_import == TRUE) { - /* - *TODO: resolve the - *import rule. -diff --git a/src/libvpsc/block.cpp b/src/libvpsc/block.cpp -index 221df53..0bd662f 100644 ---- a/src/libvpsc/block.cpp -+++ b/src/libvpsc/block.cpp -@@ -72,7 +72,7 @@ void Block::setUpConstraintHeap(PairingHeap* &h,bool in) { - for (Cit j=cs->begin();j!=cs->end();++j) { - Constraint *c=*j; - c->timeStamp=blockTimeCtr; -- if (c->left->block != this && in || c->right->block != this && !in) { -+ if ((c->left->block != this && in) || (c->right->block != this && !in)) { - h->insert(c); - } - } diff -r bd1b2ae8dac1 -r 3be9dc20fd83 inkscape/stuff/patches/0005-Fix_FTBFS_due_to_tests.patch --- a/inkscape/stuff/patches/0005-Fix_FTBFS_due_to_tests.patch Wed Mar 04 00:19:44 2015 -0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,482 +0,0 @@ -From: Mattia Rizzolo -Date: Tue, 8 Jul 2014 14:14:42 +0200 -Subject: Fix_FTBFS_due_to_tests - -Fix FTBFS in the test suite, to let the tests run. - -Last-Update: 2014-07-02 - -Signed-off-by: Matteo F. Vescovi ---- - src/cxxtests.cpp | 124 +++++++++++++++++++++++++++---------------------------- - 1 file changed, 62 insertions(+), 62 deletions(-) - -diff --git a/src/cxxtests.cpp b/src/cxxtests.cpp -index 7324466..76ff6a7 100644 ---- a/src/cxxtests.cpp -+++ b/src/cxxtests.cpp -@@ -23,12 +23,12 @@ int main( int argc, char *argv[] ) - #include - #include - --#include "../../src/attributes-test.h" -+#include "attributes-test.h" - - static AttributesTest *suite_AttributesTest = 0; - - static CxxTest::List Tests_AttributesTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_AttributesTest( "../../src/attributes-test.h", 13, "AttributesTest", Tests_AttributesTest, suite_AttributesTest, 24, 25 ); -+CxxTest::DynamicSuiteDescription suiteDescription_AttributesTest( "attributes-test.h", 13, "AttributesTest", Tests_AttributesTest, suite_AttributesTest, 24, 25 ); - - static class TestDescription_AttributesTest_testAttributes : public CxxTest::RealTestDescription { - public: -@@ -36,12 +36,12 @@ public: - void runTest() { if ( suite_AttributesTest ) suite_AttributesTest->testAttributes(); } - } testDescription_AttributesTest_testAttributes; - --#include "../../src/color-profile-test.h" -+#include "color-profile-test.h" - - static ColorProfileTest *suite_ColorProfileTest = 0; - - static CxxTest::List Tests_ColorProfileTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_ColorProfileTest( "../../src/color-profile-test.h", 13, "ColorProfileTest", Tests_ColorProfileTest, suite_ColorProfileTest, 45, 51 ); -+CxxTest::DynamicSuiteDescription suiteDescription_ColorProfileTest( "color-profile-test.h", 13, "ColorProfileTest", Tests_ColorProfileTest, suite_ColorProfileTest, 45, 51 ); - - static class TestDescription_ColorProfileTest_testSetRenderingIntent : public CxxTest::RealTestDescription { - public: -@@ -61,12 +61,12 @@ public: - void runTest() { if ( suite_ColorProfileTest ) suite_ColorProfileTest->testSetName(); } - } testDescription_ColorProfileTest_testSetName; - --#include "../../src/dir-util-test.h" -+#include "dir-util-test.h" - - static DirUtilTest suite_DirUtilTest; - - static CxxTest::List Tests_DirUtilTest = { 0, 0 }; --CxxTest::StaticSuiteDescription suiteDescription_DirUtilTest( "../../src/dir-util-test.h", 9, "DirUtilTest", suite_DirUtilTest, Tests_DirUtilTest ); -+CxxTest::StaticSuiteDescription suiteDescription_DirUtilTest( "dir-util-test.h", 9, "DirUtilTest", suite_DirUtilTest, Tests_DirUtilTest ); - - static class TestDescription_DirUtilTest_testBase : public CxxTest::RealTestDescription { - public: -@@ -74,12 +74,12 @@ public: - void runTest() { suite_DirUtilTest.testBase(); } - } testDescription_DirUtilTest_testBase; - --#include "../../src/extract-uri-test.h" -+#include "extract-uri-test.h" - - static ExtractURITest suite_ExtractURITest; - - static CxxTest::List Tests_ExtractURITest = { 0, 0 }; --CxxTest::StaticSuiteDescription suiteDescription_ExtractURITest( "../../src/extract-uri-test.h", 9, "ExtractURITest", suite_ExtractURITest, Tests_ExtractURITest ); -+CxxTest::StaticSuiteDescription suiteDescription_ExtractURITest( "extract-uri-test.h", 9, "ExtractURITest", suite_ExtractURITest, Tests_ExtractURITest ); - - static class TestDescription_ExtractURITest_testBase : public CxxTest::RealTestDescription { - public: -@@ -99,12 +99,12 @@ public: - void runTest() { suite_ExtractURITest.testQuoted(); } - } testDescription_ExtractURITest_testQuoted; - --#include "../../src/marker-test.h" -+#include "marker-test.h" - - static MarkerTest suite_MarkerTest; - - static CxxTest::List Tests_MarkerTest = { 0, 0 }; --CxxTest::StaticSuiteDescription suiteDescription_MarkerTest( "../../src/marker-test.h", 14, "MarkerTest", suite_MarkerTest, Tests_MarkerTest ); -+CxxTest::StaticSuiteDescription suiteDescription_MarkerTest( "marker-test.h", 14, "MarkerTest", suite_MarkerTest, Tests_MarkerTest ); - - static class TestDescription_MarkerTest_testMarkerLoc : public CxxTest::RealTestDescription { - public: -@@ -112,12 +112,12 @@ public: - void runTest() { suite_MarkerTest.testMarkerLoc(); } - } testDescription_MarkerTest_testMarkerLoc; - --#include "../../src/mod360-test.h" -+#include "mod360-test.h" - - static Mod360Test suite_Mod360Test; - - static CxxTest::List Tests_Mod360Test = { 0, 0 }; --CxxTest::StaticSuiteDescription suiteDescription_Mod360Test( "../../src/mod360-test.h", 12, "Mod360Test", suite_Mod360Test, Tests_Mod360Test ); -+CxxTest::StaticSuiteDescription suiteDescription_Mod360Test( "mod360-test.h", 12, "Mod360Test", suite_Mod360Test, Tests_Mod360Test ); - - static class TestDescription_Mod360Test_testMod360 : public CxxTest::RealTestDescription { - public: -@@ -125,12 +125,12 @@ public: - void runTest() { suite_Mod360Test.testMod360(); } - } testDescription_Mod360Test_testMod360; - --#include "../../src/round-test.h" -+#include "round-test.h" - - static RoundTest *suite_RoundTest = 0; - - static CxxTest::List Tests_RoundTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_RoundTest( "../../src/round-test.h", 10, "RoundTest", Tests_RoundTest, suite_RoundTest, 50, 51 ); -+CxxTest::DynamicSuiteDescription suiteDescription_RoundTest( "round-test.h", 10, "RoundTest", Tests_RoundTest, suite_RoundTest, 50, 51 ); - - static class TestDescription_RoundTest_testNonNegRound : public CxxTest::RealTestDescription { - public: -@@ -144,12 +144,12 @@ public: - void runTest() { if ( suite_RoundTest ) suite_RoundTest->testNonPosRoung(); } - } testDescription_RoundTest_testNonPosRoung; - --#include "../../src/preferences-test.h" -+#include "preferences-test.h" - - static PreferencesTest suite_PreferencesTest; - - static CxxTest::List Tests_PreferencesTest = { 0, 0 }; --CxxTest::StaticSuiteDescription suiteDescription_PreferencesTest( "../../src/preferences-test.h", 29, "PreferencesTest", suite_PreferencesTest, Tests_PreferencesTest ); -+CxxTest::StaticSuiteDescription suiteDescription_PreferencesTest( "preferences-test.h", 29, "PreferencesTest", suite_PreferencesTest, Tests_PreferencesTest ); - - static class TestDescription_PreferencesTest_testStartingState : public CxxTest::RealTestDescription { - public: -@@ -193,12 +193,12 @@ public: - void runTest() { suite_PreferencesTest.testPreferencesEntryMethods(); } - } testDescription_PreferencesTest_testPreferencesEntryMethods; - --#include "../../src/sp-style-elem-test.h" -+#include "sp-style-elem-test.h" - - static SPStyleElemTest *suite_SPStyleElemTest = 0; - - static CxxTest::List Tests_SPStyleElemTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_SPStyleElemTest( "../../src/sp-style-elem-test.h", 12, "SPStyleElemTest", Tests_SPStyleElemTest, suite_SPStyleElemTest, 43, 48 ); -+CxxTest::DynamicSuiteDescription suiteDescription_SPStyleElemTest( "sp-style-elem-test.h", 12, "SPStyleElemTest", Tests_SPStyleElemTest, suite_SPStyleElemTest, 43, 48 ); - - static class TestDescription_SPStyleElemTest_testSetType : public CxxTest::RealTestDescription { - public: -@@ -224,12 +224,12 @@ public: - void runTest() { if ( suite_SPStyleElemTest ) suite_SPStyleElemTest->testReadContent(); } - } testDescription_SPStyleElemTest_testReadContent; - --#include "../../src/style-test.h" -+#include "style-test.h" - - static StyleTest *suite_StyleTest = 0; - - static CxxTest::List Tests_StyleTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_StyleTest( "../../src/style-test.h", 11, "StyleTest", Tests_StyleTest, suite_StyleTest, 37, 43 ); -+CxxTest::DynamicSuiteDescription suiteDescription_StyleTest( "style-test.h", 11, "StyleTest", Tests_StyleTest, suite_StyleTest, 37, 43 ); - - static class TestDescription_StyleTest_testOne : public CxxTest::RealTestDescription { - public: -@@ -237,12 +237,12 @@ public: - void runTest() { if ( suite_StyleTest ) suite_StyleTest->testOne(); } - } testDescription_StyleTest_testOne; - --#include "../../src/verbs-test.h" -+#include "verbs-test.h" - - static VerbsTest suite_VerbsTest; - - static CxxTest::List Tests_VerbsTest = { 0, 0 }; --CxxTest::StaticSuiteDescription suiteDescription_VerbsTest( "../../src/verbs-test.h", 7, "VerbsTest", suite_VerbsTest, Tests_VerbsTest ); -+CxxTest::StaticSuiteDescription suiteDescription_VerbsTest( "verbs-test.h", 7, "VerbsTest", suite_VerbsTest, Tests_VerbsTest ); - - static class TestDescription_VerbsTest_testEnumLength : public CxxTest::RealTestDescription { - public: -@@ -262,12 +262,12 @@ public: - void runTest() { suite_VerbsTest.testFetch(); } - } testDescription_VerbsTest_testFetch; - --#include "../../src/display/curve-test.h" -+#include "display/curve-test.h" - - static CurveTest *suite_CurveTest = 0; - - static CxxTest::List Tests_CurveTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_CurveTest( "../../src/display/curve-test.h", 8, "CurveTest", Tests_CurveTest, suite_CurveTest, 35, 36 ); -+CxxTest::DynamicSuiteDescription suiteDescription_CurveTest( "display/curve-test.h", 8, "CurveTest", Tests_CurveTest, suite_CurveTest, 35, 36 ); - - static class TestDescription_CurveTest_testGetSegmentCount : public CxxTest::RealTestDescription { - public: -@@ -329,12 +329,12 @@ public: - void runTest() { if ( suite_CurveTest ) suite_CurveTest->testPenultimatePoint(); } - } testDescription_CurveTest_testPenultimatePoint; - --#include "../../src/helper/units-test.h" -+#include "helper/units-test.h" - - static UnitsTest *suite_UnitsTest = 0; - - static CxxTest::List Tests_UnitsTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_UnitsTest( "../../src/helper/units-test.h", 7, "UnitsTest", Tests_UnitsTest, suite_UnitsTest, 17, 18 ); -+CxxTest::DynamicSuiteDescription suiteDescription_UnitsTest( "helper/units-test.h", 7, "UnitsTest", Tests_UnitsTest, suite_UnitsTest, 17, 18 ); - - static class TestDescription_UnitsTest_testConversions : public CxxTest::RealTestDescription { - public: -@@ -348,12 +348,12 @@ public: - void runTest() { if ( suite_UnitsTest ) suite_UnitsTest->testUnitTable(); } - } testDescription_UnitsTest_testUnitTable; - --#include "../../src/libnr/in-svg-plane-test.h" -+#include "libnr/in-svg-plane-test.h" - - static InSvgPlaneTest *suite_InSvgPlaneTest = 0; - - static CxxTest::List Tests_InSvgPlaneTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_InSvgPlaneTest( "../../src/libnr/in-svg-plane-test.h", 9, "InSvgPlaneTest", Tests_InSvgPlaneTest, suite_InSvgPlaneTest, 31, 32 ); -+CxxTest::DynamicSuiteDescription suiteDescription_InSvgPlaneTest( "libnr/in-svg-plane-test.h", 9, "InSvgPlaneTest", Tests_InSvgPlaneTest, suite_InSvgPlaneTest, 31, 32 ); - - static class TestDescription_InSvgPlaneTest_testInSvgPlane : public CxxTest::RealTestDescription { - public: -@@ -361,12 +361,12 @@ public: - void runTest() { if ( suite_InSvgPlaneTest ) suite_InSvgPlaneTest->testInSvgPlane(); } - } testDescription_InSvgPlaneTest_testInSvgPlane; - --#include "../../src/libnr/nr-compose-test.h" -+#include "libnr/nr-compose-test.h" - - static NrComposeTest *suite_NrComposeTest = 0; - - static CxxTest::List Tests_NrComposeTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_NrComposeTest( "../../src/libnr/nr-compose-test.h", 35, "NrComposeTest", Tests_NrComposeTest, suite_NrComposeTest, 110, 111 ); -+CxxTest::DynamicSuiteDescription suiteDescription_NrComposeTest( "libnr/nr-compose-test.h", 35, "NrComposeTest", Tests_NrComposeTest, suite_NrComposeTest, 110, 111 ); - - static class TestDescription_NrComposeTest_testnr_R8G8B8A8_N_EMPTY_R8G8B8A8_N : public CxxTest::RealTestDescription { - public: -@@ -518,12 +518,12 @@ public: - void runTest() { if ( suite_NrComposeTest ) suite_NrComposeTest->testnr_R8G8B8_R8G8B8_R8G8B8A8_P_A8(); } - } testDescription_NrComposeTest_testnr_R8G8B8_R8G8B8_R8G8B8A8_P_A8; - --#include "../../src/libnr/nr-matrix-test.h" -+#include "libnr/nr-matrix-test.h" - - static NrMatrixTest *suite_NrMatrixTest = 0; - - static CxxTest::List Tests_NrMatrixTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_NrMatrixTest( "../../src/libnr/nr-matrix-test.h", 23, "NrMatrixTest", Tests_NrMatrixTest, suite_NrMatrixTest, 44, 45 ); -+CxxTest::DynamicSuiteDescription suiteDescription_NrMatrixTest( "libnr/nr-matrix-test.h", 23, "NrMatrixTest", Tests_NrMatrixTest, suite_NrMatrixTest, 44, 45 ); - - static class TestDescription_NrMatrixTest_testCtorsAssignmentOp : public CxxTest::RealTestDescription { - public: -@@ -585,12 +585,12 @@ public: - void runTest() { if ( suite_NrMatrixTest ) suite_NrMatrixTest->testMatrixStarScale(); } - } testDescription_NrMatrixTest_testMatrixStarScale; - --#include "../../src/libnr/nr-point-fns-test.h" -+#include "libnr/nr-point-fns-test.h" - - static NrPointFnsTest *suite_NrPointFnsTest = 0; - - static CxxTest::List Tests_NrPointFnsTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_NrPointFnsTest( "../../src/libnr/nr-point-fns-test.h", 12, "NrPointFnsTest", Tests_NrPointFnsTest, suite_NrPointFnsTest, 37, 38 ); -+CxxTest::DynamicSuiteDescription suiteDescription_NrPointFnsTest( "libnr/nr-point-fns-test.h", 12, "NrPointFnsTest", Tests_NrPointFnsTest, suite_NrPointFnsTest, 37, 38 ); - - static class TestDescription_NrPointFnsTest_testL1 : public CxxTest::RealTestDescription { - public: -@@ -634,12 +634,12 @@ public: - void runTest() { if ( suite_NrPointFnsTest ) suite_NrPointFnsTest->testIsUnitVector(); } - } testDescription_NrPointFnsTest_testIsUnitVector; - --#include "../../src/libnr/nr-rotate-test.h" -+#include "libnr/nr-rotate-test.h" - - static NrRotateTest *suite_NrRotateTest = 0; - - static CxxTest::List Tests_NrRotateTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_NrRotateTest( "../../src/libnr/nr-rotate-test.h", 13, "NrRotateTest", Tests_NrRotateTest, suite_NrRotateTest, 29, 30 ); -+CxxTest::DynamicSuiteDescription suiteDescription_NrRotateTest( "libnr/nr-rotate-test.h", 13, "NrRotateTest", Tests_NrRotateTest, suite_NrRotateTest, 29, 30 ); - - static class TestDescription_NrRotateTest_testCtorsCompares : public CxxTest::RealTestDescription { - public: -@@ -677,12 +677,12 @@ public: - void runTest() { if ( suite_NrRotateTest ) suite_NrRotateTest->testOpDivRotateRotate(); } - } testDescription_NrRotateTest_testOpDivRotateRotate; - --#include "../../src/libnr/nr-rotate-fns-test.h" -+#include "libnr/nr-rotate-fns-test.h" - - static NrRotateFnsTest *suite_NrRotateFnsTest = 0; - - static CxxTest::List Tests_NrRotateFnsTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_NrRotateFnsTest( "../../src/libnr/nr-rotate-fns-test.h", 8, "NrRotateFnsTest", Tests_NrRotateFnsTest, suite_NrRotateFnsTest, 19, 20 ); -+CxxTest::DynamicSuiteDescription suiteDescription_NrRotateFnsTest( "libnr/nr-rotate-fns-test.h", 8, "NrRotateFnsTest", Tests_NrRotateFnsTest, suite_NrRotateFnsTest, 19, 20 ); - - static class TestDescription_NrRotateFnsTest_testRotateDegrees : public CxxTest::RealTestDescription { - public: -@@ -690,12 +690,12 @@ public: - void runTest() { if ( suite_NrRotateFnsTest ) suite_NrRotateFnsTest->testRotateDegrees(); } - } testDescription_NrRotateFnsTest_testRotateDegrees; - --#include "../../src/libnr/nr-scale-test.h" -+#include "libnr/nr-scale-test.h" - - static NrScaleTest *suite_NrScaleTest = 0; - - static CxxTest::List Tests_NrScaleTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_NrScaleTest( "../../src/libnr/nr-scale-test.h", 6, "NrScaleTest", Tests_NrScaleTest, suite_NrScaleTest, 20, 21 ); -+CxxTest::DynamicSuiteDescription suiteDescription_NrScaleTest( "libnr/nr-scale-test.h", 6, "NrScaleTest", Tests_NrScaleTest, suite_NrScaleTest, 20, 21 ); - - static class TestDescription_NrScaleTest_testXY_CtorArrayOperator : public CxxTest::RealTestDescription { - public: -@@ -739,12 +739,12 @@ public: - void runTest() { if ( suite_NrScaleTest ) suite_NrScaleTest->testOpDivScaleScale(); } - } testDescription_NrScaleTest_testOpDivScaleScale; - --#include "../../src/libnr/nr-translate-test.h" -+#include "libnr/nr-translate-test.h" - - static NrTranslateTest *suite_NrTranslateTest = 0; - - static CxxTest::List Tests_NrTranslateTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_NrTranslateTest( "../../src/libnr/nr-translate-test.h", 11, "NrTranslateTest", Tests_NrTranslateTest, suite_NrTranslateTest, 28, 29 ); -+CxxTest::DynamicSuiteDescription suiteDescription_NrTranslateTest( "libnr/nr-translate-test.h", 11, "NrTranslateTest", Tests_NrTranslateTest, suite_NrTranslateTest, 28, 29 ); - - static class TestDescription_NrTranslateTest_testCtorsArrayOperator : public CxxTest::RealTestDescription { - public: -@@ -776,12 +776,12 @@ public: - void runTest() { if ( suite_NrTranslateTest ) suite_NrTranslateTest->testIdentity(); } - } testDescription_NrTranslateTest_testIdentity; - --#include "../../src/libnr/nr-types-test.h" -+#include "libnr/nr-types-test.h" - - static NrTypesTest *suite_NrTypesTest = 0; - - static CxxTest::List Tests_NrTypesTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_NrTypesTest( "../../src/libnr/nr-types-test.h", 8, "NrTypesTest", Tests_NrTypesTest, suite_NrTypesTest, 23, 24 ); -+CxxTest::DynamicSuiteDescription suiteDescription_NrTypesTest( "libnr/nr-types-test.h", 8, "NrTypesTest", Tests_NrTypesTest, suite_NrTypesTest, 23, 24 ); - - static class TestDescription_NrTypesTest_testXYValues : public CxxTest::RealTestDescription { - public: -@@ -843,12 +843,12 @@ public: - void runTest() { if ( suite_NrTypesTest ) suite_NrTypesTest->testNormalize(); } - } testDescription_NrTypesTest_testNormalize; - --#include "../../src/svg/css-ostringstream-test.h" -+#include "svg/css-ostringstream-test.h" - - static CSSOStringStreamTest *suite_CSSOStringStreamTest = 0; - - static CxxTest::List Tests_CSSOStringStreamTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_CSSOStringStreamTest( "../../src/svg/css-ostringstream-test.h", 20, "CSSOStringStreamTest", Tests_CSSOStringStreamTest, suite_CSSOStringStreamTest, 26, 27 ); -+CxxTest::DynamicSuiteDescription suiteDescription_CSSOStringStreamTest( "svg/css-ostringstream-test.h", 20, "CSSOStringStreamTest", Tests_CSSOStringStreamTest, suite_CSSOStringStreamTest, 26, 27 ); - - static class TestDescription_CSSOStringStreamTest_testFloats : public CxxTest::RealTestDescription { - public: -@@ -868,12 +868,12 @@ public: - void runTest() { if ( suite_CSSOStringStreamTest ) suite_CSSOStringStreamTest->testConcat(); } - } testDescription_CSSOStringStreamTest_testConcat; - --#include "../../src/svg/stringstream-test.h" -+#include "svg/stringstream-test.h" - - static StringStreamTest *suite_StringStreamTest = 0; - - static CxxTest::List Tests_StringStreamTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_StringStreamTest( "../../src/svg/stringstream-test.h", 21, "StringStreamTest", Tests_StringStreamTest, suite_StringStreamTest, 27, 28 ); -+CxxTest::DynamicSuiteDescription suiteDescription_StringStreamTest( "svg/stringstream-test.h", 21, "StringStreamTest", Tests_StringStreamTest, suite_StringStreamTest, 27, 28 ); - - static class TestDescription_StringStreamTest_testFloats : public CxxTest::RealTestDescription { - public: -@@ -893,12 +893,12 @@ public: - void runTest() { if ( suite_StringStreamTest ) suite_StringStreamTest->testConcat(); } - } testDescription_StringStreamTest_testConcat; - --#include "../../src/svg/svg-affine-test.h" -+#include "svg/svg-affine-test.h" - - static SvgAffineTest *suite_SvgAffineTest = 0; - - static CxxTest::List Tests_SvgAffineTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_SvgAffineTest( "../../src/svg/svg-affine-test.h", 12, "SvgAffineTest", Tests_SvgAffineTest, suite_SvgAffineTest, 46, 47 ); -+CxxTest::DynamicSuiteDescription suiteDescription_SvgAffineTest( "svg/svg-affine-test.h", 12, "SvgAffineTest", Tests_SvgAffineTest, suite_SvgAffineTest, 46, 47 ); - - static class TestDescription_SvgAffineTest_testReadIdentity : public CxxTest::RealTestDescription { - public: -@@ -984,12 +984,12 @@ public: - void runTest() { if ( suite_SvgAffineTest ) suite_SvgAffineTest->testReadFailures(); } - } testDescription_SvgAffineTest_testReadFailures; - --#include "../../src/svg/svg-color-test.h" -+#include "svg/svg-color-test.h" - - static SVGColorTest *suite_SVGColorTest = 0; - - static CxxTest::List Tests_SVGColorTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_SVGColorTest( "../../src/svg/svg-color-test.h", 9, "SVGColorTest", Tests_SVGColorTest, suite_SVGColorTest, 35, 36 ); -+CxxTest::DynamicSuiteDescription suiteDescription_SVGColorTest( "svg/svg-color-test.h", 9, "SVGColorTest", Tests_SVGColorTest, suite_SVGColorTest, 35, 36 ); - - static class TestDescription_SVGColorTest_testWrite : public CxxTest::RealTestDescription { - public: -@@ -1009,12 +1009,12 @@ public: - void runTest() { if ( suite_SVGColorTest ) suite_SVGColorTest->testIccColor(); } - } testDescription_SVGColorTest_testIccColor; - --#include "../../src/svg/svg-length-test.h" -+#include "svg/svg-length-test.h" - - static SvgLengthTest *suite_SvgLengthTest = 0; - - static CxxTest::List Tests_SvgLengthTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_SvgLengthTest( "../../src/svg/svg-length-test.h", 10, "SvgLengthTest", Tests_SvgLengthTest, suite_SvgLengthTest, 29, 30 ); -+CxxTest::DynamicSuiteDescription suiteDescription_SvgLengthTest( "svg/svg-length-test.h", 10, "SvgLengthTest", Tests_SvgLengthTest, suite_SvgLengthTest, 29, 30 ); - - static class TestDescription_SvgLengthTest_testRead : public CxxTest::RealTestDescription { - public: -@@ -1058,12 +1058,12 @@ public: - void runTest() { if ( suite_SvgLengthTest ) suite_SvgLengthTest->testPlaces(); } - } testDescription_SvgLengthTest_testPlaces; - --#include "../../src/svg/svg-path-geom-test.h" -+#include "svg/svg-path-geom-test.h" - - static SvgPathGeomTest *suite_SvgPathGeomTest = 0; - - static CxxTest::List Tests_SvgPathGeomTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_SvgPathGeomTest( "../../src/svg/svg-path-geom-test.h", 13, "SvgPathGeomTest", Tests_SvgPathGeomTest, suite_SvgPathGeomTest, 69, 70 ); -+CxxTest::DynamicSuiteDescription suiteDescription_SvgPathGeomTest( "svg/svg-path-geom-test.h", 13, "SvgPathGeomTest", Tests_SvgPathGeomTest, suite_SvgPathGeomTest, 69, 70 ); - - static class TestDescription_SvgPathGeomTest_testReadRectanglesAbsoluteClosed : public CxxTest::RealTestDescription { - public: -@@ -1179,12 +1179,12 @@ public: - void runTest() { if ( suite_SvgPathGeomTest ) suite_SvgPathGeomTest->testMinexpPrecision(); } - } testDescription_SvgPathGeomTest_testMinexpPrecision; - --#include "../../src/xml/repr-action-test.h" -+#include "xml/repr-action-test.h" - - static XmlReprActionTest *suite_XmlReprActionTest = 0; - - static CxxTest::List Tests_XmlReprActionTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_XmlReprActionTest( "../../src/xml/repr-action-test.h", 11, "XmlReprActionTest", Tests_XmlReprActionTest, suite_XmlReprActionTest, 33, 34 ); -+CxxTest::DynamicSuiteDescription suiteDescription_XmlReprActionTest( "xml/repr-action-test.h", 11, "XmlReprActionTest", Tests_XmlReprActionTest, suite_XmlReprActionTest, 33, 34 ); - - static class TestDescription_XmlReprActionTest_testRollbackOfNodeAddition : public CxxTest::RealTestDescription { - public: -@@ -1204,12 +1204,12 @@ public: - void runTest() { if ( suite_XmlReprActionTest ) suite_XmlReprActionTest->testRollbackOfNodeReordering(); } - } testDescription_XmlReprActionTest_testRollbackOfNodeReordering; - --#include "../../src/xml/quote-test.h" -+#include "xml/quote-test.h" - - static XmlQuoteTest *suite_XmlQuoteTest = 0; - - static CxxTest::List Tests_XmlQuoteTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_XmlQuoteTest( "../../src/xml/quote-test.h", 15, "XmlQuoteTest", Tests_XmlQuoteTest, suite_XmlQuoteTest, 26, 27 ); -+CxxTest::DynamicSuiteDescription suiteDescription_XmlQuoteTest( "xml/quote-test.h", 15, "XmlQuoteTest", Tests_XmlQuoteTest, suite_XmlQuoteTest, 26, 27 ); - - static class TestDescription_XmlQuoteTest_testXmlQuotedStrlen : public CxxTest::RealTestDescription { - public: -@@ -1223,12 +1223,12 @@ public: - void runTest() { if ( suite_XmlQuoteTest ) suite_XmlQuoteTest->testXmlQuoteStrdup(); } - } testDescription_XmlQuoteTest_testXmlQuoteStrdup; - --#include "../../src/util/list-container-test.h" -+#include "util/list-container-test.h" - - static ListContainerTest *suite_ListContainerTest = 0; - - static CxxTest::List Tests_ListContainerTest = { 0, 0 }; --CxxTest::DynamicSuiteDescription suiteDescription_ListContainerTest( "../../src/util/list-container-test.h", 28, "ListContainerTest", Tests_ListContainerTest, suite_ListContainerTest, 38, 39 ); -+CxxTest::DynamicSuiteDescription suiteDescription_ListContainerTest( "util/list-container-test.h", 28, "ListContainerTest", Tests_ListContainerTest, suite_ListContainerTest, 38, 39 ); - - static class TestDescription_ListContainerTest_testRangeConstructor : public CxxTest::RealTestDescription { - public: diff -r bd1b2ae8dac1 -r 3be9dc20fd83 inkscape/stuff/patches/0006-Update_to_new_libwpg.patch --- a/inkscape/stuff/patches/0006-Update_to_new_libwpg.patch Wed Mar 04 00:19:44 2015 -0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ -From: David Tardon -Date: Tue, 27 May 2014 16:47:39 +0200 -Subject: Update_to_new_libwpg - ---- - configure.ac | 19 ++--------------- - src/extension/internal/wpg-input.cpp | 41 ++++++++++++------------------------ - 2 files changed, 15 insertions(+), 45 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fcff879..4bce58c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -676,23 +676,8 @@ dnl ****************************** - - with_libwpg=no - --PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no) --if test "x$with_libwpg01" = "xyes"; then -- AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x]) -- with_libwpg=yes -- AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS) -- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS) --fi --AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes") -- --PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no) --if test "x$with_libwpg02" = "xyes"; then -- AC_DEFINE(WITH_LIBWPG02,1,[Build in libwpg 0.2.x]) -- with_libwpg=yes -- AC_SUBST(LIBWPG_LIBS, $LIBWPG02_LIBS) -- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG02_CFLAGS) --fi --AM_CONDITIONAL(WITH_LIBWPG02, test "x$with_libwpg02" = "xyes") -+PKG_CHECK_MODULES(LIBWPG, libwpg-0.3 librevenge-0.0 librevenge-stream-0.0, with_libwpg=yes, with_libwpg=no) -+AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg" = "xyes") - - if test "x$with_libwpg" = "xyes"; then - AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg]) -diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp -index 5c5cb65..71c7b44 100644 ---- a/src/extension/internal/wpg-input.cpp -+++ b/src/extension/internal/wpg-input.cpp -@@ -48,17 +48,8 @@ - #include "extension/input.h" - #include "document.h" - --// Take a guess and fallback to 0.1.x if no configure has run --#if !defined(WITH_LIBWPG01) && !defined(WITH_LIBWPG02) --#define WITH_LIBWPG01 1 --#endif -- - #include "libwpg/libwpg.h" --#if WITH_LIBWPG01 --#include "libwpg/WPGStreamImplementation.h" --#elif WITH_LIBWPG02 --#include "libwpd-stream/libwpd-stream.h" --#endif -+#include "librevenge-stream/librevenge-stream.h" - - using namespace libwpg; - -@@ -69,17 +60,9 @@ namespace Internal { - - SPDocument * - WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) { --#if WITH_LIBWPG01 -- WPXInputStream* input = new libwpg::WPGFileStream(uri); --#elif WITH_LIBWPG02 -- WPXInputStream* input = new WPXFileStream(uri); --#endif -- if (input->isOLEStream()) { --#if WITH_LIBWPG01 -- WPXInputStream* olestream = input->getDocumentOLEStream(); --#elif WITH_LIBWPG02 -- WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN"); --#endif -+ librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(uri); -+ if (input->isStructured()) { -+ librevenge::RVNGInputStream* olestream = input->getSubStreamByName("PerfectOffice_MAIN"); - if (olestream) { - delete input; - input = olestream; -@@ -94,15 +77,17 @@ WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) { - return NULL; - } - --#if WITH_LIBWPG01 -- libwpg::WPGString output; --#elif WITH_LIBWPG02 -- WPXString output; --#endif -- if (!libwpg::WPGraphics::generateSVG(input, output)) { -+ librevenge::RVNGStringVector vec; -+ librevenge::RVNGSVGDrawingGenerator generator(vec, ""); -+ -+ if (!libwpg::WPGraphics::parse(input, &generator) || vec.empty() || vec[0].empty()) -+ { - delete input; - return NULL; -- } -+ } -+ -+ librevenge::RVNGString output("\n\n"); -+ output.append(vec[0]); - - //printf("I've got a doc: \n%s", painter.document.c_str()); - --- -1.9.3 - diff -r bd1b2ae8dac1 -r 3be9dc20fd83 inkscape/stuff/patches/series --- a/inkscape/stuff/patches/series Wed Mar 04 00:19:44 2015 -0300 +++ b/inkscape/stuff/patches/series Wed Mar 04 10:06:37 2015 +0100 @@ -1,6 +1,1 @@ -0001-Fix_Datamatrix_UI_issue.patch 0002-Drop_PS_and_PDF_support_in_MimeType.patch -0003-Fix_LP_-911146.patch -0004-Fix_FTBFS_on_gcc-4.8.patch -0005-Fix_FTBFS_due_to_tests.patch -0006-Update_to_new_libwpg.patch