+++ /dev/null
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with this program. If not, see <http://www.gnu.org/licenses/>. #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include $(PKGROOT)/Include
-
-PKG_NAME = opensp
-PKG_VER = 1.5.2
-PKG_REL = 0
-
-PKG_MAINTAINER =
-PKG_GROUP = Application/Text
-PKG_URL = http://openjade.sourceforge.net/
-PKG_LICENSE = MIT
-PKG_SUMMARY = SGML and XML parser.
-
-PKG_PACKAGES += $(PKG_NAME_REAL)-devel
-
-PKG_BUILD_DEPS+= gcc-c++
-
-define PKG_DESCRIPTION
- OpenSP is an implementation of the ISO/IEC 8879:1986 standard SGML \
- (Standard Generalized Markup Language).
-endef
-
-PKG_TARBALL = OpenSP-$(PKG_VER).tar.gz
-
-DIR_APP = $(DIR_SRC)/OpenSP-$(PKG_VER)
-
-CONFIGURE_OPTIONS += \
- --disable-dependency-tracking \
- --disable-static \
- --disable-rpath \
- --disable-doc-build \
- --enable-default-catalog=/etc/sgml/catalog \
- --enable-default-search-path=/usr/share/sgml:/usr/share/xml
+++ /dev/null
---- OpenSP-1.5.2/configure.in.multilib 2005-12-23 14:15:21.000000000 +0000
-+++ OpenSP-1.5.2/configure.in 2006-06-13 13:36:49.000000000 +0100
-@@ -90,7 +90,7 @@
- #define SP_SIZEOF_BOOL_1
- #endif
-
--#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT)
-+#if (WCHAR_MAX == SHRT_MAX)
- #define SP_WCHAR_T_USHORT
- #endif
-
---- OpenSP-1.5.2/lib/parser_inst.cxx.multilib 2005-07-21 16:33:41.000000000 +0100
-+++ OpenSP-1.5.2/lib/parser_inst.cxx 2006-06-13 13:36:49.000000000 +0100
-@@ -9,6 +9,7 @@
- // Copyright (c) 1994 James Clark
- // See the file COPYING for copying permission.
-
-+#include <limits.h>
- #include "splib.h"
-
- #ifdef SP_MANUAL_INST
-@@ -1338,7 +1339,7 @@
- #endif
- #endif
- // we really just want to test if size_t == unsigned int
--#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT)
-+#if INT_MAX != SSIZE_MAX
- #ifdef __DECCXX
- #pragma define_template Vector<unsigned int>
- #else
---- OpenSP-1.5.2/lib/parser_inst.m4.multilib 2005-05-14 10:17:35.000000000 +0100
-+++ OpenSP-1.5.2/lib/parser_inst.m4 2006-06-13 13:36:49.000000000 +0100
-@@ -1,6 +1,7 @@
- // Copyright (c) 1994 James Clark
- // See the file COPYING for copying permission.
-
-+#include <limits.h>
- #include "splib.h"
-
- #ifdef SP_MANUAL_INST
-@@ -166,7 +167,7 @@
- __instantiate(Vector<LeafContentToken*>)
- __instantiate(Vector<size_t>)
- // we really just want to test if size_t == unsigned int
--#if !defined(SIZEOF_SIZE_T) || !defined(SIZEOF_UNSIGNED_INT) || (SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT)
-+#if INT_MAX != SSIZE_MAX
- __instantiate(Vector<unsigned int>)
- #endif
-
---- OpenSP-1.5.2/config.h.in.multilib 2005-11-05 09:43:42.000000000 +0000
-+++ OpenSP-1.5.2/config.h.in 2006-06-13 13:41:45.000000000 +0100
-@@ -1,5 +1,7 @@
- /* config.h.in. Generated from configure.in by autoheader. */
-
-+#include <limits.h>
-+
- /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
- systems. This function is required for `alloca.c' support on those systems.
- */
-@@ -333,22 +335,6 @@
- /* The size of a `bool', as computed by sizeof. */
- #undef SIZEOF_BOOL
-
--/* The size of a `size_t', as computed by sizeof. */
--#undef SIZEOF_SIZE_T
--
--/* The size of a `unsigned int', as computed by sizeof. */
--#undef SIZEOF_UNSIGNED_INT
--
--/* The size of a `unsigned short', as computed by sizeof. */
--#undef SIZEOF_UNSIGNED_SHORT
--
--/* The size of a `wchar_t', as computed by sizeof. */
--#undef SIZEOF_WCHAR_T
--
--/* Define as the maximum value of type 'size_t', if the system doesn't define
-- it. */
--#undef SIZE_MAX
--
- /* define this if h_errno should be declared extern int */
- #undef SP_DECLARE_H_ERRNO
-
-@@ -503,7 +489,7 @@
- #define SP_SIZEOF_BOOL_1
- #endif
-
--#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT)
-+#if (WCHAR_MAX == SHRT_MAX)
- #define SP_WCHAR_T_USHORT
- #endif
-
+++ /dev/null
---- OpenSP-1.5.2/docsrc/releasenotes.xml.nodeids 2006-10-13 13:54:59.000000000 +0100
-+++ OpenSP-1.5.2/docsrc/releasenotes.xml 2006-10-13 13:58:25.000000000 +0100
-@@ -1,7 +1,7 @@
- <?xml version='1.0'?>
- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
--<book>
-+<book id="relnotesb">
- <bookinfo>
- <title>OpenSP 1.5.2</title>
- <subtitle>Release Notes</subtitle>
-@@ -16,7 +16,7 @@
- </copyright>
- </bookinfo>
-
-- <chapter><title>OpenSP 1.5.2 Release Notes</title>
-+ <chapter id="relnotesc"><title>OpenSP 1.5.2 Release Notes</title>
-
- <para>The OpenJade project provides a suite of tools and libraries for
- validating, processing and applying DSSSL (Document Style Semantics and
-@@ -29,7 +29,7 @@
- can be used as a basis for either open source or commerical projects. The
- library can be built as either a dynamic or static library.
- </para>
-- <sect1><title>Applications of OpenSP</title>
-+ <sect1 id="apps"><title>Applications of OpenSP</title>
- <para>The OpenSP library has been used in a number of projects. The
- World Wide Web consortium on-line HTML and XHTML validator is based on the
- OpenSP library. In addition to the OpenSP library a set of command line tools
-@@ -41,7 +41,7 @@
- tools.</para>
- </sect1>
-
-- <sect1><title>Obtaining OpenSP</title>
-+ <sect1 id="obtaining"><title>Obtaining OpenSP</title>
- <para>OpenSP is a project hosted at sourceforge.net and is available
- from the OpenJade web site at http://openjade.sourceforge.net or directly from
- the OpenJade project page at http://sourceforge.net/projects/openjade</para>
-@@ -49,7 +49,7 @@
- linkend="bindist"/> for information on how to obtain pre-compiled
- binary packages.</para>
- </sect1>
-- <sect1><title>Supported Platforms</title>
-+ <sect1 id="supported"><title>Supported Platforms</title>
- <para>OpenSP is intended to be as portable as possible. It should be
- possible to compile and build on most contemporary UNIX type platforms. In
- addition OpenSP should also build on Microsoft's Win32 based operating
-@@ -166,7 +166,7 @@
- <email>openjade-devel@lists.sourceforge.net</email>, including any
- diffs/patches you have used.</para>
- </sect1>
-- <sect1><title>Building OpenSP from Source</title>
-+ <sect1 id="building"><title>Building OpenSP from Source</title>
- <para>OpenSP requires 20Mb to 50Mb of disk space to build. An
- installation will require around 10Mb to 20Mb depending on
- architecture.</para>
-@@ -249,7 +249,7 @@
- the latest version of OpenSP to be available from your distributor in due
- course.</para>
- </sect1>
-- <sect1><title>Installation</title>
-+ <sect1 id="installation"><title>Installation</title>
- <para>In addition to the OpenSP executables and libraries you will also
- need various DTDs and declaration files. Some DTDs and associated files
- (entity definitions) are available in the <filename>pubtext</filename>
-@@ -263,7 +263,7 @@
- recommended that you set up and use such a catalog system.
- </para>
- </sect1>
-- <sect1><title>Support</title>
-+ <sect1 id="support"><title>Support</title>
- <para>If, after reading the documentation, you still have a problem,
- then you may require some additional help. The OpenJade project is a volunteer
- effort and as such does not provide any formal support. Instead, you should
-@@ -299,7 +299,7 @@
- often the case that someone has had the same problem before.</para>
-
- </sect1>
-- <sect1><title>Version 1.5.2</title>
-+ <sect1 id="v152"><title>Version 1.5.2</title>
- <formalpara><title>Released December 2005.</title>
- <para>The release contains a number of enhancements together with
- support for version 4.0 of the GNU C++ compiler.</para>
-@@ -418,7 +418,7 @@
- </table>
- </sect1>
-
-- <sect1><title>Version 1.5.1</title>
-+ <sect1 id="v151"><title>Version 1.5.1</title>
- <formalpara><title>Released October 2003.</title>
- <para>The release contains a number of new features together with
- support for version 3.3 for the GNU C++ compiler.</para>
-@@ -613,7 +613,7 @@
- </table>
- </sect1>
-
-- <sect1><title>Version 1.5</title>
-+ <sect1 id="v15"><title>Version 1.5</title>
- <formalpara><title>Released November 2002.</title>
- <para>In addition to many new features this version also supports the
- latest GNU C++ compiler: gcc 3.2 at the time of writing.</para>
-@@ -976,7 +976,7 @@
- </tgroup>
- </table>
- </sect1>
-- <sect1>
-+ <sect1 id="v14">
- <title>Version 1.4</title>
- <formalpara><title>Released February 2000</title>
- <para>Version 1.4 added many improvements. Changes
-@@ -1023,7 +1023,7 @@
- </listitem>
- </itemizedlist>
- </sect1>
-- <sect1><title>Version 1.3.4</title>
-+ <sect1 id="v134"><title>Version 1.3.4</title>
- <formalpara><title>Released October 1999</title>
- <para>The second release from the OpenJade project. This version was
- distributed as part of OpenJade 1.3</para>
-@@ -1040,7 +1040,7 @@
-
- </itemizedlist>
- </sect1>
-- <sect1><title>Version 1.3.3</title>
-+ <sect1 id="v133"><title>Version 1.3.3</title>
- <para>The first release from the OpenJade project</para>
- </sect1>
- </chapter>
+++ /dev/null
---- OpenSP-1.5.2/lib/ExtendEntityManager.cxx 2005-11-05 10:05:20.000000000 +0100
-+++ OpenSP-1.5.2.new/lib/ExtendEntityManager.cxx 2007-06-21 12:56:26.000000000 +0200
-@@ -1238,7 +1238,8 @@ StorageObjectSpec::StorageObjectSpec()
- }
-
- StorageObjectSpec::StorageObjectSpec(const StorageObjectSpec& x)
--: codingSystemName(x.codingSystemName),
-+: storageManager(x.storageManager),
-+ codingSystemName(x.codingSystemName),
- codingSystem(x.codingSystem),
- specId(x.specId),
- baseId(x.baseId),
-@@ -1253,6 +1254,7 @@ StorageObjectSpec::StorageObjectSpec(con
- StorageObjectSpec& StorageObjectSpec::operator=(const StorageObjectSpec& x)
- {
- if (this != &x) {
-+ storageManager = x.storageManager;
- codingSystemName = x.codingSystemName;
- codingSystem = x.codingSystem;
- specId = x.specId;
projects / people / amarx / ipfire-3.x.git / commitdiff
