1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

textproc/jade: back out r458645 to avoid churn

Reported by:	danfe
This commit is contained in:
Jan Beich 2018-01-10 15:27:33 +00:00
parent 2c0789eb84
commit c80e6a0631
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=458647
16 changed files with 74 additions and 70 deletions

View File

@ -1,6 +1,6 @@
--- lib/CharsetRegistry.cxx.orig 1998-10-07 05:15:52 UTC
+++ lib/CharsetRegistry.cxx
@@ -164,6 +164,9 @@ static const unsigned short iso8859_8[] = {
--- lib/CharsetRegistry.cxx.orig Sat Jul 31 17:03:07 2004
+++ lib/CharsetRegistry.cxx Sat Jul 31 17:05:46 2004
@@ -164,6 +164,9 @@
static const unsigned short iso8859_9[] = {
#include "iso8859-9.h"
};
@ -10,7 +10,7 @@
static const unsigned short iso646_jis_G0[] = {
#include "iso646-jis.h"
};
@@ -203,6 +206,7 @@ static const struct {
@@ -203,6 +206,7 @@
{ CharsetRegistry::ISO8859_7, iso8859_7 },
{ CharsetRegistry::ISO8859_8, iso8859_8 },
{ CharsetRegistry::ISO8859_9, iso8859_9 },

View File

@ -1,6 +1,6 @@
--- include/CharsetRegistry.h.orig 1998-10-07 05:15:50 UTC
+++ include/CharsetRegistry.h
@@ -45,6 +45,7 @@ class SP_API CharsetRegistry { (public)
--- include/CharsetRegistry.h.orig Sat Jul 31 17:02:57 2004
+++ include/CharsetRegistry.h Sat Jul 31 17:05:32 2004
@@ -45,6 +45,7 @@
GB2312 = 58,
ISO10646_UCS2 = 176,
ISO10646_UCS4 = 177,

View File

@ -1,6 +1,6 @@
--- lib/CodingSystemKit.cxx.orig 1998-10-01 05:13:22 UTC
+++ lib/CodingSystemKit.cxx
@@ -74,7 +74,8 @@ class CodingSystemKitImpl : public CodingSystemKit { (
--- lib/CodingSystemKit.cxx.orig Sat Jul 31 17:03:29 2004
+++ lib/CodingSystemKit.cxx Sat Jul 31 17:08:59 2004
@@ -74,7 +74,8 @@
iso8859_6,
iso8859_7,
iso8859_8,
@ -10,7 +10,7 @@
};
struct Entry {
const char *name;
@@ -111,6 +112,7 @@ class CodingSystemKitImpl : public CodingSystemKit { (
@@ -111,6 +112,7 @@
TranslateCodingSystem iso8859_7CodingSystem_;
TranslateCodingSystem iso8859_8CodingSystem_;
TranslateCodingSystem iso8859_9CodingSystem_;
@ -18,7 +18,7 @@
#ifdef WIN32
Win32CodingSystem ansiCodingSystem_;
Win32CodingSystem oemCodingSystem_;
@@ -246,6 +248,15 @@ static const TranslateCodingSystem::Desc iso8859_9Desc
@@ -246,6 +248,15 @@
{ CharsetRegistry::UNREGISTERED, 0x0 }
};
@ -34,7 +34,7 @@
#endif /* SP_MULTI_BYTE */
const CodingSystemKitImpl::Entry CodingSystemKitImpl::bctfTable_[] = {
@@ -292,6 +303,8 @@ const CodingSystemKitImpl::Entry CodingSystemKitImpl::
@@ -292,6 +303,8 @@
{ "ISO-8859-8", iso8859_8 },
{ "IS8859-9", iso8859_9 },
{ "ISO-8859-9", iso8859_9 },
@ -43,7 +43,7 @@
{ "EUC-JP", eucjp },
{ "EUC-CN", euccn },
{ "GB2312", euccn },
@@ -324,6 +337,7 @@ CodingSystemKitImpl::CodingSystemKitImpl(const Transla
@@ -324,6 +337,7 @@
iso8859_7CodingSystem_(&identityCodingSystem_, iso8859_7Desc, &systemCharset_, 0x100, unicodeReplaceChar),
iso8859_8CodingSystem_(&identityCodingSystem_, iso8859_8Desc, &systemCharset_, 0x100, unicodeReplaceChar),
iso8859_9CodingSystem_(&identityCodingSystem_, iso8859_9Desc, &systemCharset_, 0x100, unicodeReplaceChar),
@ -51,7 +51,7 @@
eucjpCodingSystem_(&eucBctf_, jis2Desc, &systemCharset_, 0x8000, unicodeReplaceChar),
euccnCodingSystem_(&eucBctf_, gbDesc, &systemCharset_, 0x8000, unicodeReplaceChar),
euckrCodingSystem_(&eucBctf_, kscDesc, &systemCharset_, 0x8000, unicodeReplaceChar),
@@ -472,6 +486,8 @@ CodingSystemKitImpl::makeCodingSystem(CodingSystemId i
@@ -472,6 +486,8 @@
return &iso8859_8CodingSystem_;
case iso8859_9:
return &iso8859_9CodingSystem_;

View File

@ -1,10 +1,6 @@
--- Makefile.in.orig 1998-10-13 02:11:06 UTC
+++ Makefile.in
@@ -14,6 +14,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
srcdir=@srcdir@
--- Makefile.in.orig 1998-10-12 21:11:06.000000000 -0500
+++ Makefile.in 2011-02-15 16:18:41.000000000 -0600
@@ -16,2 +16,3 @@
bindir=@bindir@
+libdir=@libdir@
# needed by libtool
top_builddir=$(TOP)

View File

@ -1,6 +1,6 @@
--- include/Ptr.cxx.orig 1998-10-07 05:15:50 UTC
+++ include/Ptr.cxx
@@ -19,7 +19,7 @@ template<class T>
--- include/Ptr.cxx.orig Tue Jul 22 09:20:15 2003
+++ include/Ptr.cxx Tue Jul 22 09:20:42 2003
@@ -19,7 +19,7 @@
Ptr<T>::~Ptr()
{
if (ptr_) {

View File

@ -1,5 +1,5 @@
--- include/Ptr.h.orig 1998-10-07 05:15:50 UTC
+++ include/Ptr.h
--- include/Ptr.h.orig Wed Oct 7 14:15:50 1998
+++ include/Ptr.h Tue Jul 22 09:19:49 2003
@@ -5,6 +5,7 @@
#define Ptr_INCLUDED 1

View File

@ -1,6 +1,6 @@
--- jade/TeXFOTBuilder.cxx.orig 1998-10-07 05:16:34 UTC
+++ jade/TeXFOTBuilder.cxx
@@ -83,6 +83,8 @@ class TeXFOTBuilder : public SerialFOTBuilder { (publi
--- jade/TeXFOTBuilder.cxx.orig 2011-09-24 14:17:02.000000000 +0000
+++ jade/TeXFOTBuilder.cxx 2011-09-24 14:19:42.000000000 +0000
@@ -83,6 +83,8 @@
value.convertString(nic_.placement);
}
ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
@ -9,7 +9,7 @@
private:
PageFloatNIC nic_;
StringC name_;
@@ -96,6 +98,8 @@ class TeXFOTBuilder : public SerialFOTBuilder { (publi
@@ -96,6 +98,8 @@
fotb.endPageFootnote();
}
ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }

View File

@ -1,6 +1,6 @@
--- jade/TransformFOTBuilder.cxx.orig 1998-10-01 05:14:52 UTC
+++ jade/TransformFOTBuilder.cxx
@@ -41,6 +41,7 @@ class TransformFOTBuilder : public SerialFOTBuilder {
--- jade/TransformFOTBuilder.cxx.orig 2011-09-24 14:20:28.000000000 +0000
+++ jade/TransformFOTBuilder.cxx 2011-09-24 14:22:32.000000000 +0000
@@ -41,6 +41,7 @@
};
class EntityRefFlowObj : public TransformExtensionFlowObj {
public:
@ -8,7 +8,7 @@
void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
fotb.entityRef(name_);
}
@@ -56,6 +57,7 @@ class TransformFOTBuilder : public SerialFOTBuilder {
@@ -56,6 +57,7 @@
};
class ProcessingInstructionFlowObj : public TransformExtensionFlowObj {
public:
@ -16,7 +16,7 @@
void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
fotb.processingInstruction(data_);
}
@@ -98,6 +100,8 @@ class TransformFOTBuilder : public SerialFOTBuilder {
@@ -98,6 +100,8 @@
}
}
ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
@ -25,7 +25,7 @@
private:
ElementNIC nic_;
};
@@ -133,6 +137,8 @@ class TransformFOTBuilder : public SerialFOTBuilder {
@@ -133,6 +137,8 @@
}
}
ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
@ -34,7 +34,7 @@
private:
ElementNIC nic_;
};
@@ -150,6 +156,8 @@ class TransformFOTBuilder : public SerialFOTBuilder {
@@ -150,6 +156,8 @@
value.convertString(systemId_);
}
ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
@ -43,7 +43,7 @@
private:
StringC systemId_;
};
@@ -174,6 +182,8 @@ class TransformFOTBuilder : public SerialFOTBuilder {
@@ -174,6 +182,8 @@
}
}
ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }

View File

@ -1,5 +1,5 @@
--- lib/assert.cxx.orig 1998-10-07 05:15:50 UTC
+++ lib/assert.cxx
--- lib/assert.cxx.orig Wed Apr 25 12:42:54 2001
+++ lib/assert.cxx Wed Apr 25 12:43:26 2001
@@ -6,7 +6,7 @@
#include "macros.h"

View File

@ -0,0 +1,13 @@
--- include/config.h.orig Fri Jun 14 12:58:51 2002
+++ include/config.h Fri Jun 14 13:01:00 2002
@@ -31,6 +31,10 @@
#define SP_ANSI_LIB
#define SP_NO_STD_NAMESPACE
#undef SP_NEW_H_MISSING
+#if __GNUC__ > 2
+#define SP_HAVE_TYPENAME
+#undef SP_NO_STD_NAMESPACE
+#endif
#endif
#endif /* __GNUG__ */

View File

@ -1,13 +0,0 @@
--- include/config.h.orig 1998-10-09 05:08:54 UTC
+++ include/config.h
@@ -30,6 +30,10 @@
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
#define SP_ANSI_LIB
#undef SP_NEW_H_MISSING
+#if __GNUC__ > 2
+#define SP_HAVE_TYPENAME
+#undef SP_NO_STD_NAMESPACE
+#endif
#endif
#if (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
#define SP_NO_STD_NAMESPACE

View File

@ -1,5 +1,5 @@
--- /dev/null 1970-01-01 00:00:00 UTC
+++ include/koi8-r.h
--- /dev/null Sat Jul 31 17:25:08 2004
+++ include/koi8-r.h Sat Jul 31 17:04:24 2004
@@ -0,0 +1,15 @@
+/* KOI8-R (GR only) */
+96, 0x0020,

View File

@ -1,5 +1,5 @@
--- /dev/null 1970-01-01 00:00:00 UTC
+++ pubtext/koi8r.dcl
--- /dev/null Sat Jul 31 17:25:08 2004
+++ pubtext/koi8r.dcl Sat Jul 31 17:04:35 2004
@@ -0,0 +1,236 @@
+ <!SGML "ISO 8879:1986 (ENR)"
+

View File

@ -1,4 +1,4 @@
--- lib/Parser.h.orig 1998-10-01 05:13:28 UTC
--- lib/Parser.h~ 1998-10-01 05:13:28 UTC
+++ lib/Parser.h
@@ -62,15 +62,15 @@ class Parser : private ParserState { (public)
Parser(const SgmlParser::Params &);

View File

@ -0,0 +1,19 @@
*** lib/instmac.m4.orig Sun Jul 6 20:20:04 1997
--- lib/instmac.m4 Sun Jul 6 20:20:54 1997
***************
*** 75,81 ****
__undefine(`undefine')__dnl
__undefine(`undivert')__dnl
__undefine(`unix')__dnl
! __dnl __changequote(,)__dnl disable quoting
#ifdef SP_NAMESPACE
}
--- 75,81 ----
__undefine(`undefine')__dnl
__undefine(`undivert')__dnl
__undefine(`unix')__dnl
! __dnl __changequote(,)__dnl
#ifdef SP_NAMESPACE
}

View File

@ -1,11 +0,0 @@
--- lib/instmac.m4.orig 1998-10-01 05:13:24 UTC
+++ lib/instmac.m4
@@ -75,7 +75,7 @@ __undefine(`translit')__dnl
__undefine(`undefine')__dnl
__undefine(`undivert')__dnl
__undefine(`unix')__dnl
-__dnl __changequote(,)__dnl disable quoting
+__dnl __changequote(,)__dnl
#ifdef SP_NAMESPACE
}