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 | 58 | ||||
| -rw-r--r-- | debian/patches/0700_hurd_PATH_MAX.patch | 21 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
4 files changed, 241 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..c810ec9 --- /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> +Reviewed-by: +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..4f98d00 --- /dev/null +++ b/debian/patches/0100-C++Parser_Expat_support.patch @@ -0,0 +1,58 @@ +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 +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/0700_hurd_PATH_MAX.patch b/debian/patches/0700_hurd_PATH_MAX.patch new file mode 100644 index 0000000..3babcdd --- /dev/null +++ b/debian/patches/0700_hurd_PATH_MAX.patch @@ -0,0 +1,21 @@ +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 +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..999f227 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +0100-C++Parser_Expat_support.patch +0001-xsd_xsdcxx-rename.patch +0700_hurd_PATH_MAX.patch |