File system-jsoncpp.patch of Package nodejs-electron

Overview Repositories Revisions Requests Users Attributes Meta

File system-jsoncpp.patch of Package nodejs-electron (Revision 8182cf8789c5266176eba7c2da0836ff)

Currently displaying revision 8182cf8789c5266176eba7c2da0836ff , Show latest

description: use system jsoncpp
author: Michael Gilbert <mgilbert@debian.org>

--- a/third_party/jsoncpp/BUILD.gn
+++ b/third_party/jsoncpp/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//testing/libfuzzer/fuzzer_test.gni")
+import("//build/config/linux/pkg_config.gni")
 
 declare_args() {
   # Allow individual projects to remove the warning suppression
@@ -11,49 +12,12 @@ declare_args() {
   jsoncpp_no_deprecated_declarations = true
 }
 
-config("jsoncpp_config") {
-  include_dirs = [ "source/include" ]
-
-  # TODO(crbug.com/983223): Update JsonCpp BUILD.gn to remove deprecated
-  # declaration flag.
-  # This temporary flag allowing clients to update to the new version, and then
-  # update to the new StreamWriter and CharReader classes.
-  if (jsoncpp_no_deprecated_declarations &&
-      (!is_win || (is_clang && !is_ios))) {
-    cflags_cc = [ "-Wno-deprecated-declarations" ]
-  }
+pkg_config("jsoncpp_config") {
+  packages = [ "jsoncpp" ]
 }
 
-source_set("jsoncpp") {
-  sources = [
-    "source/include/json/allocator.h",
-    "source/include/json/assertions.h",
-    "source/include/json/config.h",
-    "source/include/json/forwards.h",
-    "source/include/json/json.h",
-    "source/include/json/json_features.h",
-    "source/include/json/reader.h",
-    "source/include/json/value.h",
-    "source/include/json/version.h",
-    "source/include/json/writer.h",
-    "source/src/lib_json/json_reader.cpp",
-    "source/src/lib_json/json_tool.h",
-    "source/src/lib_json/json_value.cpp",
-    "source/src/lib_json/json_writer.cpp",
-  ]
-
+group("jsoncpp") {
   public_configs = [ ":jsoncpp_config" ]
-
-  defines = [
-    "JSON_USE_EXCEPTION=0",
-    "JSON_USE_NULLREF=0",
-  ]
-
-  include_dirs = [ "source/src/lib_json" ]
-
-  if (!is_win || is_clang) {
-    cflags_cc = [ "-Wno-implicit-fallthrough" ]
-  }
 }
 
 if (build_with_chromium) {
--- a/components/mirroring/service/receiver_response.cc
+++ b/components/mirroring/service/receiver_response.cc
@@ -10,8 +10,8 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "components/mirroring/service/value_util.h"
-#include "third_party/jsoncpp/source/include/json/reader.h"
-#include "third_party/jsoncpp/source/include/json/writer.h"
+#include <json/reader.h>
+#include <json/writer.h>
 
 namespace mirroring {
 namespace {
--- a/components/mirroring/service/receiver_response.h
+++ b/components/mirroring/service/receiver_response.h
@@ -11,7 +11,7 @@
 
 #include "base/check.h"
 #include "base/component_export.h"
-#include "third_party/jsoncpp/source/include/json/value.h"
+#include <json/value.h>
 #include "third_party/openscreen/src/cast/streaming/answer_messages.h"
 
 namespace mirroring {
--- a/third_party/openscreen/src/cast/streaming/answer_messages.h
+++ b/third_party/openscreen/src/cast/streaming/answer_messages.h
@@ -17,7 +17,7 @@
 #include "absl/types/optional.h"
 #include "cast/streaming/resolution.h"
 #include "cast/streaming/ssrc.h"
-#include "json/value.h"
+#include <json/value.h>
 #include "platform/base/error.h"
 #include "util/simple_fraction.h"

Places

File system-jsoncpp.patch of Package nodejs-electron (Revision 8182cf8789c5266176eba7c2da0836ff)

Places