diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0001-xsd_xsdcxx-rename.patch | 159 | ||||
| -rw-r--r-- | debian/patches/0100-C++Parser_Expat_support.patch | 59 | ||||
| -rw-r--r-- | debian/patches/0105-Fix_path_handling_bug.patch | 20 | ||||
| -rw-r--r-- | debian/patches/0110-xerces-c3.2.patch | 183 | ||||
| -rw-r--r-- | debian/patches/0115-lintian-typos.patch | 32 | ||||
| -rw-r--r-- | debian/patches/0120-g++10.patch | 19 | ||||
| -rw-r--r-- | debian/patches/0700_hurd_PATH_MAX.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 7 |
8 files changed, 501 insertions, 0 deletions
diff --git a/debian/patches/0001-xsd_xsdcxx-rename.patch b/debian/patches/0001-xsd_xsdcxx-rename.patch new file mode 100644 index 0000000..a2984c0 --- /dev/null +++ b/debian/patches/0001-xsd_xsdcxx-rename.patch @@ -0,0 +1,159 @@ +Description: change docu from xsd to xsdcxx +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Forwarded: not-needed +Last-Update: 2014-07-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/xsd/doc/xsd.1 +=================================================================== +--- trunk.orig/xsd/doc/xsd.1 2014-07-21 08:38:41.000000000 +0200 ++++ trunk/xsd/doc/xsd.1 2014-07-21 23:27:00.928980158 +0200 +@@ -1,16 +1,16 @@ + .\" Process this file with + .\" groff -man -Tascii xsd.1 + .\" +-.TH XSD 1 "July 2014" "XSD 4.0.0" ++.TH XSDCXX 1 "July 2014" "XSDCXX 4.0.0" + .SH NAME +-xsd \- W3C XML Schema to C++ Compiler ++xsdcxx \- W3C XML Schema to C++ Compiler + .\" + .\" + .\" + .\"-------------------------------------------------------------------- + .SH SYNOPSIS + .\"-------------------------------------------------------------------- +-.B xsd ++.B xsdcxx + .I command + .B [ + .I options +@@ -20,19 +20,19 @@ + .I file + .B ...] + .in +-.B xsd help ++.B xsdcxx help + .B [ + .I command + .B ] + .in +-.B xsd version ++.B xsdcxx version + .\" + .\" + .\" + .\"-------------------------------------------------------------------- + .SH DESCRIPTION + .\"-------------------------------------------------------------------- +-.B xsd ++.B xsdcxx + generates vocabulary-specific, statically-typed C++ mapping from W3C XML + Schema definitions. Particular mapping to produce is selected by a + .IR command . +@@ -96,7 +96,7 @@ + .PP + .RS + .RS 3 +-.B xsd help ++.B xsdcxx help + .I command + .RE + .PP +@@ -133,9 +133,9 @@ + + When the C++11 mode is selected, you normally don't need to perform any + extra steps other than enable C++11 in your C++ compiler, if required\. The +-XSD compiler will automatically add the necessary macro defines to the +-generated header files that will switch the header-only XSD runtime library +-(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSD ++XSDCXX compiler will automatically add the necessary macro defines to the ++generated header files that will switch the header-only XSDCXX runtime library ++(\fBlibxsd\fP) to the C++11 mode\. However, if you include any of the XSDCXX + runtime headers directly in your application (normally you just include the + generated headers), then you will need to define the \fBXSD_CXX11\fP macro + for your entire project\. +@@ -1632,7 +1632,7 @@ + .\" + .SH DIAGNOSTICS + If the input file is not a valid W3C XML Schema definition, +-.B xsd ++.B xsdcxx + will issue diagnostic messages to + .B STDERR + and exit with non-zero exit code. +Index: trunk/xsd/doc/xsd.xhtml +=================================================================== +--- trunk.orig/xsd/doc/xsd.xhtml 2014-07-21 08:38:41.000000000 +0200 ++++ trunk/xsd/doc/xsd.xhtml 2014-07-21 23:29:32.796093697 +0200 +@@ -3,11 +3,11 @@ + <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> + + <head> +- <title>XSD 4.0.0 Compiler Command Line Manual</title> ++ <title>XSDCXX 4.0.0 Compiler Command Line Manual</title> + + <meta name="copyright" content="© 2005-2014 Code Synthesis Tools CC"/> + <meta name="keywords" content="xsd,xml,schema,c++,mapping,data,binding,code,generator,manual,man,page"/> +- <meta name="description" content="XSD Compiler Command Line Manual"/> ++ <meta name="description" content="XSDCXX Compiler Command Line Manual"/> + + <link rel="stylesheet" type="text/css" href="default.css" /> + +@@ -50,19 +50,19 @@ + + <h1>NAME</h1> + +- <p>xsd - W3C XML Schema to C++ Compiler</p> ++ <p>xsdcxx - W3C XML Schema to C++ Compiler</p> + + <h1>SYNOPSIS</h1> + + <dl id="synopsis"> +- <dt><code><b>xsd</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt> +- <dt><code><b>xsd help</b> [<i>command</i>]</code></dt> +- <dt><code><b>xsd version</b></code></dt> ++ <dt><code><b>xsdcxx</b> <i>command</i> [<i>options</i>] <i>file</i> [<i>file</i> ...]</code></dt> ++ <dt><code><b>xsdcxx help</b> [<i>command</i>]</code></dt> ++ <dt><code><b>xsdcxx version</b></code></dt> + </dl> + + <h1>DESCRIPTION</h1> + +- <p><code><b>xsd</b></code> generates vocabulary-specific, statically-typed ++ <p><code><b>xsdcxx</b></code> generates vocabulary-specific, statically-typed + C++ mapping from W3C XML Schema definitions. Particular mapping to + produce is selected by a <code><i>command</i></code>. Each mapping has + a number of mapping-specific <code><i>options</i></code> that should +@@ -138,10 +138,10 @@ + + <p>When the C++11 mode is selected, you normally don't need to perform any + extra steps other than enable C++11 in your C++ compiler, if required. The +- XSD compiler will automatically add the necessary macro defines to the +- generated header files that will switch the header-only XSD runtime library ++ XSDCXX compiler will automatically add the necessary macro defines to the ++ generated header files that will switch the header-only XSDCXX runtime library + (<code><b>libxsd</b></code>) to the C++11 mode. However, if you include any +- of the XSD runtime headers directly in your application (normally you just ++ of the XSDCXX runtime headers directly in your application (normally you just + include the generated headers), then you will need to define the + <code><b>XSD_CXX11</b></code> macro for your entire project.</p></dd> + +@@ -219,7 +219,7 @@ + + <p>For example, if you have file <code><b>hello.xsd</b></code> with + namespace <code><b>http://example.com/hello</b></code> and you run +- <code><b>xsd</b></code> on this file, then the string in question will ++ <code><b>xsdcxx</b></code> on this file, then the string in question will + be:</p> + + <p><code><b>hello.xsd. http://example.com/hello</b></code></p> +@@ -1530,7 +1530,7 @@ + <h1>DIAGNOSTICS</h1> + + <p>If the input file is not a valid W3C XML Schema definition, +- <code><b>xsd</b></code> will issue diagnostic messages to STDERR ++ <code><b>xsdcxx</b></code> will issue diagnostic messages to STDERR + and exit with non-zero exit code.</p> + + <h1>BUGS</h1> diff --git a/debian/patches/0100-C++Parser_Expat_support.patch b/debian/patches/0100-C++Parser_Expat_support.patch new file mode 100644 index 0000000..f37ea02 --- /dev/null +++ b/debian/patches/0100-C++Parser_Expat_support.patch @@ -0,0 +1,59 @@ +Description: Fix bug in C++/Parser Expat support. +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Origin: http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commit;h=94cba986108a0e0f42295572ca42c356d59328d7 + http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commit;h=0e5fab0664fb36c6253dfd7bb86d8985d1b349ef +Forwarded: not-needed +Last-Update: 2016-04-10 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx +=================================================================== +--- trunk.orig/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx ++++ trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.hxx +@@ -51,7 +51,9 @@ namespace xsd + } + }; + +- typedef std::unique_ptr<XML_ParserStruct> parser_auto_ptr; ++ typedef ++ std::unique_ptr<XML_ParserStruct, parser_deleter> ++ parser_auto_ptr; + #else + // Simple auto pointer for Expat's XML_Parser object. + // +Index: trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.txx +=================================================================== +--- trunk.orig/xsd/libxsd/xsd/cxx/parser/expat/elements.txx ++++ trunk/xsd/libxsd/xsd/cxx/parser/expat/elements.txx +@@ -279,13 +279,14 @@ namespace xsd + { + parser_auto_ptr parser (XML_ParserCreateNS (0, XML_Char (' '))); + +- if (parser == 0) ++ if (parser.get () == 0) + throw std::bad_alloc (); + + if (system_id || public_id) +- parse_begin (parser, system_id ? *system_id : *public_id, eh); ++ parse_begin ( ++ parser.get (), system_id ? *system_id : *public_id, eh); + else +- parse_begin (parser, eh); ++ parse_begin (parser.get (), eh); + + // Temporarily unset the exception failbit. Also clear the + // fail bit when we reset the old state if it was caused +@@ -309,9 +310,10 @@ namespace xsd + // + break; + } +- +- if (XML_Parse ( +- parser, buf, is.gcount (), is.eof ()) == XML_STATUS_ERROR) ++ if (XML_Parse (parser.get (), ++ buf, ++ is.gcount (), ++ is.eof ()) == XML_STATUS_ERROR) + { + r = false; + break; diff --git a/debian/patches/0105-Fix_path_handling_bug.patch b/debian/patches/0105-Fix_path_handling_bug.patch new file mode 100644 index 0000000..7275283 --- /dev/null +++ b/debian/patches/0105-Fix_path_handling_bug.patch @@ -0,0 +1,20 @@ +Description: Fix path handling bug +Author: Boris Kolpackov <boris@codesynthesis.com> +Origin: git commit b4c3242a763e0461f454cc29be28c2ab26e4a495 +Forwarded: not-needed +Last-Update: 2016-09-10 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/xsd/examples/cxx/tree/embedded/xsdbin.cxx +=================================================================== +--- trunk.orig/xsd/examples/cxx/tree/embedded/xsdbin.cxx ++++ trunk/xsd/examples/cxx/tree/embedded/xsdbin.cxx +@@ -334,7 +334,7 @@ main (int argc, char* argv[]) + // + string::size_type p (base.rfind ('/')), p1 (base.rfind ('\\')); + +- if (p1 != string::npos && p1 > p) ++ if (p1 != string::npos && (p == string::npos || p1 > p)) + p = p1; + + if (p != string::npos) diff --git a/debian/patches/0110-xerces-c3.2.patch b/debian/patches/0110-xerces-c3.2.patch new file mode 100644 index 0000000..b15960b --- /dev/null +++ b/debian/patches/0110-xerces-c3.2.patch @@ -0,0 +1,183 @@ +Description: Remove tests for character ref. values unsupported by Xerces-C++ 3.2 +Author: Boris Kolpackov <boris@codesynthesis.com> +Origin: https://git.codesynthesis.com/cgit/xsd/xsd/patch/?id=400651ba7fd2f80155348ed39fc02e2aa9892fb9 +Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881108 +Forwarded: not-needed +Last-Update: 2017-11-08 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx ++++ trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx +@@ -43,7 +43,7 @@ main (int argc, char* argv[]) + if (s[0] != "abc" || + s[1] != "\xE6" || + s[2] != "\xA2\xA3\xA4\xA5" || +- s[3] != "???") ++ s[3] != "??") + { + cerr << "invalid encoding" << endl; + return 1; +Index: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std ++++ trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.std +@@ -3,7 +3,7 @@ + <a>abc</a> + <a>æ</a> + <a>¢£¤¥</a> +- <a>???</a> ++ <a>??</a> + <b>abc</b> + <b>aâc</b> + <b>âòbc</b> +Index: trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml ++++ trunk/xsd/tests/cxx/tree/encoding/char/iso-8859-1/test.xml +@@ -5,7 +5,7 @@ + <a>abc</a> + <a>æ</a> + <a>¢£¤¥</a> +- <a>Āꪪ򪪪</a> ++ <a>Āꪪ</a> + + <b>abc</b> + <b>aâc</b> +Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx ++++ trunk/xsd/tests/cxx/tree/encoding/char/utf-8/driver.cxx +@@ -32,8 +32,7 @@ main (int argc, char* argv[]) + + if (s[0] != "abc" || + s[1] != "\xD5\x95" || +- s[2] != "\xEA\xAA\xAA" || +- s[3] != "\xF2\xAA\xAA\xAA") ++ s[2] != "\xEA\xAA\xAA") + { + cerr << "invalid encoding" << endl; + return 1; +@@ -45,8 +44,7 @@ main (int argc, char* argv[]) + + if (s[0] != strenum::abc || + s[1] != strenum::a_c || +- s[2] != strenum::cxx_bc || +- s[3] != strenum::ab_) ++ s[2] != strenum::cxx_bc) + { + cerr << "invalid encoding" << endl; + return 1; +Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.std +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/test.std ++++ trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.std +@@ -3,9 +3,7 @@ + <a>abc</a> + <a>Օ</a> + <a>ꪪ</a> +- <a>򪪪</a> + <b>abc</b> + <b>aՕc</b> + <b>ꪪbc</b> +- <b>ab򪪪</b> + </t:root> +Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xml +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/test.xml ++++ trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xml +@@ -5,11 +5,9 @@ + <a>abc</a> + <a>Օ</a> + <a>ꪪ</a> +- <a>򪪪</a> + + <b>abc</b> + <b>aՕc</b> + <b>ꪪbc</b> +- <b>ab򪪪</b> + + </t:root> +Index: trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd ++++ trunk/xsd/tests/cxx/tree/encoding/char/utf-8/test.xsd +@@ -9,7 +9,6 @@ + abc + aՕc + ꪪbc +- ab򪪪 + </documentation> + </annotation> + +@@ -17,7 +16,6 @@ + <enumeration value="abc"/> + <enumeration value="aՕc"/> + <enumeration value="ꪪbc"/> +- <enumeration value="ab򪪪"/> + </restriction> + </simpleType> + +Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.std +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/test.std ++++ trunk/xsd/tests/cxx/tree/encoding/wchar/test.std +@@ -2,9 +2,9 @@ + <t:root xmlns:t="test"> + <a>abc</a> + <a>῿퟿</a> +- <a>𐀀􏿽</a> ++ <a>ကჿ</a> + <b>abc</b> + <b>a῿퟿c</b> +- <b>𐀀􏿽bc</b> +- <b>ab𐀀􏿽</b> ++ <b>ကჿbc</b> ++ <b>abကჿ</b> + </t:root> +Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.xml +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/test.xml ++++ trunk/xsd/tests/cxx/tree/encoding/wchar/test.xml +@@ -4,11 +4,11 @@ + + <a>abc</a> + <a>῿퟿</a> +- <a>𐀀􏿽</a> ++ <a>ကჿ</a> + + <b>abc</b> + <b>a῿퟿c</b> +- <b>𐀀􏿽bc</b> +- <b>ab𐀀􏿽</b> ++ <b>ကჿbc</b> ++ <b>abကჿ</b> + + </t:root> +Index: trunk/xsd/tests/cxx/tree/encoding/wchar/test.xsd +=================================================================== +--- trunk.orig/xsd/tests/cxx/tree/encoding/wchar/test.xsd ++++ trunk/xsd/tests/cxx/tree/encoding/wchar/test.xsd +@@ -8,16 +8,16 @@ + Test enum. Valid values are: + abc + a῿퟿c +- 𐀀􏿽bc +- ab𐀀􏿽 ++ ကჿbc ++ abကჿ + </documentation> + </annotation> + + <restriction base="string"> + <enumeration value="abc"/> + <enumeration value="a῿퟿c"/> +- <enumeration value="𐀀􏿽bc"/> +- <enumeration value="ab𐀀􏿽"/> ++ <enumeration value="ကჿbc"/> ++ <enumeration value="abကჿ"/> + </restriction> + </simpleType> + diff --git a/debian/patches/0115-lintian-typos.patch b/debian/patches/0115-lintian-typos.patch new file mode 100644 index 0000000..f2b96b5 --- /dev/null +++ b/debian/patches/0115-lintian-typos.patch @@ -0,0 +1,32 @@ +Description: Correct some typos +Author: Jörg Frings-Fürst <debian@jff.email> +Forwarded: not-needed +Last-Update: 2017-11-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/xsd/xsd/cxx/tree/tree-header.cxx +=================================================================== +--- trunk.orig/xsd/xsd/cxx/tree/tree-header.cxx ++++ trunk/xsd/xsd/cxx/tree/tree-header.cxx +@@ -972,7 +972,7 @@ namespace CXX + << " * @brief Assign the underlying enum value." << endl + << " *" << endl + << " * @param v A enum value." << endl +- << " * @return A refernce to the instance." << endl ++ << " * @return A reference to the instance." << endl + << " */" << endl; + } + +Index: trunk/xsd/xsd/processing/inheritance/processor.cxx +=================================================================== +--- trunk.orig/xsd/xsd/processing/inheritance/processor.cxx ++++ trunk/xsd/xsd/processing/inheritance/processor.cxx +@@ -290,7 +290,7 @@ namespace Processing + wcerr << t.file () << ":" << t.line () << ":" << t.column () + << " error: nested anonymous type in '" << t.name () + << "' or '" << type.name () << "' inherits from one of " +- << "these types and makes them mutually dependant" ++ << "these types and makes them mutually dependent" + << endl; + + wcerr << t.file () << ":" << t.line () << ":" << t.column () diff --git a/debian/patches/0120-g++10.patch b/debian/patches/0120-g++10.patch new file mode 100644 index 0000000..441b278 --- /dev/null +++ b/debian/patches/0120-g++10.patch @@ -0,0 +1,19 @@ +Description: Fix FTBFS with gcc-10 +Author: Boris Kolpackov <boris@codesynthesis.com> +Origin: upstream, https://git.codesynthesis.com/cgit/libxsd-frontend/libxsd-frontend/commit/?id=5029f8665190879285787a9dcdaf5f997cadd2e2 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957999 +Last-Update: 2020-09-10 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx +=================================================================== +--- trunk.orig/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx ++++ trunk/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx +@@ -3,6 +3,7 @@ + // license : GNU GPL v2 + exceptions; see accompanying LICENSE file + + #include <algorithm> ++#include <iostream> + + #include <cutl/compiler/type-info.hxx> + diff --git a/debian/patches/0700_hurd_PATH_MAX.patch b/debian/patches/0700_hurd_PATH_MAX.patch new file mode 100644 index 0000000..b825e23 --- /dev/null +++ b/debian/patches/0700_hurd_PATH_MAX.patch @@ -0,0 +1,22 @@ +Description: Add PATH_MAX for hurd +Author: Jörg Frings-Fürst <debain@jff-webhosting.net> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784425 +Forwarded: not-needed +Last-Update: 2016-01-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/libcutl/cutl/fs/path.cxx +=================================================================== +--- trunk.orig/libcutl/cutl/fs/path.cxx ++++ trunk/libcutl/cutl/fs/path.cxx +@@ -13,6 +13,10 @@ + + #include <cutl/fs/path.hxx> + ++#ifndef PATH_MAX ++ #define PATH_MAX 4096 ++#endif ++ + namespace cutl + { + namespace fs diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e82ca95 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,7 @@ +0100-C++Parser_Expat_support.patch +0001-xsd_xsdcxx-rename.patch +0700_hurd_PATH_MAX.patch +0105-Fix_path_handling_bug.patch +0110-xerces-c3.2.patch +0115-lintian-typos.patch +0120-g++10.patch |