c8151228d0
This reverts commit 7816e88f62.
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.
49 lines
2.8 KiB
Diff
49 lines
2.8 KiB
Diff
diff -ur qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/base/base.gypi qtwebengine-opensource-src-5.8.0-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi
|
|
--- qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/base/base.gypi 2017-01-03 10:28:53.000000000 +0100
|
|
+++ qtwebengine-opensource-src-5.8.0-system-nspr-prtime/src/3rdparty/chromium/base/base.gypi 2017-03-05 16:48:14.206027229 +0100
|
|
@@ -676,8 +676,6 @@
|
|
'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',
|
|
'third_party/xdg_mime/xdgmime.h',
|
|
'threading/non_thread_safe.h',
|
|
diff -ur qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/base/BUILD.gn qtwebengine-opensource-src-5.8.0-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn
|
|
--- qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/base/BUILD.gn 2017-01-03 10:28:53.000000000 +0100
|
|
+++ qtwebengine-opensource-src-5.8.0-system-nspr-prtime/src/3rdparty/chromium/base/BUILD.gn 2017-03-05 16:48:14.207027214 +0100
|
|
@@ -803,8 +803,6 @@
|
|
"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 -ur qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/base/time/pr_time_unittest.cc qtwebengine-opensource-src-5.8.0-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc
|
|
--- qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2017-01-03 10:28:53.000000000 +0100
|
|
+++ qtwebengine-opensource-src-5.8.0-system-nspr-prtime/src/3rdparty/chromium/base/time/pr_time_unittest.cc 2017-03-05 16:48:14.208027199 +0100
|
|
@@ -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 -ur qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/base/time/time.cc qtwebengine-opensource-src-5.8.0-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc
|
|
--- qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/base/time/time.cc 2017-01-03 10:28:53.000000000 +0100
|
|
+++ qtwebengine-opensource-src-5.8.0-system-nspr-prtime/src/3rdparty/chromium/base/time/time.cc 2017-03-05 16:48:14.298025856 +0100
|
|
@@ -14,7 +14,7 @@
|
|
#include "base/logging.h"
|
|
#include "base/macros.h"
|
|
#include "base/strings/stringprintf.h"
|
|
-#include "base/third_party/nspr/prtime.h"
|
|
+#include <nspr4/prtime.h>
|
|
#include "build/build_config.h"
|
|
|
|
namespace base {
|