e83ec109c8
This reverts commit ee046f9af5.
I already told you last time (5.8) that this way of maintaining patches
(importing them all into git and reexporting them from there each time)
is not how I work (I want only those patches rebased and renamed that
actually need rebasing) and that you are only causing me more work.
Please keep your hands off my package from now on.
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 60434d58353db516e795e12817e1953700f9e5e4 Mon Sep 17 00:00:00 2001
|
|
From: Helio Chissini de Castro <helio@kde.org>
|
|
Date: Wed, 31 May 2017 10:46:36 +0200
|
|
Subject: [PATCH] qtwebengine-opensource-src-5.9.0-system-nspr-prtime
|
|
|
|
---
|
|
src/3rdparty/chromium/base/BUILD.gn | 2 --
|
|
src/3rdparty/chromium/base/time/pr_time_unittest.cc | 2 +-
|
|
src/3rdparty/chromium/base/time/time.cc | 2 +-
|
|
3 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/3rdparty/chromium/base/BUILD.gn b/src/3rdparty/chromium/base/BUILD.gn
|
|
index f2672cba7..66f2be1ff 100644
|
|
--- a/src/3rdparty/chromium/base/BUILD.gn
|
|
+++ b/src/3rdparty/chromium/base/BUILD.gn
|
|
@@ -833,8 +833,6 @@ component("base") {
|
|
"third_party/dmg_fp/g_fmt.cc",
|
|
"third_party/icu/icu_utf.cc",
|
|
"third_party/icu/icu_utf.h",
|
|
- "third_party/nspr/prtime.cc",
|
|
- "third_party/nspr/prtime.h",
|
|
"third_party/superfasthash/superfasthash.c",
|
|
"threading/non_thread_safe.h",
|
|
"threading/non_thread_safe_impl.cc",
|
|
diff --git a/src/3rdparty/chromium/base/time/pr_time_unittest.cc b/src/3rdparty/chromium/base/time/pr_time_unittest.cc
|
|
index 3f1a348ae..8f1a11e51 100644
|
|
--- a/src/3rdparty/chromium/base/time/pr_time_unittest.cc
|
|
+++ b/src/3rdparty/chromium/base/time/pr_time_unittest.cc
|
|
@@ -7,7 +7,7 @@
|
|
|
|
#include "base/compiler_specific.h"
|
|
#include "base/macros.h"
|
|
-#include "base/third_party/nspr/prtime.h"
|
|
+#include <nspr4/prtime.h>
|
|
#include "base/time/time.h"
|
|
#include "build/build_config.h"
|
|
#include "testing/gtest/include/gtest/gtest.h"
|
|
diff --git a/src/3rdparty/chromium/base/time/time.cc b/src/3rdparty/chromium/base/time/time.cc
|
|
index 4e942015f..29fde71dd 100644
|
|
--- a/src/3rdparty/chromium/base/time/time.cc
|
|
+++ b/src/3rdparty/chromium/base/time/time.cc
|
|
@@ -13,8 +13,8 @@
|
|
#include "base/lazy_instance.h"
|
|
#include "base/logging.h"
|
|
#include "base/macros.h"
|
|
+#include <nspr4/prtime.h>
|
|
#include "base/strings/stringprintf.h"
|
|
-#include "base/third_party/nspr/prtime.h"
|
|
#include "build/build_config.h"
|
|
|
|
namespace base {
|
|
--
|
|
2.13.0
|
|
|