From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- .../xsd-4.0.0-disable_examples_and_tests.patch | 50 ------- .../xsd/files/xsd-4.0.0-fix-expat-support.patch | 59 -------- dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch | 11 -- dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch | 159 --------------------- 4 files changed, 279 deletions(-) delete mode 100644 dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch delete mode 100644 dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch delete mode 100644 dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch delete mode 100644 dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch (limited to 'dev-cpp/xsd/files') 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 deleted file mode 100644 index d04487a17762..000000000000 --- a/dev-cpp/xsd/files/xsd-4.0.0-disable_examples_and_tests.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- 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 deleted file mode 100644 index e91b74eb4c35..000000000000 --- a/dev-cpp/xsd/files/xsd-4.0.0-fix-expat-support.patch +++ /dev/null @@ -1,59 +0,0 @@ -## Fix bug in C++/Parser Expat Support http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commitdiff;h=94cba986108a0e0f42295572ca42c356d59328d7 -### Author Boris Kolpackov -## Thu, 24 Jul 2014 11:40:01 +0100 (12:40 +0200) -### Committer Boris Kolpackov -## 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 parser_auto_ptr; -+ typedef -+ std::unique_ptr -+ 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 deleted file mode 100644 index 85ea3e54313e..000000000000 --- a/dev-cpp/xsd/files/xsd-4.0.0-fix-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/xsd/xsd.cxx -+++ b/xsd/xsd.cxx -@@ -15,7 +15,7 @@ - - #include - #include --#include -+#include - #include - #include - #include 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 deleted file mode 100644 index cb78348e7b67..000000000000 --- a/dev-cpp/xsd/files/xsd-4.0.0-xsdcxx-rename.patch +++ /dev/null @@ -1,159 +0,0 @@ -Description: change docu from xsd to xsdcxx -Author: Jörg Frings-Fürst -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 @@ - - - -- XSD 4.0.0 Compiler Command Line Manual -+ XSDCXX 4.0.0 Compiler Command Line Manual - - - -- -+ - - - -@@ -50,19 +50,19 @@ - -

NAME

- --

xsd - W3C XML Schema to C++ Compiler

-+

xsdcxx - W3C XML Schema to C++ Compiler

- -

SYNOPSIS

- -
--
xsd command [options] file [file ...]
--
xsd help [command]
--
xsd version
-+
xsdcxx command [options] file [file ...]
-+
xsdcxx help [command]
-+
xsdcxx version
-
- -

DESCRIPTION

- --

xsd generates vocabulary-specific, statically-typed -+

xsdcxx generates vocabulary-specific, statically-typed - C++ mapping from W3C XML Schema definitions. Particular mapping to - produce is selected by a command. Each mapping has - a number of mapping-specific options that should -@@ -138,10 +138,10 @@ - -

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 - (libxsd) 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 - XSD_CXX11 macro for your entire project.

- -@@ -219,7 +219,7 @@ - -

For example, if you have file hello.xsd with - namespace http://example.com/hello and you run -- xsd on this file, then the string in question will -+ xsdcxx on this file, then the string in question will - be:

- -

hello.xsd. http://example.com/hello

-@@ -1530,7 +1530,7 @@ -

DIAGNOSTICS

- -

If the input file is not a valid W3C XML Schema definition, -- xsd will issue diagnostic messages to STDERR -+ xsdcxx will issue diagnostic messages to STDERR - and exit with non-zero exit code.

- -

BUGS

-- cgit v1.2.3