Package: icedove / 1:52.3.0-4~deb8u2

debian-hacks/Build-against-system-libjsoncpp.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
From: Mike Hommey <mh@glandium.org>
Date: Tue, 9 May 2017 10:41:13 +0200
Subject: Build against system libjsoncpp

---
 mozilla/config/system-headers                      |  1 +
 .../crashreporter/jsoncpp/src/lib_json/moz.build   | 27 +---------------------
 .../crashreporter/minidump-analyzer/moz.build      |  2 +-
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/mozilla/config/system-headers b/mozilla/config/system-headers
index be3162f..623dd15 100644
--- a/mozilla/config/system-headers
+++ b/mozilla/config/system-headers
@@ -1335,3 +1335,4 @@ unicode/utypes.h
 libutil.h
 unwind.h
 fenv.h
+json/json.h
diff --git a/mozilla/toolkit/crashreporter/jsoncpp/src/lib_json/moz.build b/mozilla/toolkit/crashreporter/jsoncpp/src/lib_json/moz.build
index 2d51c2c..5e20a3d 100644
--- a/mozilla/toolkit/crashreporter/jsoncpp/src/lib_json/moz.build
+++ b/mozilla/toolkit/crashreporter/jsoncpp/src/lib_json/moz.build
@@ -4,31 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-UNIFIED_SOURCES += [
-    'json_reader.cpp',
-    'json_value.cpp',
-    'json_writer.cpp'
-]
-
-LOCAL_INCLUDES += [
-    '/toolkit/crashreporter/jsoncpp/include',
-]
-
-# This code is only used in the stand-alone minidump analyzer executable so
-# enabling exceptions should be fine.
-if CONFIG['CLANG_CL']:
-    CXXFLAGS += [
-        '-Xclang',
-        '-fcxx-exceptions',
-    ]
-elif not CONFIG['_MSC_VER']:
-    CXXFLAGS += [
-        '-fexceptions',
-    ]
-
-# Required to build with exceptions enabled
-DISABLE_STL_WRAPPING = True
-
 Library('jsoncpp')
 
-include('/toolkit/crashreporter/crashreporter.mozbuild')
+OS_LIBS += ['jsoncpp']
diff --git a/mozilla/toolkit/crashreporter/minidump-analyzer/moz.build b/mozilla/toolkit/crashreporter/minidump-analyzer/moz.build
index bd4aa76..e4ac2de 100644
--- a/mozilla/toolkit/crashreporter/minidump-analyzer/moz.build
+++ b/mozilla/toolkit/crashreporter/minidump-analyzer/moz.build
@@ -20,7 +20,7 @@ if CONFIG['OS_TARGET'] != 'Android':
     ]
 
     LOCAL_INCLUDES += [
-        '/toolkit/crashreporter/jsoncpp/include',
+        '%/usr/include/jsoncpp',
     ]