morgan/helium
1
0
Fork 0
mirror of https://github.com/morgan9e/helium synced 2026-04-14 00:14:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update Debian files and config to 67.0.3396.62-1

Browse Source
This commit is contained in:
Eloston
2018-06-01 12:23:29 +00:00
parent a8cef51293
commit ba903b2e93
36 changed files with 272 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/config_bundles/common/patch_order.list
View File

@@ -29,7 +29,6 @@ inox-patchset/9000-disable-metrics.patch
debian/gn/libcxx.patch
debian/gn/parallel.patch
debian/gn/narrowing.patch
debian/disable/fonts.patch
debian/disable/fuzzers.patch
debian/disable/welcome-page.patch
debian/disable/google-api-warning.patch
@@ -37,16 +36,18 @@ debian/disable/device-notifications.patch
debian/fixes/mojo.patch
debian/fixes/optimize.patch
debian/fixes/ps-print.patch
debian/fixes/namespace.patch
debian/fixes/inspector.patch
debian/fixes/gpu-timeout.patch
debian/fixes/incomplete-types.patch
debian/fixes/ambiguous-aliases.patch
debian/fixes/widevine-revision.patch
debian/fixes/connection-message.patch
debian/fixes/chromedriver-revision.patch
debian/fixes/skia_buildfix.patch
debian/warnings/multichar.patch
debian/warnings/sequence-point.patch
debian/warnings/initialization.patch
debian/warnings/null-destination.patch
debian/warnings/misleading-indentation.patch
iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch

5
resources/config_bundles/debian_buster/patch_order.list
View File

@@ -1,5 +1,8 @@
debian/disable/openh264.patch
debian/system/ffmpeg.patch
debian/system/openjpeg.patch
debian/master-preferences.patch
debian/debianization/master-preferences.patch
debian/system/lcms2.patch
ungoogled-chromium/linux/manpage.patch

4
resources/config_bundles/debian_stretch/patch_order.list
View File

@@ -1,9 +1,11 @@
debian/disable/openh264.patch
debian_stretch/system/vpx.patch
debian_stretch/system/ffmpeg.patch
opensuse/system-libdrm.patch
debian/master-preferences.patch
debian/debianization/master-preferences.patch
ungoogled-chromium/linux/manpage.patch
ungoogled-chromium/linux/fix-libstdcxx-errors.patch

1
resources/config_bundles/linux_rooted/gn_flags.map
View File

@@ -9,6 +9,7 @@ optimize_for_size=false
use_allocator="none"
use_cups=true
use_custom_libcxx=false
use_gio=true
use_gold=true
use_gtk3=true
use_kerberos=false

2
resources/config_bundles/linux_rooted/patch_order.list
View File

@@ -1,7 +1,9 @@
inox-patchset/chromium-vaapi-r18.patch
debian/system/icu.patch
debian/system/jpeg.patch
debian/system/nspr.patch
debian/system/event.patch
debian/system/fontconfig.patch
ungoogled-chromium/linux/use-system-libraries-in-official-build.patch

22
resources/packaging/debian/buster/clean
View File

