diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-cpp/xsd/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-cpp/xsd/files')
-rw-r--r-- | dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch | 50 | ||||
-rw-r--r-- | dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch | 59 | ||||
-rw-r--r-- | dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch | 11 | ||||
-rw-r--r-- | dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch | 159 |
4 files changed, 279 insertions, 0 deletions
diff --git a/dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch b/dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch new file mode 100644 index 000000000000..d04487a17762 --- /dev/null +++ b/dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch @@ -0,0 +1,50 @@ +--- a/makefile ++++ b/makefile +@@ -15,8 +15,6 @@ + .PHONY: $(dist-pre) + + $(default): $(out_base)/xsd/ \ +- $(out_base)/tests/ \ +- $(out_base)/examples/ \ + $(out_base)/doc/ + + # Test. +@@ -28,7 +26,6 @@ + # + $(install): $(out_base)/xsd/.install \ + $(out_base)/libxsd/.install \ +- $(out_base)/examples/.install \ + $(out_base)/doc/.install + $(call install-dir,$(src_base)/dist/examples/build,$(install_doc_dir)/xsd/examples/build) + $(call install-dir,$(src_base)/dist/examples/cxx,$(install_doc_dir)/xsd/examples/cxx,-name makefile) +@@ -44,7 +41,6 @@ + # + $(dist): $(out_base)/xsd/.dist \ + $(out_base)/libxsd/.dist \ +- $(out_base)/examples/.dist \ + $(out_base)/doc/.dist + $(call install-dir,$(src_base)/dist/examples/build,$(dist_prefix)/examples/build) + $(call install-dir,$(src_base)/dist/examples/cxx,$(dist_prefix)/examples/cxx,-name makefile) +@@ -59,7 +55,6 @@ + $(dist-win): $(dist-pre) \ + $(out_base)/xsd/.dist-win \ + $(out_base)/libxsd/.dist-win \ +- $(out_base)/examples/.dist-win \ + $(out_base)/doc/.dist-win + $(call install-dir,$(src_base)/dist/etc,$(dist_prefix)/etc) + $(call install-dir,$(src_base)/dist/examples/build,$(dist_prefix)/examples/build) +@@ -90,14 +85,10 @@ + # Clean. + # + $(clean): $(out_base)/xsd/.clean \ +- $(out_base)/tests/.clean \ +- $(out_base)/examples/.clean \ + $(out_base)/doc/.clean + + $(call include,$(bld_root)/install.make) + + $(call import,$(src_base)/xsd/makefile) + $(call import,$(src_base)/libxsd/makefile) +-$(call import,$(src_base)/tests/makefile) +-$(call import,$(src_base)/examples/makefile) + $(call import,$(src_base)/doc/makefile) diff --git a/dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch b/dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch new file mode 100644 index 000000000000..e91b74eb4c35 --- /dev/null +++ b/dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch @@ -0,0 +1,59 @@ +## Fix bug in C++/Parser Expat Support http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=94cba986108a0e0f42295572ca42c356d59328d7 +### Author Boris Kolpackov <boris@codesynthesis.com> +## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200) +### Committer Boris Kolpackov <boris@codesynthesis.com> +## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200) +--- xsd/libxsd/xsd/cxx/parser/expat/elements.hxx ++++ 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. + // +--- xsd/libxsd/xsd/cxx/parser/expat/elements.txx ++++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx +@@ -283,9 +283,10 @@ namespace xsd + 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 +@@ -310,8 +311,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; +##http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=0e5fab0664fb36c6253dfd7bb86d8985d1b349ef +--- xsd/libxsd/xsd/cxx/parser/expat/elements.txx ++++ xsd/libxsd/xsd/cxx/parser/expat/elements.txx +@@ -279,7 +279,7 @@ 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) + diff --git a/dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch b/dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch new file mode 100644 index 000000000000..85ea3e54313e --- /dev/null +++ b/dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch @@ -0,0 +1,11 @@ +--- a/xsd/xsd.cxx ++++ b/xsd/xsd.cxx +@@ -15,7 +15,7 @@ + + #include <xsd-frontend/parser.hxx> + #include <xsd-frontend/transformations/anonymous.hxx> +-#include <xsd-frontend/transformations/enum-synthesis.cxx> ++#include <xsd-frontend/transformations/enum-synthesis.hxx> + #include <xsd-frontend/transformations/restriction.hxx> + #include <xsd-frontend/transformations/schema-per-type.hxx> + #include <xsd-frontend/transformations/simplifier.hxx> diff --git a/dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch b/dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch new file mode 100644 index 000000000000..cb78348e7b67 --- /dev/null +++ b/dev-cpp/xsd/files/xsd-4.0.0-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 +=================================================================== +--- a/doc/xsd.1 ++++ b/doc/xsd.1 +@@ -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 +=================================================================== +--- a/doc/xsd.xhtml ++++ b/doc/xsd.xhtml +@@ -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> |