cint: Proper fix for gcc3strm (GCC >=3.3)

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Sep 27 21:36:17 2016 +0200
Changeset:	2aafefdc02c16ea8d268c54d2a037e5248d8bdf0

Modified Files:
	cint/distinfo
	cint/patches/patch-src_gcc3strm.cxx

Log Message:
cint: Proper fix for gcc3strm (GCC >=3.3)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2aafefdc02c16ea8d268c54d2a037e5248d8bdf0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cint/distinfo                       |  2 +-
 cint/patches/patch-src_gcc3strm.cxx | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diffs:
diff --git a/cint/distinfo b/cint/distinfo
index a6dda82..07ba692 100644
--- a/cint/distinfo
+++ b/cint/distinfo
@@ -8,7 +8,7 @@ SHA1 (patch-Makefile) = 2bbed612d93d5a86a0e331d40d8be029d50e93a0
 SHA1 (patch-configure) = d6a523c22f1a4ee5a96c06fbd87f8cefed30cfdc
 SHA1 (patch-src_Method.cxx) = ee84d79c15f6951c07527e8c000c0d8eb60fdc71
 SHA1 (patch-src_bc__reader.h) = f768471d096a7e9401f7322f960119dd0f92769b
-SHA1 (patch-src_gcc3strm.cxx) = 0a40e104b236bc0548c5d8c536c94de0f0d347b6
+SHA1 (patch-src_gcc3strm.cxx) = d0003a4fbfbe85080eb1770376c2bcaec562fdb8
 SHA1 (patch-src_v6__macro.cxx) = 932f3177a6f6704aeca95d511a2730b30f3d1293
 SHA1 (patch-src_v6__newlink.cxx) = c481f18f470246424944fad6ead167c7e8c00bef
 SHA1 (patch-src_v6__parse.cxx) = c2e3f9fd599d607ea538c0fb8fe12eccf96fb936
diff --git a/cint/patches/patch-src_gcc3strm.cxx b/cint/patches/patch-src_gcc3strm.cxx
index 6b27b2c..e04938d 100644
--- a/cint/patches/patch-src_gcc3strm.cxx
+++ b/cint/patches/patch-src_gcc3strm.cxx
@@ -1,26 +1,22 @@
 $NetBSD$
 
+Fix build with recent (>3.3) GCC.
+
 --- src/gcc3strm.cxx.orig	2006-09-28 09:01:54.000000000 +0000
 +++ src/gcc3strm.cxx
-@@ -308,13 +308,21 @@ static int G__G__stream_7_6_0(G__value* 
+@@ -308,13 +308,13 @@ static int G__G__stream_7_6_0(G__value* 
  
  static int G__G__stream_7_7_0(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
  {
-+#if defined(__NetBSD__)
-+//      G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator==(*(fpos<mbstate_t>*) libp->para[0].ref));
-+#else
-       G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator==(*(fpos<mbstate_t>*) libp->para[0].ref));
-+#endif
+-      G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator==(*(fpos<mbstate_t>*) libp->para[0].ref));
++   G__letint(result7, 103, (long) (*(fpos<mbstate_t>*) G__getstructoffset())==(*(fpos<mbstate_t>*) libp->para[0].ref));
     return(1 || funcname || hash || result7 || libp) ;
  }
  
  static int G__G__stream_7_8_0(G__value* result7, G__CONST char* funcname, struct G__param* libp, int hash)
  {
-+#if defined(__NetBSD__)
-+//      G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator!=(*(fpos<mbstate_t>*) libp->para[0].ref));
-+#else
-       G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator!=(*(fpos<mbstate_t>*) libp->para[0].ref));
-+#endif
+-      G__letint(result7, 103, (long) ((fpos<mbstate_t>*) G__getstructoffset())->operator!=(*(fpos<mbstate_t>*) libp->para[0].ref));
++   G__letint(result7, 103, (long) (*(fpos<mbstate_t>*) G__getstructoffset())!=(*(fpos<mbstate_t>*) libp->para[0].ref));
     return(1 || funcname || hash || result7 || libp) ;
  }