@@ -3,24 +3,26 @@ debian/files
Makefile
third_party/flot/*.js
third_party/ffmpeg/BUILD.gn
third_party/flac/BUILD.gn
base/third_party/libevent/BUILD.gn
build/secondary/third_party/libjpeg_turbo/BUILD.gn
third_party/re2/BUILD.gn
third_party/icu/BUILD.gn
third_party/flac/BUILD.gn
third_party/zlib/BUILD.gn
third_party/opus/BUILD.gn
third_party/snappy/BUILD.gn
third_party/ffmpeg/BUILD.gn
third_party/libxml/BUILD.gn
third_party/libdrm/BUILD.gn
third_party/libpng/BUILD.gn
third_party/libvpx/BUILD.gn
third_party/libwebp/BUILD.gn
third_party/libxml/BUILD.gn
third_party/libjpeg/BUILD.gn
third_party/libxslt/BUILD.gn
third_party/re2/BUILD.gn
third_party/snappy/BUILD.gn
third_party/yasm/yasm_assemble.gni
third_party/zlib/BUILD.gn
third_party/icu/BUILD.gn
third_party/opus/BUILD.gn
third_party/freetype/BUILD.gn
tihrd_party/fontconfig/BUILD.gn
third_party/fontconfig/BUILD.gn
third_party/harfbuzz-ng/harfbuzz.gni
third_party/yasm/yasm_assemble.gni
build/config/freetype/freetype.gni

20
resources/packaging/debian/buster/control
View File

@@ -7,7 +7,7 @@ Uploaders:
Vcs-Git: https://github.com/Eloston/ungoogled-chromium.git
Vcs-Browser: https://github.com/Eloston/ungoogled-chromium
Homepage: https://github.com/Eloston/ungoogled-chromium
Rules-Requires-Root: binary-targets
Rules-Requires-Root: no
Build-Depends:
debhelper (>= 11),
clang-6.0,
@@ -103,7 +103,6 @@ Suggests:
ungoogled-chromium-l10n,
ungoogled-chromium-shell,
ungoogled-chromium-driver,
ungoogled-chromium-widevine,
Provides:
www-browser,
gnome-www-browser,
@@ -160,23 +159,6 @@ Description: web browser - minimal shell
This package provides a minimal version of the chromium user interface
(the content shell).
Package: ungoogled-chromium-widevine
Section: contrib/web
Architecture: i386 amd64 arm64 armhf
Depends:
${misc:Depends},
${shlibs:Depends},
ungoogled-chromium (= ${binary:Version}),
Replaces:
chromium-widevine,
Breaks:
chromium-widevine,
Description: web browser - widevine content decryption support
Web browser that aims to build a safer, faster, and more stable internet
browsing experience.
.
This package provides support for the widevine content decryption module.
Package: ungoogled-chromium-driver
Architecture: i386 amd64 arm64 armhf
Depends:

7
resources/packaging/debian/buster/rules.in
View File

@@ -6,6 +6,9 @@ export DH_VERBOSE=1
# enable all build hardening flags
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
# indicate that binary targets do not require root
export DEB_RULES_REQUIRES_ROOT=no
# use system LLVM via unbundling
export AR=llvm-ar-6.0
export NM=llvm-nm-6.0
@@ -32,9 +35,7 @@ ifeq (arm64,$(DEB_HOST_ARCH))
defines+=host_cpu=\"arm64\"
endif
ifeq (armhf,$(DEB_HOST_ARCH))
defines+=host_cpu=\"arm\" \
arm_use_neon=false \
defines+=host_cpu=\"arm\" arm_use_neon=false
endif
# auto-inserted gn flags

3
resources/packaging/debian/buster/scripts/unbundle
View File

@@ -23,7 +23,7 @@ def strip(path):
else:
os.remove(removal)
keepers = ('openh264')
keepers = ('openh264', 'libjpeg')
# strip out regenerating files in each build
def remove_file(path):
@@ -40,6 +40,7 @@ for lib,rule in replace_gn_files.REPLACEMENTS.items():
strip(os.path.dirname(rule))
# remove the gn file that builds the embedded library
if os.path.lexists(rule):
print('removing: %s'%rule)
os.remove(rule)
# create a symlink to the unbundle gn file
symlink = "ln -s "

1
resources/packaging/debian/buster/ungoogled-chromium-widevine.install.in
View File

@@ -1 +0,0 @@
$ungoog{build_output}/libwidevinecdmadapter.so usr/lib/chromium

24
resources/packaging/debian/stretch/clean
View File

@@ -3,18 +3,24 @@ debian/files
Makefile
third_party/flot/*.js
third_party/ffmpeg/BUILD.gn
third_party/flac/BUILD.gn
base/third_party/libevent/BUILD.gn
build/secondary/third_party/libjpeg_turbo/BUILD.gn
third_party/libpng/BUILD.gn
third_party/libwebp/BUILD.gn
third_party/libxml/BUILD.gn
third_party/libxslt/BUILD.gn
third_party/re2/BUILD.gn
third_party/snappy/BUILD.gn
third_party/yasm/yasm_assemble.gni
third_party/zlib/BUILD.gn
third_party/icu/BUILD.gn
third_party/flac/BUILD.gn
third_party/zlib/BUILD.gn
third_party/opus/BUILD.gn
third_party/snappy/BUILD.gn
third_party/ffmpeg/BUILD.gn
third_party/libxml/BUILD.gn
third_party/libdrm/BUILD.gn
third_party/libpng/BUILD.gn
third_party/libvpx/BUILD.gn
third_party/libwebp/BUILD.gn
third_party/libjpeg/BUILD.gn
third_party/libxslt/BUILD.gn
third_party/freetype/BUILD.gn
third_party/fontconfig/BUILD.gn
third_party/harfbuzz-ng/harfbuzz.gni
third_party/yasm/yasm_assemble.gni

20
resources/packaging/debian/stretch/control
View File

@@ -7,7 +7,7 @@ Uploaders:
Vcs-Git: https://github.com/Eloston/ungoogled-chromium.git
Vcs-Browser: https://github.com/Eloston/ungoogled-chromium
Homepage: https://github.com/Eloston/ungoogled-chromium
Rules-Requires-Root: binary-targets
Rules-Requires-Root: no
Build-Depends:
debhelper (>= 11),
clang-6.0,
@@ -102,7 +102,6 @@ Suggests:
ungoogled-chromium-l10n,
ungoogled-chromium-shell,
ungoogled-chromium-driver,
ungoogled-chromium-widevine,
Provides:
www-browser,
gnome-www-browser,
@@ -159,23 +158,6 @@ Description: web browser - minimal shell
This package provides a minimal version of the chromium user interface
(the content shell).
Package: ungoogled-chromium-widevine
Section: contrib/web
Architecture: i386 amd64 arm64 armhf
Depends:
${misc:Depends},
${shlibs:Depends},
ungoogled-chromium (= ${binary:Version}),
Replaces:
chromium-widevine,
Breaks:
chromium-widevine,
Description: web browser - widevine content decryption support
Web browser that aims to build a safer, faster, and more stable internet
browsing experience.
.
This package provides support for the widevine content decryption module.
Package: ungoogled-chromium-driver
Architecture: i386 amd64 arm64 armhf
Depends:

3
resources/packaging/debian/stretch/scripts/unbundle
View File

@@ -23,7 +23,7 @@ def strip(path):
else:
os.remove(removal)
keepers = ('openh264','harfbuzz-ng')
keepers = ('openh264', 'libjpeg', 'harfbuzz-ng')
# strip out regenerating files in each build
def remove_file(path):
@@ -40,6 +40,7 @@ for lib,rule in replace_gn_files.REPLACEMENTS.items():
strip(os.path.dirname(rule))
# remove the gn file that builds the embedded library
if os.path.lexists(rule):
print('removing: %s'%rule)
os.remove(rule)
# create a symlink to the unbundle gn file
symlink = "ln -s "

0
resources/patches/debian/master-preferences.patch → resources/patches/debian/debianization/master-preferences.patch
View File

14
resources/patches/debian/disable/fonts.patch
View File

@@ -1,14 +0,0 @@
description: content_shell_fonts depends on prebuilt ttf files
author: Michael Gilbert <mgilbert@debian.org>
--- a/content/shell/test_runner/BUILD.gn
+++ b/content/shell/test_runner/BUILD.gn
@@ -203,7 +203,7 @@ group("resources") {
deps += [ ":copy_android_fonts_config" ]
data_deps += [ ":copy_android_fonts_config" ]
}
- if (is_android || is_linux || is_fuchsia) {
+ if (false) {
deps += [ "//third_party/test_fonts" ]
data_deps += [ "//third_party/test_fonts" ]
}

11
resources/patches/debian/disable/openh264.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/third_party/webrtc/webrtc.gni
+++ b/third_party/webrtc/webrtc.gni
@@ -121,7 +121,7 @@ declare_args() {
# also: |rtc_initialize_ffmpeg|.
# CHECK THE OPENH264, FFMPEG AND H.264 LICENSES/PATENTS BEFORE BUILDING.
# http://www.openh264.org, https://www.ffmpeg.org/
- rtc_use_h264 = proprietary_codecs && !is_android && !is_ios
+ rtc_use_h264 = false
# By default, use normal platform audio support or dummy audio, but don't
# use file-based audio playout and record.

2
resources/patches/debian/disable/welcome-page.patch
View File

@@ -4,7 +4,7 @@ bug-debian: http://bugs.debian.org/857767
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -1048,7 +1048,7 @@ void ProfileManager::InitProfileUserPref
@@ -1061,7 +1061,7 @@ void ProfileManager::InitProfileUserPref
profile->GetPrefs()->SetString(prefs::kSupervisedUserId,
supervised_user_id);
}

30
resources/patches/debian/fixes/ambiguous-aliases.patch
View File

@@ -3,23 +3,20 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/extensions/common/manifest_handlers/permissions_parser.cc
+++ b/extensions/common/manifest_handlers/permissions_parser.cc
@@ -27,13 +27,13 @@
@@ -26,10 +26,10 @@
#include "extensions/common/url_pattern_set.h"
#include "url/url_constants.h"
-namespace extensions {
+namespace keys = extensions::manifest_keys;
+namespace errors = extensions::manifest_errors;
+
namespace extensions {
namespace {
-namespace keys = manifest_keys;
-namespace errors = manifest_errors;
-
struct ManifestPermissions : public Extension::ManifestData {
ManifestPermissions(std::unique_ptr<const PermissionSet> permissions);
~ManifestPermissions() override;
+namespace extensions {
namespace {
--- a/extensions/common/manifest_handlers/requirements_info.cc
+++ b/extensions/common/manifest_handlers/requirements_info.cc
@@ -12,10 +12,10 @@
@@ -38,23 +35,20 @@ author: Michael Gilbert <mgilbert@debian.org>
: webgl(false), window_shape(false) {}
--- a/extensions/common/manifest_handlers/sandboxed_page_info.cc
+++ b/extensions/common/manifest_handlers/sandboxed_page_info.cc
@@ -17,13 +17,13 @@
@@ -17,10 +17,10 @@
#include "extensions/common/manifest_constants.h"
#include "extensions/common/url_pattern.h"
+namespace keys = extensions::manifest_keys;
-namespace extensions {
-
namespace keys = extensions::manifest_keys;
-namespace errors = manifest_errors;
+namespace errors = extensions::manifest_errors;
+
namespace extensions {
+namespace extensions {
namespace {
-namespace keys = extensions::manifest_keys;
-namespace errors = manifest_errors;
-
const char kDefaultSandboxedPageContentSecurityPolicy[] =
"sandbox allow-scripts allow-forms allow-popups allow-modals; "
"script-src 'self' 'unsafe-inline' 'unsafe-eval'; child-src 'self';";
--- a/extensions/common/manifest_handlers/shared_module_info.cc
+++ b/extensions/common/manifest_handlers/shared_module_info.cc
@@ -22,11 +22,11 @@

17
resources/patches/debian/fixes/incomplete-types.patch
View File

@@ -1,17 +0,0 @@
description: gcc requires complete definition when types are used in unique_ptr
author: Michael Gilbert <mgilbert@debian.org>
--- a/components/policy/core/browser/browser_policy_connector_base.h
+++ b/components/policy/core/browser/browser_policy_connector_base.h
@@ -14,10 +14,10 @@
#include "components/policy/core/common/schema.h"
#include "components/policy/core/common/schema_registry.h"
#include "components/policy/policy_export.h"
+#include "components/policy/core/common/configuration_policy_provider.h"
namespace policy {
-class ConfigurationPolicyProvider;
class PolicyService;
class PolicyServiceImpl;

21
resources/patches/debian/fixes/namespace.patch Normal file
View File

@@ -0,0 +1,21 @@
description: gcc 6 isn't able to correctly deduce the namespace
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/platform/graphics/path.h
+++ b/third_party/blink/renderer/platform/graphics/path.h
@@ -199,13 +199,13 @@ class PLATFORM_EXPORT Path {
SkPath path_;
};
-class PLATFORM_EXPORT RefCountedPath : public Path,
+class PLATFORM_EXPORT RefCountedPath : public blink::Path,
public RefCounted<RefCountedPath> {
USING_FAST_MALLOC(RefCountedPath);
public:
template <typename... Args>
- RefCountedPath(Args&&... args) : Path(std::forward<Args>(args)...) {}
+ RefCountedPath(Args&&... args) : blink::Path(std::forward<Args>(args)...) {}
};
// Only used for DCHECKs

3
resources/patches/debian/fixes/skia_buildfix.patch
View File

@@ -1,3 +1,6 @@
description: build fix for armhf
author: Riku Voipio
--- a/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ b/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -653,7 +653,7 @@ SI F approx_powf(F x, F y) {

13
resources/patches/debian/fixes/widevine-revision.patch
View File

@@ -1,13 +0,0 @@
description: set widevine version as undefined
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/widevine/cdm/stub/widevine_cdm_version.h
+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h
@@ -10,6 +10,7 @@
#include "third_party/widevine/cdm/widevine_cdm_common.h"
+#define WIDEVINE_CDM_VERSION_STRING "undefined"
#define WIDEVINE_CDM_AVAILABLE
#endif // WIDEVINE_CDM_VERSION_H_

4
resources/patches/debian/gn/libcxx.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -663,6 +663,8 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -713,6 +713,8 @@ def write_gn_ninja(path, root_gen_dir, o
}
if is_linux or is_aix:
@@ -12,7 +12,7 @@ author: Michael Gilbert <mgilbert@debian.org>
static_libraries['xdg_user_dirs'] = {
'sources': [
'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
@@ -688,85 +690,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -738,85 +740,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/threading/platform_thread_linux.cc',
])
if is_linux:

2
resources/patches/debian/gn/narrowing.patch
View File

@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -380,7 +380,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -428,7 +428,7 @@ def write_gn_ninja(path, root_gen_dir, o
'-pipe',
'-fno-exceptions'
])

6
resources/patches/debian/gn/parallel.patch
View File

@@ -3,15 +3,15 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -115,6 +115,7 @@ def main(argv):
'relative to the src directory. (eg. out/Release)')
@@ -154,6 +154,7 @@ def main(argv):
'the out_bootstrap to be located in the parent directory')
parser.add_option('-v', '--verbose', action='store_true',
help='Log more details')
+ parser.add_option('-j', '--jobs', help='Number of jobs')
options, args = parser.parse_args(argv)
if args:
@@ -236,6 +237,8 @@ def build_gn_with_ninja_manually(tempdir
@@ -282,6 +283,8 @@ def build_gn_with_ninja_manually(tempdir
cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
if options.verbose:
cmd.append('-v')

8
resources/patches/debian/system/event.patch
View File

@@ -1,4 +1,4 @@
description: build using system libevent
description: use system libevent
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/webrtc/rtc_base/task_queue_libevent.cc
@@ -14,7 +14,7 @@ author: Michael Gilbert <mgilbert@debian.org>
#include "rtc_base/logging.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -643,26 +643,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -693,26 +693,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_conversion_posix.cc',
'base/trace_event/heap_profiler_allocation_register_posix.cc',
])
@@ -41,7 +41,7 @@ author: Michael Gilbert <mgilbert@debian.org>
if is_linux or is_aix:
ldflags.extend(['-pthread'])
@@ -696,13 +676,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -746,13 +726,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
])
@@ -56,7 +56,7 @@ author: Michael Gilbert <mgilbert@debian.org>
else:
ldflags.extend(['-pthread'])
libs.extend(['-lrt'])
@@ -742,12 +716,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -792,12 +766,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/time/time_mac.cc',
'base/threading/platform_thread_mac.mm',
])

25
resources/patches/debian/system/ffmpeg.patch Normal file
View File

@@ -0,0 +1,25 @@
description: system ffmpeg build still relies on old ffmpeg_features label
author: chromium 65 authors
--- a/build/linux/unbundle/ffmpeg.gn
+++ b/build/linux/unbundle/ffmpeg.gn
@@ -14,8 +14,8 @@ pkg_config("system_ffmpeg") {
]
}
-buildflag_header("ffmpeg_buildflags") {
- header = "ffmpeg_buildflags.h"
+buildflag_header("ffmpeg_features") {
+ header = "ffmpeg_features.h"
flags = [ "USE_SYSTEM_FFMPEG=true" ]
}
@@ -30,7 +30,7 @@ shim_headers("ffmpeg_shim") {
source_set("ffmpeg") {
deps = [
- ":ffmpeg_buildflags",
+ ":ffmpeg_features",
":ffmpeg_shim",
]
public_configs = [ ":system_ffmpeg" ]

49
resources/patches/debian/system/fontconfig.patch Normal file
View File

@@ -0,0 +1,49 @@
description: disable build commands for embedded fontconfig
author: Michael Gilbert <mgilbert@debian.org>
--- a/build/config/posix/BUILD.gn
+++ b/build/config/posix/BUILD.gn
@@ -2,7 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//buildtools/deps_revisions.gni")
import("//build/config/c++/c++.gni")
import("//build/config/clang/clang.gni")
import("//build/config/sanitizers/sanitizers.gni")
--- a/base/test/BUILD.gn
+++ b/base/test/BUILD.gn
@@ -187,13 +187,6 @@ static_library("test_support") {
if (is_linux) {
public_deps += [ ":fontconfig_util_linux" ]
- data_deps = [
- "//third_party/test_fonts",
- ]
- if (current_toolchain == host_toolchain) {
- data_deps += [ ":do_generate_fontconfig_caches" ]
- data += [ "$root_out_dir/fontconfig_caches/" ]
- }
}
if (is_ios) {
@@ -340,7 +333,7 @@ if (is_linux) {
]
}
- if (current_toolchain == host_toolchain) {
+ if (false) {
executable("generate_fontconfig_caches") {
testonly = true
sources = [
--- a/content/shell/test_runner/BUILD.gn
+++ b/content/shell/test_runner/BUILD.gn
@@ -203,7 +203,7 @@ group("resources") {
deps += [ ":copy_android_fonts_config" ]
data_deps += [ ":copy_android_fonts_config" ]
}
- if (is_android || is_linux || is_fuchsia) {
+ if (false) {
deps += [ "//third_party/test_fonts" ]
data_deps += [ "//third_party/test_fonts" ]
}

15
resources/patches/debian/system/icu.patch
View File

@@ -11,18 +11,3 @@ author: Michael Gilbert <mgilbert@debian.org>
import("//third_party/protobuf/proto_library.gni")
import("//tools/grit/grit_rule.gni")
import("//url/features.gni")
--- a/third_party/blink/renderer/platform/graphics/logging_canvas.cc
+++ b/third_party/blink/renderer/platform/graphics/logging_canvas.cc
@@ -531,8 +531,12 @@ String StringForUTF32LEText(const void*
utf16 = icu::UnicodeString::fromUTF32(reinterpret_cast<const UChar32*>(text),
static_cast<int32_t>(byte_length));
#endif
+#if U_ICU_VERSION_MAJOR_NUM >= 59
return String(icu::toUCharPtr(utf16.getBuffer()),
static_cast<unsigned>(utf16.length()));
+#else
+ return String(utf16.getBuffer(),static_cast<unsigned>(utf16.length()));
+#endif
}
String StringForText(const void* text,

18
resources/patches/debian/system/jpeg.patch Normal file
View File

@@ -0,0 +1,18 @@
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -671,7 +671,6 @@ group("gn_all") {
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
"//third_party/leveldatabase:leveldb_test_targets",
- "//third_party/libjpeg_turbo:simd",
"//third_party/opus:opus_compare",
"//third_party/opus:opus_demo",
"//third_party/opus:test_opus_api",
@@ -695,7 +694,6 @@ group("gn_all") {
if (enable_nacl) {
deps += [ "//native_client/src/trusted/platform_qualify:vcpuid" ]
}
- deps += [ "//third_party/libjpeg_turbo:simd_asm" ]
}
if (is_linux && current_toolchain == host_toolchain) {
deps += [ "//v8:v8_shell" ]

10
resources/patches/debian/system/lcms2.patch
View File

@@ -4,15 +4,15 @@ bug-debian: http://bugs.debian.org/879153
--- a/third_party/pdfium/BUILD.gn
+++ b/third_party/pdfium/BUILD.gn
@@ -192,6 +192,7 @@ jumbo_static_library("pdfium") {
@@ -194,6 +194,7 @@ jumbo_static_library("pdfium") {
":fxge",
":fxjs",
":pwl",
+ "third_party:lcms2",
"third_party:bigint",
"third_party:pdfium_base",
"third_party:skia_shared",
@@ -682,6 +683,7 @@ jumbo_static_library("fpdftext") {
]
@@ -687,6 +688,7 @@ jumbo_static_library("fpdftext") {
configs += [ ":pdfium_core_config" ]
deps = [
":fxcrt",
@@ -20,11 +20,11 @@ bug-debian: http://bugs.debian.org/879153
]
}
@@ -1080,6 +1082,7 @@ jumbo_static_library("fxge") {
@@ -1081,6 +1083,7 @@ jumbo_static_library("fxge") {
deps = [
":fxcrt",
+ "third_party:lcms2",
]
if (is_component_build || use_system_freetype) {
defines = [ "DEFINE_PS_TABLES" ]

8
resources/patches/debian/system/nspr.patch
View File

@@ -25,7 +25,7 @@ author: Michael Gilbert <mgilbert@debian.org>
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -555,7 +555,6 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -605,7 +605,6 @@ def write_gn_ninja(path, root_gen_dir, o
'base/third_party/dmg_fp/dtoa_wrapper.cc',
'base/third_party/dmg_fp/g_fmt.cc',
'base/third_party/icu/icu_utf.cc',
@@ -33,7 +33,7 @@ author: Michael Gilbert <mgilbert@debian.org>
'base/threading/post_task_and_reply_impl.cc',
'base/threading/scoped_blocking_call.cc',
'base/threading/sequence_local_storage_map.cc',
@@ -697,7 +696,7 @@ def write_gn_ninja(path, root_gen_dir, o
@@ -747,7 +746,7 @@ def write_gn_ninja(path, root_gen_dir, o
'base/allocator/allocator_shim.cc',
'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
])
@@ -44,7 +44,7 @@ author: Michael Gilbert <mgilbert@debian.org>
])
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -76,6 +76,9 @@ config("base_flags") {
@@ -75,6 +75,9 @@ config("base_flags") {
"-Wexit-time-destructors",
]
}
@@ -54,7 +54,7 @@ author: Michael Gilbert <mgilbert@debian.org>
}
config("base_implementation") {
@@ -883,8 +886,6 @@ jumbo_component("base") {
@@ -899,8 +902,6 @@ jumbo_component("base") {
"third_party/dmg_fp/g_fmt.cc",
"third_party/icu/icu_utf.cc",
"third_party/icu/icu_utf.h",

16
resources/patches/debian/warnings/misleading-indentation.patch Normal file
View File

@@ -0,0 +1,16 @@
description: fix misleading indentation warning
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/blink/renderer/modules/accessibility/ax_menu_list_popup.cc
+++ b/third_party/blink/renderer/modules/accessibility/ax_menu_list_popup.cc
@@ -151,8 +151,8 @@ void AXMenuListPopup::DidHide() {
cache.PostNotification(this, AXObjectCacheImpl::kAXHide);
if (ActiveDescendant())
cache.PostNotification(this, AXObjectCacheImpl::kAXChildrenChanged);
- cache.PostNotification(ActiveDescendant(),
- AXObjectCacheImpl::kAXMenuListItemUnselected);
+ cache.PostNotification(ActiveDescendant(),
+ AXObjectCacheImpl::kAXMenuListItemUnselected);
}
void AXMenuListPopup::DidShow() {

13
resources/patches/debian/warnings/multichar.patch Normal file
View File

@@ -0,0 +1,13 @@
description: crashpad relies on multicharacter integer assigments
author: Michael Gilbert <mgilbert@debian.org>
--- a/third_party/crashpad/crashpad/build/BUILD.gn
+++ b/third_party/crashpad/crashpad/build/BUILD.gn
@@ -20,6 +20,7 @@ import("crashpad_buildconfig.gni")
config("crashpad_is_in_chromium") {
if (crashpad_is_in_chromium) {
+ cflags = [ "-Wno-multichar" ]
defines = [ "CRASHPAD_IS_IN_CHROMIUM" ]
}
}

22
resources/patches/debian/warnings/null-destination.patch Normal file
View File

@@ -0,0 +1,22 @@
description: use stack_buf before possible branching (see gcc bug #83139)
author: Michael Gilbert <mgilbert@debian.org>
--- a/base/strings/stringprintf.cc
+++ b/base/strings/stringprintf.cc
@@ -61,14 +61,14 @@ static void StringAppendVT(StringType* d
int result = vsnprintfT(stack_buf, arraysize(stack_buf), format, ap_copy);
va_end(ap_copy);
- if (result >= 0 && result < static_cast<int>(arraysize(stack_buf))) {
+ int mem_length = static_cast<int>(arraysize(stack_buf));
+ if (result >= 0 && result < mem_length) {
// It fit.
dst->append(stack_buf, result);
return;
}
// Repeatedly increase buffer size until it fits.
- int mem_length = arraysize(stack_buf);
while (true) {
if (result < 0) {
#if defined(OS_WIN)

11
resources/patches/debian/warnings/sequence-point.patch
View File

@@ -12,3 +12,14 @@ author: Michael Gilbert <mgilbert@debian.org>
shared_quad_state = render_pass->CreateAndAppendSharedQuadState();
PopulateScaledSharedQuadState(shared_quad_state, device_scale_factor,
--- a/headless/lib/browser/protocol/browser_handler.cc
+++ b/headless/lib/browser/protocol/browser_handler.cc
@@ -71,7 +71,7 @@ Response BrowserHandler::Close() {
Response BrowserHandler::SetWindowBounds(
int window_id,
std::unique_ptr<Browser::Bounds> window_bounds) {
- HeadlessWebContentsImpl* web_contents = web_contents =
+ HeadlessWebContentsImpl* web_contents =
browser()->GetWebContentsForWindowId(window_id);
if (!web_contents)
return Response::Error("Browser window not found");