diff options
Diffstat (limited to 'gnu/packages/patches/ungoogled-chromium-system-nspr.patch')
| -rw-r--r-- | gnu/packages/patches/ungoogled-chromium-system-nspr.patch | 134 |
1 files changed, 34 insertions, 100 deletions
diff --git a/gnu/packages/patches/ungoogled-chromium-system-nspr.patch b/gnu/packages/patches/ungoogled-chromium-system-nspr.patch index 988296b143..831e2b899c 100644 --- a/gnu/packages/patches/ungoogled-chromium-system-nspr.patch +++ b/gnu/packages/patches/ungoogled-chromium-system-nspr.patch @@ -1,120 +1,54 @@ -Build with the system nspr library. +Build with the system NSPR library instead of the bundled version. -Originally based on a Debian patch: +Originally based on this Debian patch: https://salsa.debian.org/chromium-team/chromium/-/blob/master/debian/patches/system/nspr.patch +diff --git a/base/BUILD.gn b/base/BUILD.gn +--- a/base/BUILD.gn ++++ b/base/BUILD.gn +@@ -141,6 +141,12 @@ config("perfetto_config") { + } + } + ++if (is_linux) { ++ ldflags = [ ++ "-lnspr4", ++ ] ++} ++ + # Base and everything it depends on should be a static library rather than + # a source set. Base is more of a "library" in the classic sense in that many + # small parts of it are used in many different contexts. This combined with a +@@ -759,8 +765,6 @@ component("base") { + "third_party/cityhash_v103/src/city_v103.cc", + "third_party/cityhash_v103/src/city_v103.h", + "third_party/icu/icu_utf.h", +- "third_party/nspr/prtime.cc", +- "third_party/nspr/prtime.h", + "third_party/superfasthash/superfasthash.c", + "thread_annotations.h", + "threading/hang_watcher.cc", +diff --git a/base/time/pr_time_unittest.cc b/base/time/pr_time_unittest.cc --- a/base/time/pr_time_unittest.cc +++ b/base/time/pr_time_unittest.cc @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" - #include "base/stl_util.h" + #include "base/cxx17_backports.h" -#include "base/third_party/nspr/prtime.h" +#include <nspr/prtime.h> #include "base/time/time.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" +diff --git a/base/time/time.cc b/base/time/time.cc --- a/base/time/time.cc +++ b/base/time/time.cc -@@ -14,7 +14,7 @@ - #include "base/optional.h" - #include "base/strings/string_util.h" +@@ -18,7 +18,7 @@ + #include <utility> + #include "base/strings/stringprintf.h" -#include "base/third_party/nspr/prtime.h" +#include <nspr/prtime.h> #include "base/time/time_override.h" #include "build/build_config.h" - ---- a/base/BUILD.gn -+++ b/base/BUILD.gn -@@ -102,6 +102,9 @@ - "-Wglobal-constructors", - ] - } -+ ldflags = [ -+ "-lnspr4", -+ ] - } - - config("base_implementation") { -@@ -720,8 +723,6 @@ - "third_party/cityhash_v103/src/city_v103.h", - "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", - "thread_annotations.h", - "threading/hang_watcher.cc", ---- a/tools/gn/build/gen.py -+++ b/tools/gn/build/gen.py -@@ -380,6 +380,9 @@ - if not options.no_static_libstdcpp: - ldflags.append('-static-libstdc++') - -+ # Additional system libraries that are used. -+ libs.append('-lnspr4') -+ - if platform.is_mingw() or platform.is_msys(): - cflags.remove('-std=c++17') - cflags.extend([ ---- a/third_party/blink/renderer/platform/BUILD.gn -+++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -110,6 +110,9 @@ - "//build/win:default_exe_manifest", - "//third_party/icu", - ] -+ ldflags = [ -+ "-lnspr4" -+ ] - } - - # This isn't strictly necessary since we can just add the deps to "platform", ---- a/third_party/crashpad/crashpad/handler/BUILD.gn -+++ b/third_party/crashpad/crashpad/handler/BUILD.gn -@@ -144,6 +144,9 @@ - "../third_party/mini_chromium:base", - "../tools:tool_support", - ] -+ ldflags = [ -+ "-lnspr4" -+ ] - - if (crashpad_is_win) { - if (crashpad_is_in_chromium || crashpad_is_in_dart) { ---- a/chrome/common/search/BUILD.gn -+++ b/chrome/common/search/BUILD.gn -@@ -20,6 +20,9 @@ - "//chrome/common/themes:autogenerated_theme_util", - "//skia", - ] -+ ldflags = [ -+ "-lnspr4" -+ ] - } - - compiled_action("generate_chrome_colors_info") { ---- a/components/url_formatter/spoof_checks/top_domains/BUILD.gn -+++ b/components/url_formatter/spoof_checks/top_domains/BUILD.gn -@@ -31,6 +31,9 @@ - "//net/tools/huffman_trie:huffman_trie_generator_sources", - "//url:url", - ] -+ ldflags = [ -+ "-lnspr4", -+ ] - if (is_ios) { - frameworks = [ "UIKit.framework" ] - } ---- a/components/schema_org/BUILD.gn -+++ b/components/schema_org/BUILD.gn -@@ -33,6 +33,9 @@ - "//base", - "//url", - ] -+ ldflags = [ -+ "-lnspr4", -+ ] - } - - compiled_action("schema_org_name_data") { + #include "third_party/abseil-cpp/absl/types/optional.h" |