Attachment 189895 Details for Bug 225307 – clang 6 patch

[patch] clang 6 patch

opensp.diff (text/plain), 13.34 KB, created by Guido Falsi on 2018-01-18 22:26:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2018-01-18 22:26:51 UTC

Size: 13.34 KB

patch

obsolete

>Index: textproc/opensp/Makefile
>===================================================================
>--- textproc/opensp/Makefile	(revision 459371)
>+++ textproc/opensp/Makefile	(working copy)
>@@ -15,14 +15,12 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
>-USES=		gmake iconv libtool perl5
>+USES=		gmake iconv libtool localbase perl5
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
> 		--datadir=${PREFIX}/share/sgml/openjade \
> 		--disable-doc-build
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-CFLAGS+=	-I${LOCALBASE}/include
> 
> OPTIONS_DEFINE=	DOCS NLS
> OPTIONS_SUB=	yes
>Index: textproc/opensp/files/patch-configure
>===================================================================
>--- textproc/opensp/files/patch-configure	(revision 459371)
>+++ textproc/opensp/files/patch-configure	(working copy)
>@@ -1,6 +1,269 @@
> --- configure.orig	2005-12-23 14:15:56 UTC
> +++ configure
>-@@ -26441,12 +26441,12 @@ cat >>conftest.$ac_ext <<_ACEOF
>+@@ -2885,149 +2885,6 @@ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
>+     CC="$CC $ac_cv_prog_cc_stdc" ;;
>+ esac
>+ 
>+-# Some people use a C++ compiler to compile C.  Since we use `exit',
>+-# in C++ we need to declare it.  In case someone uses the same compiler
>+-# for both compiling C and C++ we need to have the C++ compiler decide
>+-# the declaration of exit, since it's the most demanding environment.
>+-cat >conftest.$ac_ext <<_ACEOF
>+-#ifndef __cplusplus
>+-  choke me
>+-#endif
>+-_ACEOF
>+-rm -f conftest.$ac_objext
>+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+-  (eval $ac_compile) 2>conftest.er1
>+-  ac_status=$?
>+-  grep -v '^ *+' conftest.er1 >conftest.err
>+-  rm -f conftest.er1
>+-  cat conftest.err >&5
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); } &&
>+-	 { ac_try='test -z "$ac_c_werror_flag"
>+-			 || test ! -s conftest.err'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; } &&
>+-	 { ac_try='test -s conftest.$ac_objext'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; }; then
>+-  for ac_declaration in \
>+-   '' \
>+-   '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 ();' \
>+-   'extern "C" void exit (int);' \
>+-   'void exit (int);'
>+-do
>+-  cat >conftest.$ac_ext <<_ACEOF
>+-/* confdefs.h.  */
>+-_ACEOF
>+-cat confdefs.h >>conftest.$ac_ext
>+-cat >>conftest.$ac_ext <<_ACEOF
>+-/* end confdefs.h.  */
>+-$ac_declaration
>+-#include <stdlib.h>
>+-int
>+-main ()
>+-{
>+-exit (42);
>+-  ;
>+-  return 0;
>+-}
>+-_ACEOF
>+-rm -f conftest.$ac_objext
>+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+-  (eval $ac_compile) 2>conftest.er1
>+-  ac_status=$?
>+-  grep -v '^ *+' conftest.er1 >conftest.err
>+-  rm -f conftest.er1
>+-  cat conftest.err >&5
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); } &&
>+-	 { ac_try='test -z "$ac_c_werror_flag"
>+-			 || test ! -s conftest.err'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; } &&
>+-	 { ac_try='test -s conftest.$ac_objext'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; }; then
>+-  :
>+-else
>+-  echo "$as_me: failed program was:" >&5
>+-sed 's/^/| /' conftest.$ac_ext >&5
>+-
>+-continue
>+-fi
>+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+-  cat >conftest.$ac_ext <<_ACEOF
>+-/* confdefs.h.  */
>+-_ACEOF
>+-cat confdefs.h >>conftest.$ac_ext
>+-cat >>conftest.$ac_ext <<_ACEOF
>+-/* end confdefs.h.  */
>+-$ac_declaration
>+-int
>+-main ()
>+-{
>+-exit (42);
>+-  ;
>+-  return 0;
>+-}
>+-_ACEOF
>+-rm -f conftest.$ac_objext
>+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+-  (eval $ac_compile) 2>conftest.er1
>+-  ac_status=$?
>+-  grep -v '^ *+' conftest.er1 >conftest.err
>+-  rm -f conftest.er1
>+-  cat conftest.err >&5
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); } &&
>+-	 { ac_try='test -z "$ac_c_werror_flag"
>+-			 || test ! -s conftest.err'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; } &&
>+-	 { ac_try='test -s conftest.$ac_objext'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; }; then
>+-  break
>+-else
>+-  echo "$as_me: failed program was:" >&5
>+-sed 's/^/| /' conftest.$ac_ext >&5
>+-
>+-fi
>+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+-done
>+-rm -f conftest*
>+-if test -n "$ac_declaration"; then
>+-  echo '#ifdef __cplusplus' >>confdefs.h
>+-  echo $ac_declaration      >>confdefs.h
>+-  echo '#endif'             >>confdefs.h
>+-fi
>+-
>+-else
>+-  echo "$as_me: failed program was:" >&5
>+-sed 's/^/| /' conftest.$ac_ext >&5
>+-
>+-fi
>+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+ ac_ext=c
>+ ac_cpp='$CPP $CPPFLAGS'
>+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>+@@ -3685,112 +3542,7 @@ else
>+     CXXFLAGS=
>+   fi
>+ fi
>+-for ac_declaration in \
>+-   '' \
>+-   '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 ();' \
>+-   'extern "C" void exit (int);' \
>+-   'void exit (int);'
>+-do
>+-  cat >conftest.$ac_ext <<_ACEOF
>+-/* confdefs.h.  */
>+-_ACEOF
>+-cat confdefs.h >>conftest.$ac_ext
>+-cat >>conftest.$ac_ext <<_ACEOF
>+-/* end confdefs.h.  */
>+-$ac_declaration
>+-#include <stdlib.h>
>+-int
>+-main ()
>+-{
>+-exit (42);
>+-  ;
>+-  return 0;
>+-}
>+-_ACEOF
>+-rm -f conftest.$ac_objext
>+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+-  (eval $ac_compile) 2>conftest.er1
>+-  ac_status=$?
>+-  grep -v '^ *+' conftest.er1 >conftest.err
>+-  rm -f conftest.er1
>+-  cat conftest.err >&5
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); } &&
>+-	 { ac_try='test -z "$ac_cxx_werror_flag"
>+-			 || test ! -s conftest.err'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; } &&
>+-	 { ac_try='test -s conftest.$ac_objext'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; }; then
>+-  :
>+-else
>+-  echo "$as_me: failed program was:" >&5
>+-sed 's/^/| /' conftest.$ac_ext >&5
>+ 
>+-continue
>+-fi
>+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+-  cat >conftest.$ac_ext <<_ACEOF
>+-/* confdefs.h.  */
>+-_ACEOF
>+-cat confdefs.h >>conftest.$ac_ext
>+-cat >>conftest.$ac_ext <<_ACEOF
>+-/* end confdefs.h.  */
>+-$ac_declaration
>+-int
>+-main ()
>+-{
>+-exit (42);
>+-  ;
>+-  return 0;
>+-}
>+-_ACEOF
>+-rm -f conftest.$ac_objext
>+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+-  (eval $ac_compile) 2>conftest.er1
>+-  ac_status=$?
>+-  grep -v '^ *+' conftest.er1 >conftest.err
>+-  rm -f conftest.er1
>+-  cat conftest.err >&5
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); } &&
>+-	 { ac_try='test -z "$ac_cxx_werror_flag"
>+-			 || test ! -s conftest.err'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; } &&
>+-	 { ac_try='test -s conftest.$ac_objext'
>+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>+-  (eval $ac_try) 2>&5
>+-  ac_status=$?
>+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+-  (exit $ac_status); }; }; then
>+-  break
>+-else
>+-  echo "$as_me: failed program was:" >&5
>+-sed 's/^/| /' conftest.$ac_ext >&5
>+-
>+-fi
>+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
>+-done
>+-rm -f conftest*
>+-if test -n "$ac_declaration"; then
>+-  echo '#ifdef __cplusplus' >>confdefs.h
>+-  echo $ac_declaration      >>confdefs.h
>+-  echo '#endif'             >>confdefs.h
>+-fi
>+-
>+ ac_ext=c
>+ ac_cpp='$CPP $CPPFLAGS'
>+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>+@@ -26441,12 +26193,12 @@ cat >>conftest.$ac_ext <<_ACEOF
>  /* end confdefs.h.  */
>  #include <libintl.h>
>  extern int _nl_msg_cat_cntr;
>Index: textproc/opensp/files/patch-include_IList.h
>===================================================================
>--- textproc/opensp/files/patch-include_IList.h	(nonexistent)
>+++ textproc/opensp/files/patch-include_IList.h	(working copy)
>@@ -0,0 +1,13 @@
>+--- include/IList.h.orig	2005-07-21 14:04:38 UTC
>++++ include/IList.h
>+@@ -26,8 +26,8 @@ class IList : private IListBase { (public)
>+   void swap(IList<T> &list) { IListBase::swap(list); }
>+   T *head() const { return (T *)IListBase::head(); }
>+   T *get() { return (T *)IListBase::get(); }
>+-  IListBase::clear;
>+-  IListBase::empty;
>++  using IListBase::clear;
>++  using IListBase::empty;
>+ friend class IListIter<T>;
>+ private:
>+   IList(const IList<T> &);	// undefined
>
>Property changes on: textproc/opensp/files/patch-include_IList.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: textproc/opensp/files/patch-include_IListIter.h
>===================================================================
>--- textproc/opensp/files/patch-include_IListIter.h	(nonexistent)
>+++ textproc/opensp/files/patch-include_IListIter.h	(working copy)
>@@ -0,0 +1,13 @@
>+--- include/IListIter.h.orig	2005-07-21 14:04:38 UTC
>++++ include/IListIter.h
>+@@ -17,8 +17,8 @@ class IListIter : private IListIterBase { (public)
>+   IListIter(const IList<T> &list) : IListIterBase(list) { }
>+   T *cur() const { return (T *)IListIterBase::cur(); }
>+   
>+-  IListIterBase::next;
>+-  IListIterBase::done;
>++  using IListIterBase::next;
>++  using IListIterBase::done;
>+ };
>+ 
>+ #ifdef SP_NAMESPACE
>
>Property changes on: textproc/opensp/files/patch-include_IListIter.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: textproc/opensp/files/patch-include_Ptr.h
>===================================================================
>--- textproc/opensp/files/patch-include_Ptr.h	(nonexistent)
>+++ textproc/opensp/files/patch-include_Ptr.h	(working copy)
>@@ -0,0 +1,13 @@
>+--- include/Ptr.h.orig	2005-07-21 14:04:39 UTC
>++++ include/Ptr.h
>+@@ -69,8 +69,8 @@ class ConstPtr : private Ptr<T> { (public)
>+   const T *operator->() const { return Ptr<T>::pointer(); }
>+   const T &operator*() const { return *Ptr<T>::pointer(); }
>+   void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
>+-  Ptr<T>::isNull;
>+-  Ptr<T>::clear;
>++  using Ptr<T>::isNull;
>++  using Ptr<T>::clear;
>+   Boolean operator==(const Ptr<T> &p) const { return Ptr<T>::operator==(p); }
>+   Boolean operator!=(const Ptr<T> &p) const { return Ptr<T>::operator!=(p); }
>+   Boolean operator==(const ConstPtr<T> &p) const {
>
>Property changes on: textproc/opensp/files/patch-include_Ptr.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: textproc/opensp/files/patch-lib_Parser.h
>===================================================================
>--- textproc/opensp/files/patch-lib_Parser.h	(nonexistent)
>+++ textproc/opensp/files/patch-lib_Parser.h	(working copy)
>@@ -0,0 +1,29 @@
>+--- lib/Parser.h.orig	2005-07-21 14:05:17 UTC
>++++ lib/Parser.h
>+@@ -62,16 +62,16 @@ class Parser : private ParserState {  (public)
>+   Parser(const SgmlParser::Params &);
>+   Event *nextEvent();
>+   void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr);
>+-  ParserState::sdPointer;
>+-  ParserState::instanceSyntaxPointer;
>+-  ParserState::prologSyntaxPointer;
>+-  ParserState::activateLinkType;
>+-  ParserState::allLinkTypesActivated;
>+-  ParserState::entityManager;
>+-  ParserState::entityCatalog;
>+-  ParserState::baseDtd;
>+-  ParserState::options;
>+-  ParserState::instantiateDtd;
>++  using ParserState::sdPointer;
>++  using ParserState::instanceSyntaxPointer;
>++  using ParserState::prologSyntaxPointer;
>++  using ParserState::activateLinkType;
>++  using ParserState::allLinkTypesActivated;
>++  using ParserState::entityManager;
>++  using ParserState::entityCatalog;
>++  using ParserState::baseDtd;
>++  using ParserState::options;
>++  using ParserState::instantiateDtd;
>+   friend class PiAttspecParser;
>+ private:
>+   Parser(const Parser &);	// undefined
>
>Property changes on: textproc/opensp/files/patch-lib_Parser.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

madpilot: maintainer-approval? (kuriyama)

Actions: View | Diff

Attachments on bug 225307: 189895