Attachment 187505 Details for Bug 223268 – patch file

[patch] patch file

textproc_jade.patch (text/plain), 11.05 KB, created by Yasuhiro Kimura on 2017-10-27 06:37:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2017-10-27 06:37:38 UTC

Size: 11.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 452860)
>+++ Makefile	(working copy)
>@@ -16,6 +16,11 @@
> MAINTAINER=	kuriyama@FreeBSD.org
> COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
> 
>+LICENSE=	MITlegacy
>+LICENSE_NAME=	Old version of MIT license
>+LICENSE_FILE=	${WRKSRC}/COPYING
>+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>+
> RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
> 
> CONFLICTS=	sp-1.*
>Index: files/patch-CharsetRegistry.cxx
>===================================================================
>--- files/patch-CharsetRegistry.cxx	(revision 452860)
>+++ files/patch-CharsetRegistry.cxx	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- lib/CharsetRegistry.cxx.orig	1998-10-07 05:15:52 UTC
>++++ lib/CharsetRegistry.cxx
>+@@ -164,6 +164,9 @@ static const unsigned short iso8859_8[] 
>  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 @@
>+@@ -203,6 +206,7 @@ static const struct {
>    { CharsetRegistry::ISO8859_7, iso8859_7 },
>    { CharsetRegistry::ISO8859_8, iso8859_8 },
>    { CharsetRegistry::ISO8859_9, iso8859_9 },
>Index: files/patch-CharsetRegistry.h
>===================================================================
>--- files/patch-CharsetRegistry.h	(revision 452860)
>+++ files/patch-CharsetRegistry.h	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- include/CharsetRegistry.h.orig	1998-10-07 05:15:50 UTC
>++++ include/CharsetRegistry.h
>+@@ -45,6 +45,7 @@ public:
>      GB2312 = 58,
>      ISO10646_UCS2 = 176,
>      ISO10646_UCS4 = 177,
>Index: files/patch-CodingSystemKit.cxx
>===================================================================
>--- files/patch-CodingSystemKit.cxx	(revision 452860)
>+++ files/patch-CodingSystemKit.cxx	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- lib/CodingSystemKit.cxx.orig	1998-10-01 05:13:22 UTC
>++++ lib/CodingSystemKit.cxx
>+@@ -74,7 +74,8 @@ public:
>      iso8859_6,
>      iso8859_7,
>      iso8859_8,
>@@ -10,7 +10,7 @@
>    };
>    struct Entry {
>      const char *name;
>-@@ -111,6 +112,7 @@
>+@@ -111,6 +112,7 @@ private:
>    TranslateCodingSystem iso8859_7CodingSystem_;
>    TranslateCodingSystem iso8859_8CodingSystem_;
>    TranslateCodingSystem iso8859_9CodingSystem_;
>@@ -18,7 +18,7 @@
>  #ifdef WIN32
>    Win32CodingSystem ansiCodingSystem_;
>    Win32CodingSystem oemCodingSystem_;
>-@@ -246,6 +248,15 @@
>+@@ -246,6 +248,15 @@ static const TranslateCodingSystem::Desc
>    { CharsetRegistry::UNREGISTERED, 0x0 }
>  };
>  
>@@ -34,7 +34,7 @@
>  #endif /* SP_MULTI_BYTE */
>  
>  const CodingSystemKitImpl::Entry CodingSystemKitImpl::bctfTable_[] = {
>-@@ -292,6 +303,8 @@
>+@@ -292,6 +303,8 @@ const CodingSystemKitImpl::Entry CodingS
>    { "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 @@
>+@@ -324,6 +337,7 @@ CodingSystemKitImpl::CodingSystemKitImpl
>    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 @@
>+@@ -472,6 +486,8 @@ CodingSystemKitImpl::makeCodingSystem(Co
>      return &iso8859_8CodingSystem_;
>    case iso8859_9:
>      return &iso8859_9CodingSystem_;
>Index: files/patch-Makefile.in
>===================================================================
>--- files/patch-Makefile.in	(revision 452860)
>+++ files/patch-Makefile.in	(working copy)
>@@ -1,6 +1,10 @@
>---- 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 @@
>+--- Makefile.in.orig	2017-10-27 05:44:52 UTC
>++++ Makefile.in
>+@@ -14,6 +14,7 @@ prefix=@prefix@
>+ exec_prefix=@exec_prefix@
>+ srcdir=@srcdir@
>  bindir=@bindir@
> +libdir=@libdir@
>  
>+ # needed by libtool
>+ top_builddir=$(TOP)
>Index: files/patch-Ptr.cxx
>===================================================================
>--- files/patch-Ptr.cxx	(revision 452860)
>+++ files/patch-Ptr.cxx	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- include/Ptr.cxx.orig	1998-10-07 05:15:50 UTC
>++++ include/Ptr.cxx
>+@@ -19,7 +19,7 @@ template<class T>
>  Ptr<T>::~Ptr()
>  {
>    if (ptr_) {
>Index: files/patch-Ptr.h
>===================================================================
>--- files/patch-Ptr.h	(revision 452860)
>+++ files/patch-Ptr.h	(working copy)
>@@ -1,5 +1,5 @@
>---- include/Ptr.h.orig	Wed Oct  7 14:15:50 1998
>-+++ include/Ptr.h	Tue Jul 22 09:19:49 2003
>+--- include/Ptr.h.orig	1998-10-07 05:15:50 UTC
>++++ include/Ptr.h
> @@ -5,6 +5,7 @@
>  #define Ptr_INCLUDED 1
>  
>Index: files/patch-TeXFOTBuilder.cxx
>===================================================================
>--- files/patch-TeXFOTBuilder.cxx	(revision 452860)
>+++ files/patch-TeXFOTBuilder.cxx	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- jade/TeXFOTBuilder.cxx.orig	2017-10-27 05:44:52 UTC
>++++ jade/TeXFOTBuilder.cxx
>+@@ -83,6 +83,8 @@ public:
>        value.convertString(nic_.placement);
>        }
>      ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
>@@ -9,7 +9,7 @@
>    private:
>      PageFloatNIC nic_;
>      StringC name_;
>-@@ -96,6 +98,8 @@
>+@@ -96,6 +98,8 @@ public:
>        fotb.endPageFootnote();
>      }
>      ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
>Index: files/patch-TransformFOTBuilder.cxx
>===================================================================
>--- files/patch-TransformFOTBuilder.cxx	(revision 452860)
>+++ files/patch-TransformFOTBuilder.cxx	(working copy)
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- jade/TransformFOTBuilder.cxx.orig	1998-10-01 05:14:52 UTC
>++++ jade/TransformFOTBuilder.cxx
>+@@ -41,6 +41,7 @@ public:
>    };
>    class EntityRefFlowObj : public TransformExtensionFlowObj {
>    public:
>@@ -8,7 +8,7 @@
>      void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
>        fotb.entityRef(name_);
>      }
>-@@ -56,6 +57,7 @@
>+@@ -56,6 +57,7 @@ public:
>    };
>    class ProcessingInstructionFlowObj : public TransformExtensionFlowObj {
>    public:
>@@ -16,7 +16,7 @@
>      void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
>        fotb.processingInstruction(data_);
>      }
>-@@ -98,6 +100,8 @@
>+@@ -98,6 +100,8 @@ public:
>        }
>      }
>      ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
>@@ -25,7 +25,7 @@
>    private:
>      ElementNIC nic_;
>    };
>-@@ -133,6 +137,8 @@
>+@@ -133,6 +137,8 @@ public:
>        }
>      }
>      ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
>@@ -34,7 +34,7 @@
>    private:
>      ElementNIC nic_;
>    };
>-@@ -150,6 +156,8 @@
>+@@ -150,6 +156,8 @@ public:
>        value.convertString(systemId_);
>      }
>      ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
>@@ -43,7 +43,7 @@
>    private:
>      StringC systemId_;
>    };
>-@@ -174,6 +182,8 @@
>+@@ -174,6 +182,8 @@ public:
>        }
>      }
>      ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
>Index: files/patch-assert.cxx
>===================================================================
>--- files/patch-assert.cxx	(revision 452860)
>+++ files/patch-assert.cxx	(working copy)
>@@ -1,5 +1,5 @@
>---- lib/assert.cxx.orig	Wed Apr 25 12:42:54 2001
>-+++ lib/assert.cxx	Wed Apr 25 12:43:26 2001
>+--- lib/assert.cxx.orig	2017-10-27 05:44:53 UTC
>++++ lib/assert.cxx
> @@ -6,7 +6,7 @@
>  #include "macros.h"
>  
>Index: files/patch-config.h
>===================================================================
>--- files/patch-config.h	(revision 452860)
>+++ files/patch-config.h	(working copy)
>@@ -1,8 +1,8 @@
>---- 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 @@
>+--- include/config.h.orig	2017-10-27 05:44:53 UTC
>++++ include/config.h
>+@@ -30,6 +30,10 @@
>+ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
>  #define SP_ANSI_LIB
>- #define SP_NO_STD_NAMESPACE
>  #undef SP_NEW_H_MISSING
> +#if __GNUC__ > 2
> +#define SP_HAVE_TYPENAME
>@@ -9,5 +9,5 @@
> +#undef SP_NO_STD_NAMESPACE
> +#endif
>  #endif
>- 
>- #endif /* __GNUG__ */
>+ #if (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
>+ #define SP_NO_STD_NAMESPACE
>Index: files/patch-koi8-r.h
>===================================================================
>--- files/patch-koi8-r.h	(revision 452860)
>+++ files/patch-koi8-r.h	(working copy)
>@@ -1,5 +1,5 @@
>---- /dev/null	Sat Jul 31 17:25:08 2004
>-+++ include/koi8-r.h	Sat Jul 31 17:04:24 2004
>+--- include/koi8-r.h.orig	2017-10-27 05:44:59 UTC
>++++ include/koi8-r.h
> @@ -0,0 +1,15 @@
> +/* KOI8-R (GR only) */
> +96, 0x0020,
>Index: files/patch-koi8r.dcl
>===================================================================
>--- files/patch-koi8r.dcl	(revision 452860)
>+++ files/patch-koi8r.dcl	(working copy)
>@@ -1,5 +1,5 @@
>---- /dev/null	Sat Jul 31 17:25:08 2004
>-+++ pubtext/koi8r.dcl	Sat Jul 31 17:04:35 2004
>+--- pubtext/koi8r.dcl.orig	2017-10-27 05:44:59 UTC
>++++ pubtext/koi8r.dcl
> @@ -0,0 +1,236 @@
> +		     <!SGML "ISO 8879:1986 (ENR)"
> +
>Index: files/patch-lib__instmac.m4
>===================================================================
>--- files/patch-lib__instmac.m4	(revision 452860)
>+++ files/patch-lib__instmac.m4	(working copy)
>@@ -1,19 +1,11 @@
>-*** 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
>-  }
>+--- 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
>+ }

Actions: View | Diff

Attachments on bug 223268: 187505