CVS commit: pkgsrc/devel/monotone

["Gavan Fantom" <gavan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gavan
Date:           Thu Sep 13 21:14:45 UTC 2018

Modified Files:
        pkgsrc/devel/monotone: distinfo
Added Files:
        pkgsrc/devel/monotone/patches: patch-src_pcrewrap.cc
            patch-src_pcrewrap.hh

Log Message:
monotone: fix build failure with pcre-8.42

Patch from:

https://bugzilla.redhat.com/attachment.cgi?id=1432584&action=diff


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/monotone/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/monotone/patches/patch-src_pcrewrap.cc \
    pkgsrc/devel/monotone/patches/patch-src_pcrewrap.hh

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

Modified files:

Index: pkgsrc/devel/monotone/distinfo
diff -u pkgsrc/devel/monotone/distinfo:1.52 pkgsrc/devel/monotone/distinfo:1.53
--- pkgsrc/devel/monotone/distinfo:1.52 Tue Nov  3 03:27:50 2015
+++ pkgsrc/devel/monotone/distinfo      Thu Sep 13 21:14:45 2018
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.52 2015/11/03 03:27:50 agc Exp $
+$NetBSD: distinfo,v 1.53 2018/09/13 21:14:45 gavan Exp $
 
 SHA1 (monotone-1.1.tar.bz2) = 2b97559b252decaee3a374b81bf714cf33441ba3
 RMD160 (monotone-1.1.tar.bz2) = c5e0f45028b806eb166b4aaecababa8e8e81b686
 SHA512 (monotone-1.1.tar.bz2) = 0599e7fc004552f6a15095b62627eb60d80bfd32904608b6fef15f6c6f83db8059375833cb8ddc54fed569223a95f8ea0ba3c7008ad2969a5776faa27e5e5f3b
 Size (monotone-1.1.tar.bz2) = 3428699 bytes
 SHA1 (patch-src_hash__map.hh) = 3f8e83b651452aa87eb5409d6e852a49e3747db4
+SHA1 (patch-src_pcrewrap.cc) = c40693610033a899b3d14867e3228d86d2a732d4
+SHA1 (patch-src_pcrewrap.hh) = 60fae878445e2eedece85660741062b80090b043

Added files:

Index: pkgsrc/devel/monotone/patches/patch-src_pcrewrap.cc
diff -u /dev/null pkgsrc/devel/monotone/patches/patch-src_pcrewrap.cc:1.1
--- /dev/null   Thu Sep 13 21:14:45 2018
+++ pkgsrc/devel/monotone/patches/patch-src_pcrewrap.cc Thu Sep 13 21:14:45 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_pcrewrap.cc,v 1.1 2018/09/13 21:14:45 gavan Exp $
+
+--- src/pcrewrap.cc.orig       2014-05-04 09:15:17.000000000 +0000
++++ src/pcrewrap.cc
+@@ -74,7 +74,7 @@ get_capturecount(void const * bd)
+ namespace pcre
+ {
+   typedef map<char const *,
+-              pair<struct real_pcre const *, struct pcre_extra const *> >
++              pair<struct real_pcre8_or_16 const *, struct pcre_extra const *> >
+               regex_cache;
+ 
+   class regex_cache_manager
+@@ -86,7 +86,7 @@ public:
+       }
+ 
+     void store(char const * pattern,
+-               pair<struct real_pcre const *, struct pcre_extra const *>
++               pair<struct real_pcre8_or_16 const *, struct pcre_extra const *>
+                data)
+       {
+         cache[pattern] = data;
Index: pkgsrc/devel/monotone/patches/patch-src_pcrewrap.hh
diff -u /dev/null pkgsrc/devel/monotone/patches/patch-src_pcrewrap.hh:1.1
--- /dev/null   Thu Sep 13 21:14:45 2018
+++ pkgsrc/devel/monotone/patches/patch-src_pcrewrap.hh Thu Sep 13 21:14:45 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_pcrewrap.hh,v 1.1 2018/09/13 21:14:45 gavan Exp $
+
+--- src/pcrewrap.hh.orig       2014-05-04 09:15:17.000000000 +0000
++++ src/pcrewrap.hh
+@@ -18,7 +18,7 @@
+ // definitions and so we don't actually expose it here. Unfortunately, this
+ // means we have to hope this pair of forward declarations will not change...
+ 
+-struct real_pcre;
++struct real_pcre8_or_16;
+ struct pcre_extra;
+ 
+ namespace pcre
+@@ -61,7 +61,7 @@ namespace pcre
+     regex & operator=(regex const &);
+ 
+     // data
+-    struct real_pcre const * basedat;
++    struct real_pcre8_or_16 const * basedat;
+     struct pcre_extra const * extradat;
+ 
+     // used by constructors