Merge branch 'master' of github.com:Eloston/ungoogled-chromium

Author: llebout

.cirrus.yml

@@ -4,8 +4,8 @@ container:
 code_check_task:
     pip_cache:
         folder: ~/.cache/pip
-        populate_script: pip install pylint requests yapf
-    pip_install_script: pip install pylint requests yapf
+        fingerprint_script: cat .cirrus_requirements.txt
+        populate_script: pip install -r .cirrus_requirements.txt
     utils_script:
         - python3 -m yapf --style '.style.yapf' -e '*/third_party/*' -rpd utils
         - ./devutils/run_utils_pylint.py --hide-fixme

.cirrus_Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile for Python 3 with xz-utils (for tar.xz unpacking)
 
-FROM python:3.5-slim
+FROM python:3.7-slim
 
 RUN apt update && apt install -y xz-utils

.cirrus_requirements.txt

@@ -0,0 +1,5 @@
+# Based on Python package versions in Debian buster
+astroid==2.1.0 # via pylint
+pylint==2.2.2
+requests==2.21.0
+yapf==0.25.0

README.md

@@ -23,9 +23,7 @@
 * [Motivation and Philosophy](#motivation-and-philosophy)
 * [Feature Overview](#feature-overview)
 * [**Downloads**](#downloads)
-    * [Software Repositories](#software-repositories)
-    * [Contributor Binaries](#contributor-binaries)
-    * [Source Code](#source-code)
+* [Source Code](#source-code)
 * [**FAQ**](#faq)
 * [Building Instructions](#building-instructions)
 * [Design Documentation](#design-documentation)
@@ -103,34 +101,21 @@ Other platforms are discussed and tracked in this repository's Issue Tracker. Le
 
 ## Downloads
 
-*To download and run ungoogled-chromium:*
+[**Download binaries from here**](//ungoogled-software.github.io/ungoogled-chromium-binaries/)
 
-* Download from [Software Repositories](#software-repositories) if your system is supported.
-* Otherwise, download [Contributor Binaries](#contributor-binaries).
+*NOTE: These binaries are provided by anyone who are willing to build and submit them. Because these binaries are not necessarily [reproducible](https://reproducible-builds.org/), authenticity cannot be guaranteed; In other words, there is always a non-zero probability that these binaries may have been tampered with. In the unlikely event that this has happened to you, please [report it in a new issue](#contributing-reporting-contacting).*
 
-To build ungoogled-chromium, see [Source Code](#source-code).
+These binaries are known as **contributor binaries**.
 
-### Software Repositories
-
-*Install and run ungoogled-chromium from a software repository:*
+Also, ungoogled-chromium is available in several **software repositories**:
 
 * Arch Linux: [Available in AUR as `ungoogled-chromium`](https://aur.archlinux.org/packages/ungoogled-chromium/)
     * NOTE: `ungoogled-chromium-bin` is *not* officially part of ungoogled-chromium. Please submit all issues to the maintainer of the PKGBUILD.
 * Gentoo Linux: [`::chaoslab`](https://gitlab.com/chaoslab/chaoslab-overlay) overlay maintains an *unofficial*  [`ungoogled-chromium`](https://gitlab.com/chaoslab/chaoslab-overlay/tree/master/www-client/ungoogled-chromium) ebuild.
 * GNU Guix: Available as `ungoogled-chromium`.
 * macOS cask: Available as `eloston-chromium`
 
-### Contributor Binaries
-
-*Download, install, and run ungoogled-chromium from machine code provided by volunteers.*
-
-[**Download from here**](//ungoogled-software.github.io/ungoogled-chromium-binaries/)
-
-**IMPORTANT**: These binaries are provided by anyone who are willing to build and submit them. Because these binaries are not necessarily [reproducible](https://reproducible-builds.org/), authenticity cannot be guaranteed; In other words, there is always a non-zero probability that these binaries may have been tampered with. In the unlikely event that this has happened to you, please [report it in a new issue](#contributing-reporting-contacting).
-
-To contribute binaries, [consult the instructions in the ungoogled-chromium-binaries repository](//github.com/ungoogled-software/ungoogled-chromium-binaries)
-
-### Source Code
+## Source Code
 
 This repository contains the common code for all platforms. To build ungoogled-chromium for a specific platform, [consult the repository for that plaform](docs/platforms.md).
 

chromium_version.txt

@@ -1 +1 @@
-73.0.3683.86
+73.0.3683.103

devutils/check_patch_files.py

@@ -23,7 +23,7 @@
 from third_party import unidiff
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent / 'utils'))
-from _common import ENCODING, get_logger
+from _common import ENCODING, get_logger, parse_series
 sys.path.pop(0)
 
 # File suffixes to ignore for checking unused patches
@@ -39,9 +39,7 @@ def _read_series_file(patches_dir, series_file, join_dir=False):
 
     join_dir indicates if the patches_dir should be joined with the series entries
     """
-    with (patches_dir / series_file).open(encoding=ENCODING) as file_obj:
-        series_entries = filter(len, file_obj.read().splitlines())
-    for entry in series_entries:
+    for entry in parse_series(patches_dir / series_file):
         if join_dir:
             yield patches_dir / entry
         else:

devutils/update_platform_patches.py

@@ -106,16 +106,21 @@ def unmerge_platform_patches(platform_patches_dir):
         get_logger().error('Unable to find series.orig at: %s', platform_patches_dir / _SERIES_ORIG)
         return False
     orig_series = (platform_patches_dir / _SERIES_ORIG).read_text(encoding=ENCODING).splitlines()
-    # patch path -> number of following blank lines
-    path_spaces = dict()
+    # patch path -> list of lines after patch path and before next patch path
+    path_comments = dict()
+    # patch path -> inline comment for patch
+    path_inline_comments = dict()
     previous_path = None
     for partial_path in orig_series:
-        if partial_path:
-            previous_path = partial_path
-        elif previous_path in path_spaces:
-            path_spaces[previous_path] += 1
+        if not partial_path or partial_path.startswith('#'):
+            if partial_path not in path_comments:
+                path_comments[previous_path] = list()
+            path_comments[previous_path].append(partial_path)
         else:
-            path_spaces[previous_path] = 1
+            path_parts = partial_path.split(' #', maxsplit=1)
+            previous_path = path_parts[0]
+            if len(path_parts) == 2:
+                path_inline_comments[path_parts[0]] = path_parts[1]
 
     # Apply changes on series.merged into a modified version of series.orig
     if not (platform_patches_dir / _SERIES_MERGED).exists():
@@ -128,8 +133,11 @@ def unmerge_platform_patches(platform_patches_dir):
     new_series = list(new_series)
     series_index = 0
     while series_index < len(new_series):
-        if new_series[series_index] in path_spaces:
-            new_series.insert(series_index + 1, '\n' * (path_spaces[new_series[series_index]] - 1))
+        current_path = new_series[series_index]
+        if current_path in path_inline_comments:
+            new_series[series_index] = current_path + ' #' + path_inline_comments[current_path]
+        if current_path in path_comments:
+            new_series.insert(series_index + 1, '\n'.join(path_comments[current_path]))
             series_index += 1
         series_index += 1
 

devutils/validate_patches.py

@@ -26,7 +26,7 @@
 
 sys.path.insert(0, str(Path(__file__).resolve().parent.parent / 'utils'))
 from domain_substitution import TREE_ENCODINGS
-from _common import ENCODING, get_logger, get_chromium_version
+from _common import ENCODING, get_logger, get_chromium_version, parse_series
 sys.path.pop(0)
 
 try:
@@ -600,13 +600,6 @@ def _get_files_under_test(args, required_files, parser):
     return files_under_test
 
 
-def _get_series_iterable(series_path):
-    """Returns an iterable of the relative patch paths in the series file"""
-    with series_path.open(encoding=ENCODING) as series_file:
-        series_iter = filter(len, map(str.strip, series_file.read().splitlines()))
-        return tuple(series_iter)
-
-
 def main():
     """CLI Entrypoint"""
     parser = argparse.ArgumentParser(description=__doc__)
@@ -664,7 +657,7 @@ def main():
     else:
         get_logger(initial_level=logging.INFO)
 
-    series_iterable = _get_series_iterable(args.series)
+    series_iterable = tuple(parse_series(args.series))
     patch_cache = _load_all_patches(series_iterable, args.patches)
     required_files = _get_required_files(patch_cache)
     files_under_test = _get_files_under_test(args, required_files, parser)

docs/building.md

@@ -6,13 +6,15 @@ The recommended way to build ungoogled-chromium is by consulting [the repository
 
 * *Linux users*: If your distribution is not listed, you will need to use Portable Linux.
 
-If you want to make a custom build, you will need to develop your own build process. *Beware that this may be a time-consuming process.* The easiest way to do this is to modify an existing platform's code, like Portable Linux. Additionally, you may have a look at the example below for some inspiration.
+If you want to know how to use ungoogled-chromium's build process in your own Chromium builds, you may have a look at the rough example below. Additionally, you may reference the repositories for supported platforms for inspiration.
 
 ## Rough example
 
-**NOTE: These are for users who want to make a custom build.** You should already be familiar with the [standard Chromium build process](https://chromium.googlesource.com/chromium/src/+/lkgr/docs/get_the_code.md), and [ungoogled-chromium's design documentation](design.md).
+**NOTE: This example is intended only for users who want to learn how ungoogled-chromium's build process works.** If you are simply trying to build and run ungoogled-chromium, please consult the [repository for your supported platform](platforms.md).
 
-The following example demonstrates a typical build process. Please note that these steps alone may not be sufficient to get a working build.
+In order to get a working build from this example, you will need to develop your own build process. **This may be a time-consuming process.** Before continuing, you should be familiar with the [standard Chromium build process](https://chromium.googlesource.com/chromium/src/+/lkgr/docs/get_the_code.md), and [ungoogled-chromium's design documentation](design.md).
+
+The following example demonstrates a typical build process. Please note that these steps alone will probably not be sufficient to get a working build.
 
 1. Download and unpack the source code:
 
@@ -46,7 +48,7 @@ mkdir -p build/download_cache
 mkdir -p build/src/out/Default
 cp flags.gn build/src/out/Default/args.gn
 cd build/src
-./tools/gn/bootstrap.py --skip-generate-buildfiles -j4 -o out/Default/gn
+./tools/gn/bootstrap/bootstrap.py --skip-generate-buildfiles -j4 -o out/Default/gn
 ```
 
 6. Build Chromium:

docs/design.md

@@ -64,6 +64,8 @@ All of ungoogled-chromium's patches for the Chromium source code are located in
 
 * All patches must reside inside `patches/`
 * There is a `patches/series` text file that defines the order to apply all the patches. These patches are listed as a relative path from the `patches` directory.
+    * Lines starting with the pound symbol (`#`) are ignored
+    * For lines with patch paths: If there is a space followed by a pound symbol, the text after the patch path will be ignored.
 
 All patch files in ungoogled-chromium must satisfy these formatting requirements: