Kevin Kofler c87d486
diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn
Kevin Kofler c87d486
--- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/BUILD.gn	2017-05-18 16:51:44.000000000 +0200
Kevin Kofler c87d486
+++ qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn	2017-06-08 10:52:51.565409865 +0200
Kevin Kofler c87d486
@@ -49,6 +49,9 @@
Kevin Kofler c87d486
       "-Wno-char-subscripts",
Kevin Kofler c87d486
     ]
Kevin Kofler c87d486
   }
Kevin Kofler c87d486
+  ldflags = [
Kevin Kofler c87d486
+    "-lnspr4",
Kevin Kofler c87d486
+  ]
Kevin Kofler c87d486
 }
Kevin Kofler c87d486
 
Kevin Kofler c87d486
 config("base_implementation") {
Kevin Kofler c87d486
@@ -833,8 +836,6 @@
Kevin Kofler c87d486
     "third_party/dmg_fp/g_fmt.cc",
Kevin Kofler c87d486
     "third_party/icu/icu_utf.cc",
Kevin Kofler c87d486
     "third_party/icu/icu_utf.h",
Kevin Kofler c87d486
-    "third_party/nspr/prtime.cc",
Kevin Kofler c87d486
-    "third_party/nspr/prtime.h",
Kevin Kofler c87d486
     "third_party/superfasthash/superfasthash.c",
Kevin Kofler c87d486
     "threading/non_thread_safe.h",
Kevin Kofler c87d486
     "threading/non_thread_safe_impl.cc",
Kevin Kofler c87d486
diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/time/pr_time_unittest.cc qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc
Kevin Kofler c87d486
--- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/time/pr_time_unittest.cc	2017-05-18 16:51:44.000000000 +0200
Kevin Kofler c87d486
+++ qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc	2017-06-08 10:58:06.743413247 +0200
Kevin Kofler c87d486
@@ -7,7 +7,7 @@
Kevin Kofler c87d486
 
Kevin Kofler c87d486
 #include "base/compiler_specific.h"
Kevin Kofler c87d486
 #include "base/macros.h"
Kevin Kofler c87d486
-#include "base/third_party/nspr/prtime.h"
Kevin Kofler c87d486
+#include <nspr4/prtime.h>
Kevin Kofler c87d486
 #include "base/time/time.h"
Kevin Kofler c87d486
 #include "build/build_config.h"
Kevin Kofler c87d486
 #include "testing/gtest/include/gtest/gtest.h"
Kevin Kofler c87d486
diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/time/time.cc qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc
Kevin Kofler c87d486
--- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/base/time/time.cc	2017-05-18 16:51:44.000000000 +0200
Kevin Kofler c87d486
+++ qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc	2017-06-08 10:58:09.557373071 +0200
Kevin Kofler c87d486
@@ -14,7 +14,7 @@
Kevin Kofler c87d486
 #include "base/logging.h"
Kevin Kofler c87d486
 #include "base/macros.h"
Kevin Kofler c87d486
 #include "base/strings/stringprintf.h"
Kevin Kofler c87d486
-#include "base/third_party/nspr/prtime.h"
Kevin Kofler c87d486
+#include <nspr4/prtime.h>
Kevin Kofler c87d486
 #include "build/build_config.h"
Kevin Kofler c87d486
 
Kevin Kofler c87d486
 namespace base {
Kevin Kofler c87d486
diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
Kevin Kofler c87d486
--- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py	2017-05-18 16:51:44.000000000 +0200
Kevin Kofler c87d486
+++ qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py	2017-06-08 10:55:05.945934291 +0200
Kevin Kofler c87d486
@@ -473,7 +473,6 @@
Kevin Kofler c87d486
       'base/third_party/dmg_fp/dtoa_wrapper.cc',
Kevin Kofler c87d486
       'base/third_party/dmg_fp/g_fmt.cc',
Kevin Kofler c87d486
       'base/third_party/icu/icu_utf.cc',
Kevin Kofler c87d486
-      'base/third_party/nspr/prtime.cc',
Kevin Kofler c87d486
       'base/threading/non_thread_safe_impl.cc',
Kevin Kofler c87d486
       'base/threading/post_task_and_reply_impl.cc',
Kevin Kofler c87d486
       'base/threading/sequenced_task_runner_handle.cc',
Kevin Kofler c87d486
@@ -575,7 +574,7 @@
Kevin Kofler c87d486
     }
Kevin Kofler c87d486
 
Kevin Kofler c87d486
   if is_linux:
Kevin Kofler c87d486
-    libs.extend(['-lrt'])
Kevin Kofler c87d486
+    libs.extend(['-lrt', '-lnspr4'])
Kevin Kofler c87d486
     ldflags.extend(['-pthread'])
Kevin Kofler c87d486
 
Kevin Kofler c87d486
     static_libraries['xdg_user_dirs'] = {
Kevin Kofler 4422cf0
diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/tools/gn/BUILD.gn qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/tools/gn/BUILD.gn
Kevin Kofler 4422cf0
--- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/tools/gn/BUILD.gn	2017-05-18 16:51:44.000000000 +0200
Kevin Kofler f678438
+++ qtwebengine-opensource-src-5.9.0-system-nspr-prtime/src/3rdparty/chromium/tools/gn/BUILD.gn	2017-06-10 22:18:26.863178931 +0200
Kevin Kofler 4422cf0
@@ -274,6 +274,10 @@
Kevin Kofler 4422cf0
     "//build/config/sanitizers:deps",
Kevin Kofler 4422cf0
     "//build/win:default_exe_manifest",
Kevin Kofler 4422cf0
   ]
Kevin Kofler 4422cf0
+
Kevin Kofler f678438
+  libs = [
Kevin Kofler 4422cf0
+    "nspr4",
Kevin Kofler 4422cf0
+  ]
Kevin Kofler 4422cf0
 }
Kevin Kofler 4422cf0
 
Kevin Kofler 4422cf0
 test("gn_unittests") {