pyrox.dev
monotone: fix build against pcre 8.42
+1
-1
pkgs/applications/version-management/monotone/default.nix
+1
-1
pkgs/applications/version-management/monotone/default.nix
+66
pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
+66
pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
···
1
+
From 70f209ad582121750d54e3692b1e62c7f36af6f9 Mon Sep 17 00:00:00 2001
2
+
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
3
+
Date: Mon, 7 May 2018 14:09:06 +0200
4
+
Subject: [PATCH] Adapt to changes in pcre-8.42
5
+
MIME-Version: 1.0
6
+
Content-Type: text/plain; charset=UTF-8
7
+
Content-Transfer-Encoding: 8bit
8
+
9
+
pcre-8.42 replaced internal real_pcre with real_pcre8_or_16. This
10
+
broke monotone that decided not to use the public "pcre" type.
11
+
12
+
This patch adapts monotone to the pcre >= 8.42.
13
+
14
+
Signed-off-by: Petr Písař <ppisar@redhat.com>
15
+
---
16
+
src/pcrewrap.cc | 4 ++--
17
+
src/pcrewrap.hh | 4 ++--
18
+
2 files changed, 4 insertions(+), 4 deletions(-)
19
+
20
+
diff --git a/src/pcrewrap.cc b/src/pcrewrap.cc
21
+
index 8c0c9d1..30bafff 100644
22
+
--- a/src/pcrewrap.cc
23
+
+++ b/src/pcrewrap.cc
24
+
@@ -74,7 +74,7 @@ get_capturecount(void const * bd)
25
+
namespace pcre
26
+
{
27
+
typedef map<char const *,
28
+
- pair<struct real_pcre const *, struct pcre_extra const *> >
29
+
+ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *> >
30
+
regex_cache;
31
+
32
+
class regex_cache_manager
33
+
@@ -86,7 +86,7 @@ public:
34
+
}
35
+
36
+
void store(char const * pattern,
37
+
- pair<struct real_pcre const *, struct pcre_extra const *>
38
+
+ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *>
39
+
data)
40
+
{
41
+
cache[pattern] = data;
42
+
diff --git a/src/pcrewrap.hh b/src/pcrewrap.hh
43
+
index 3359cdd..5008e88 100644
44
+
--- a/src/pcrewrap.hh
45
+
+++ b/src/pcrewrap.hh
46
+
@@ -18,7 +18,7 @@
47
+
// definitions and so we don't actually expose it here. Unfortunately, this
48
+
// means we have to hope this pair of forward declarations will not change...
49
+
50
+
-struct real_pcre;
51
+
+struct real_pcre8_or_16;
52
+
struct pcre_extra;
53
+
54
+
namespace pcre
55
+
@@ -61,7 +61,7 @@ namespace pcre
56
+
regex & operator=(regex const &);
57
+
58
+
// data
59
+
- struct real_pcre const * basedat;
60
+
+ struct real_pcre8_or_16 const * basedat;
61
+
struct pcre_extra const * extradat;
62
+
63
+
// used by constructors
64
+
--
65
+
2.14.3
66
+