From: Michael Tremer Date: Sun, 2 Jan 2011 14:16:57 +0000 (+0100) Subject: docbook-utils: Add dependency to docbook-dsssl. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dc7a8e6f4492d81b5a521d8987f5c710cc9a00a;p=ipfire-3.x.git docbook-utils: Add dependency to docbook-dsssl. --- diff --git a/opensp/opensp.nm b/opensp/opensp.nm new file mode 100644 index 000000000..85e9b9b85 --- /dev/null +++ b/opensp/opensp.nm @@ -0,0 +1,44 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team # +############################################################################### + +name = opensp +version = 1.5.2 +release = 1 + +groups = Application/Text +url = http://openjade.sourceforge.net/ +license = MIT +summary = SGML and XML parser. + +description + OpenSP is an implementation of the ISO/IEC 8879:1986 standard SGML + (Standard Generalized Markup Language). +end + +source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp} + +thisapp = OpenSP-%{version} + +build + requires + gcc-c++ + end + + 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 +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end +end diff --git a/opensp/patches/opensp-multilib.patch b/opensp/patches/opensp-multilib.patch new file mode 100644 index 000000000..a98861357 --- /dev/null +++ b/opensp/patches/opensp-multilib.patch @@ -0,0 +1,91 @@ +--- 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 + #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 + #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 + #include "splib.h" + + #ifdef SP_MANUAL_INST +@@ -166,7 +167,7 @@ + __instantiate(Vector) + __instantiate(Vector) + // 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) + #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 ++ + /* 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 + diff --git a/opensp/patches/opensp-nodeids.patch b/opensp/patches/opensp-nodeids.patch new file mode 100644 index 000000000..4e539d095 --- /dev/null +++ b/opensp/patches/opensp-nodeids.patch @@ -0,0 +1,128 @@ +--- 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 @@ + + +- ++ + + OpenSP 1.5.2 + Release Notes +@@ -16,7 +16,7 @@ + + + +- OpenSP 1.5.2 Release Notes ++ OpenSP 1.5.2 Release Notes + + 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. + +- Applications of OpenSP ++ Applications of OpenSP + 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. + + +- Obtaining OpenSP ++ Obtaining OpenSP + 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 +@@ -49,7 +49,7 @@ + linkend="bindist"/> for information on how to obtain pre-compiled + binary packages. + +- Supported Platforms ++ Supported Platforms + 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 @@ + openjade-devel@lists.sourceforge.net, including any + diffs/patches you have used. + +- Building OpenSP from Source ++ Building OpenSP from Source + OpenSP requires 20Mb to 50Mb of disk space to build. An + installation will require around 10Mb to 20Mb depending on + architecture. +@@ -249,7 +249,7 @@ + the latest version of OpenSP to be available from your distributor in due + course. + +- Installation ++ Installation + 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 pubtext +@@ -263,7 +263,7 @@ + recommended that you set up and use such a catalog system. + + +- Support ++ Support + 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. + + +- Version 1.5.2 ++ Version 1.5.2 + Released December 2005. + The release contains a number of enhancements together with + support for version 4.0 of the GNU C++ compiler. +@@ -418,7 +418,7 @@ + + + +- Version 1.5.1 ++ Version 1.5.1 + Released October 2003. + The release contains a number of new features together with + support for version 3.3 for the GNU C++ compiler. +@@ -613,7 +613,7 @@ + + + +- Version 1.5 ++ Version 1.5 + Released November 2002. + In addition to many new features this version also supports the + latest GNU C++ compiler: gcc 3.2 at the time of writing. +@@ -976,7 +976,7 @@ + + + +- ++ + Version 1.4 + Released February 2000 + Version 1.4 added many improvements. Changes +@@ -1023,7 +1023,7 @@ + + + +- Version 1.3.4 ++ Version 1.3.4 + Released October 1999 + The second release from the OpenJade project. This version was + distributed as part of OpenJade 1.3 +@@ -1040,7 +1040,7 @@ + + + +- Version 1.3.3 ++ Version 1.3.3 + The first release from the OpenJade project + + diff --git a/opensp/patches/opensp-sigsegv.patch b/opensp/patches/opensp-sigsegv.patch new file mode 100644 index 000000000..69bd3a94e --- /dev/null +++ b/opensp/patches/opensp-sigsegv.patch @@ -0,0 +1,20 @@ +--- 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; diff --git a/pkgs/core/docbook-utils/docbook-utils.nm b/pkgs/core/docbook-utils/docbook-utils.nm index a4732f22c..0eed3c3fd 100644 --- a/pkgs/core/docbook-utils/docbook-utils.nm +++ b/pkgs/core/docbook-utils/docbook-utils.nm @@ -34,11 +34,11 @@ PKG_URL = http://sources.redhat.com/docbook-tools/ PKG_LICENSE = GPLv2+ PKG_SUMMARY = Shell scripts for managing DocBook documents. -PKG_BUILD_DEPS+= openjade docbook-dsssl sgml-common -PKG_DEPS += docbook-dsssl docbook-dtds +PKG_BUILD_DEPS+= docbook-dtds docbook-dsssl openjade sgml-common +PKG_DEPS += docbook-dtds define PKG_DESCRIPTION - This package contains scripts are for easy conversion from DocBook \ + This package contains scripts are for easy conversion from DocBook \ files to other formats, and for comparing SGML files. endef