Compare commits
3 Commits
1.5.2-4mam
...
main
Author | SHA1 | Date | |
---|---|---|---|
d84d0603db | |||
410e4fcc62 | |||
d17e538026 |
@ -1,20 +0,0 @@
|
||||
Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
|
||||
Date: 2004-04-24
|
||||
Initial Package Version: 1.5.1
|
||||
Origin: OpenJade SourceForge Patch Page
|
||||
Upstream Status: Fixed
|
||||
Description: Fixes Compile Issues with GCC 3.4
|
||||
|
||||
$LastChangedBy: bdubbs $
|
||||
$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
|
||||
|
||||
--- OpenSP-1.5.1/include/RangeMap.cxx.orig 2004-04-24 17:39:50.000691400 +0000
|
||||
+++ OpenSP-1.5.1/include/RangeMap.cxx 2004-04-24 17:39:59.682536194 +0000
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "RangeMap.h"
|
||||
#include "ISet.h"
|
||||
#include "types.h"
|
||||
+#include "constant.h"
|
||||
|
||||
#ifdef SP_NAMESPACE
|
||||
namespace SP_NAMESPACE {
|
@ -1,12 +0,0 @@
|
||||
diff -dpruN --exclude='config*' OpenSP-1.5.1.orig/include/InternalInputSource.h OpenSP-1.5.1/include/InternalInputSource.h
|
||||
--- OpenSP-1.5.1.orig/include/InternalInputSource.h 2003-07-17 20:14:00.000000000 +0200
|
||||
+++ OpenSP-1.5.1/include/InternalInputSource.h 2005-11-16 07:22:04.700397800 +0100
|
||||
@@ -34,7 +34,7 @@ public:
|
||||
void pushCharRef(Char ch, const NamedCharRef &);
|
||||
Boolean rewind(Messenger &);
|
||||
const StringC *contents();
|
||||
- InternalInputSource *InternalInputSource::asInternalInputSource();
|
||||
+ InternalInputSource *asInternalInputSource();
|
||||
~InternalInputSource();
|
||||
private:
|
||||
InternalInputSource(const InternalInputSource &); // undefined
|
39
OpenSP-1.5.2-manpage.patch
Normal file
39
OpenSP-1.5.2-manpage.patch
Normal file
@ -0,0 +1,39 @@
|
||||
diff -urNp OpenSP-1.5.2-orig/docsrc/osgmlnorm.xml OpenSP-1.5.2/docsrc/osgmlnorm.xml
|
||||
--- OpenSP-1.5.2-orig/docsrc/osgmlnorm.xml 2005-12-08 20:34:01.000000000 +0100
|
||||
+++ OpenSP-1.5.2/docsrc/osgmlnorm.xml 2013-08-15 14:58:01.284430911 +0200
|
||||
@@ -173,6 +173,15 @@
|
||||
<para>Show error numbers in error messages.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
+
|
||||
+ <varlistentry>
|
||||
+ <term><option>-g</option></term>
|
||||
+ <term><option>--open-elements</option></term>
|
||||
+ <listitem>
|
||||
+ <para>Show the generic identifiers of open elements in error
|
||||
+ messages.</para>
|
||||
+ </listitem>
|
||||
+ </varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
<term><option>-h</option></term>
|
||||
diff -urNp OpenSP-1.5.2-orig/docsrc/ospam.xml OpenSP-1.5.2/docsrc/ospam.xml
|
||||
--- OpenSP-1.5.2-orig/docsrc/ospam.xml 2005-12-08 20:34:01.000000000 +0100
|
||||
+++ OpenSP-1.5.2/docsrc/ospam.xml 2013-08-15 14:53:58.414782217 +0200
|
||||
@@ -151,6 +151,16 @@
|
||||
of stderr.</para>
|
||||
</listitem>
|
||||
</varlistentry>
|
||||
+
|
||||
+ <varlistentry>
|
||||
+ <term><option>-g</option></term>
|
||||
+ <term><option>--open-elements</option></term>
|
||||
+ <listitem>
|
||||
+ <para>Show the generic identifiers of open elements in error
|
||||
+ messages.</para>
|
||||
+ </listitem>
|
||||
+ </varlistentry>
|
||||
+
|
||||
<varlistentry>
|
||||
<term><option>-h</option></term>
|
||||
<term><option>--hoist-omitted-tags</option></term>
|
91
OpenSP-1.5.2-multilib.patch
Normal file
91
OpenSP-1.5.2-multilib.patch
Normal file
@ -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 <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
|
||||
|
128
OpenSP-1.5.2-nodeids.patch
Normal file
128
OpenSP-1.5.2-nodeids.patch
Normal file
@ -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 @@
|
||||
<?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>
|
20
OpenSP-1.5.2-sigsegv.patch
Normal file
20
OpenSP-1.5.2-sigsegv.patch
Normal file
@ -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;
|
198
opensp-1.5.2-configure-c99.patch
Normal file
198
opensp-1.5.2-configure-c99.patch
Normal file
@ -0,0 +1,198 @@
|
||||
Avoid implicit function declarations because they have been removed
|
||||
from C in 1999. Future compilers are likely to reject them by
|
||||
default.
|
||||
|
||||
No need to upstream this because the aclocal.m4 file is not checked
|
||||
into the repository since:
|
||||
|
||||
------------------------------------------------------------------------
|
||||
r412 | clasen | 1999-11-06 14:10:34 +0100 (Sat, 06 Nov 1999) | 3 lines
|
||||
Changed paths:
|
||||
M /trunk/sp/Makefile.in
|
||||
D /trunk/sp/config/aclocal.m4
|
||||
D /trunk/sp/config/configure.in
|
||||
M /trunk/sp/configure
|
||||
A /trunk/sp/configure.in
|
||||
|
||||
Install headers in $(includedir)/OpenSP, move configure.in to toplevel,
|
||||
remove generated file aclocal.m4.
|
||||
|
||||
diff --git a/aclocal.m4 b/aclocal.m4
|
||||
index d7cc45cf7b80ca54..2fde71fb866f12bc 100644
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -833,10 +833,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -850,7 +846,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}]
|
||||
EOF
|
||||
if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
|
||||
diff --git a/configure b/configure
|
||||
index caa2d31585b112bd..90dce8e854b35393 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2917,7 +2917,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
for ac_declaration in \
|
||||
- '' \
|
||||
+ '#include <stdlib.h>' \
|
||||
'extern "C" void std::exit (int) throw (); using std::exit;' \
|
||||
'extern "C" void std::exit (int); using std::exit;' \
|
||||
'extern "C" void exit (int) throw ();' \
|
||||
@@ -5186,8 +5186,8 @@ main ()
|
||||
for (i = 0; i < 256; i++)
|
||||
if (XOR (islower (i), ISLOWER (i))
|
||||
|| toupper (i) != TOUPPER (i))
|
||||
- exit(2);
|
||||
- exit (0);
|
||||
+ return 2;
|
||||
+ return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
||||
@@ -9508,10 +9508,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -9525,7 +9521,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -9606,10 +9602,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -9623,7 +9615,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -13321,10 +13313,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -13338,7 +13326,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -13419,10 +13407,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -13436,7 +13420,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -19110,10 +19094,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -19127,7 +19107,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -19208,10 +19188,6 @@ else
|
||||
# endif
|
||||
#endif
|
||||
|
||||
-#ifdef __cplusplus
|
||||
-extern "C" void exit (int);
|
||||
-#endif
|
||||
-
|
||||
void fnord() { int i=42;}
|
||||
int main ()
|
||||
{
|
||||
@@ -19225,7 +19201,7 @@ int main ()
|
||||
/* dlclose (self); */
|
||||
}
|
||||
|
||||
- exit (status);
|
||||
+ return status;
|
||||
}
|
||||
EOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||
@@ -27450,8 +27426,8 @@ main ()
|
||||
for (i = 0; i < 256; i++)
|
||||
if (XOR (islower (i), ISLOWER (i))
|
||||
|| toupper (i) != TOUPPER (i))
|
||||
- exit(2);
|
||||
- exit (0);
|
||||
+ return 2;
|
||||
+ return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest$ac_exeext
|
@ -1,26 +1,31 @@
|
||||
Name: OpenSP
|
||||
Name: opensp
|
||||
Version: 1.5.2
|
||||
Release: 4mamba
|
||||
Release: 7mamba
|
||||
Summary: A suite of SGML processing tools
|
||||
Group: Applications/Publishing
|
||||
Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://openjade.sourceforge.net/
|
||||
Source: http://downloads.sourceforge.net/sourceforge/openjade/%{name}-%{version}.tar.gz
|
||||
URL: https://openjade.sourceforge.net/
|
||||
Source: http://downloads.sourceforge.net/sourceforge/openjade/OpenSP-%{version}.tar.gz
|
||||
Patch0: OpenSP-1.5.1-LITLEN-1.patch
|
||||
Patch1: OpenSP-1.5.1-gcc34-1.patch
|
||||
Patch2: OpenSP-1.5.1-gcc41.patch
|
||||
Patch1: OpenSP-1.5.2-sigsegv.patch
|
||||
Patch2: OpenSP-1.5.2-manpage.patch
|
||||
Patch3: OpenSP-1.5.2-multilib.patch
|
||||
Patch4: OpenSP-1.5.2-nodeids.patch
|
||||
Patch5: opensp-1.5.2-configure-c99.patch
|
||||
License: GPL
|
||||
Requires: libosp = %{version}-%{release}
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libnsl-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: sgml-common
|
||||
BuildRequires: xmlto
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: libosp = %{version}-%{release}
|
||||
Provides: OpenSP
|
||||
Obsoletes: OpenSP < 1.5.2-7mamba
|
||||
|
||||
%description
|
||||
A suite of SGML processing tools.
|
||||
@ -29,7 +34,7 @@ A suite of SGML processing tools.
|
||||
Summary: Libraries for OpenSP
|
||||
Group: System/Libraries
|
||||
Provides: libOpenSP
|
||||
Obsoletes: libOpenSP
|
||||
Obsoletes: libOpenSP < 1.5.2-5mamba
|
||||
|
||||
%description -n libosp
|
||||
OpenSP is a suite of SGML processing tools.
|
||||
@ -40,7 +45,7 @@ Summary: Devel package for OpenSP
|
||||
Group: Development/Libraries
|
||||
Requires: libosp = %{version}-%{release}
|
||||
Provides: libOpenSP-devel
|
||||
Obsoletes: libOpenSP-devel
|
||||
Obsoletes: libOpenSP-devel < 1.5.2-5mamba
|
||||
|
||||
%description -n libosp-devel
|
||||
OpenSP is a suite of SGML processing tools.
|
||||
@ -50,36 +55,39 @@ This is the devel package.
|
||||
|
||||
%prep
|
||||
%setup -q -n OpenSP-%{version}
|
||||
%patch0 -p1
|
||||
%patch 0 -p1
|
||||
sed -i "s,| arm-\* |,| aarch64-\* | arm-\* |," config.sub
|
||||
#%patch1 -p1
|
||||
#%patch2 -p1
|
||||
%patch 1 -p1 -b .sigsegv
|
||||
%patch 2 -p1 -b .manpage
|
||||
%patch 3 -p1 -b .multilib
|
||||
%patch 4 -p1 -b .nodeids
|
||||
%patch 5 -p1 -b .configure-c99
|
||||
|
||||
%build
|
||||
%configure \
|
||||
--enable-http \
|
||||
--enable-xml-messages \
|
||||
--enable-default-catalog=/etc/sgml/catalog \
|
||||
--enable-default-search-path=%{_datadir}/sgml
|
||||
--enable-default-search-path=%{_datadir}/sgml:%{_datadir}/xml
|
||||
|
||||
%make pkgdatadir=%{_datadir}/sgml/OpenSP-%{version}
|
||||
%make
|
||||
|
||||
%install
|
||||
test x%{buildroot} != x/ && rm -rf %{buildroot}
|
||||
%makeinstall pkgdatadir=%{_datadir}/sgml/OpenSP-%{version}
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
%makeinstall
|
||||
|
||||
ln -s onsgmls %{buildroot}%{_bindir}/nsgmls
|
||||
ln -s osgmlnorm %{buildroot}%{_bindir}/sgmlnorm
|
||||
ln -s ospam %{buildroot}%{_bindir}/spam
|
||||
ln -s ospcat %{buildroot}%{_bindir}/spcat
|
||||
ln -s ospent %{buildroot}%{_bindir}/spent
|
||||
#ln -s osx %{buildroot}%{_bindir}/sx
|
||||
ln -s osx %{buildroot}%{_bindir}/sgml2xml
|
||||
ln -s libosp.so %{buildroot}%{_libdir}/libsp.so
|
||||
|
||||
%find_lang sp5
|
||||
|
||||
%clean
|
||||
test x%{buildroot} != x/ && rm -rf %{buildroot}
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
@ -95,11 +103,10 @@ test x%{buildroot} != x/ && rm -rf %{buildroot}
|
||||
%{_bindir}/spam
|
||||
%{_bindir}/spcat
|
||||
%{_bindir}/spent
|
||||
#%{_bindir}/sx
|
||||
%dir %{_datadir}/doc/OpenSP
|
||||
%{_datadir}/doc/OpenSP/*
|
||||
%dir %{_datadir}/sgml/OpenSP-%{version}
|
||||
%{_datadir}/sgml/OpenSP-%{version}/*
|
||||
%dir %{_datadir}/OpenSP
|
||||
%{_datadir}/OpenSP/*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%files -n libosp -f sp5.lang
|
||||
@ -112,11 +119,20 @@ test x%{buildroot} != x/ && rm -rf %{buildroot}
|
||||
%{_includedir}/OpenSP/*.h
|
||||
%{_includedir}/OpenSP/*.cxx
|
||||
%{_libdir}/libosp.a
|
||||
%{_libdir}/libosp.la
|
||||
%{_libdir}/libosp.so
|
||||
%{_libdir}/libsp.so
|
||||
|
||||
%changelog
|
||||
* Sun Sep 29 2024 Automatic Build System <autodist@openmamba.org> 1.5.2-7mamba
|
||||
- rebuilt without .la files
|
||||
- source renamed from OpenSP to opensp
|
||||
|
||||
* Sun Oct 24 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.2-6mamba
|
||||
- added sigsegv and the other patches from Fedora
|
||||
|
||||
* Tue Jun 01 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.2-5mamba
|
||||
- rebuilt with %{_datadir}/xml added to --enable-default-search-path and --enable-xml-messages; remove pkgdatadir in make
|
||||
|
||||
* Fri Nov 27 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.2-4mamba
|
||||
- build require sgml-common, added debug package
|
||||
|
Reference in New Issue
Block a user