Skip to content

Commit

Permalink
- upgrade to ungoogled-chromium 121.0.6167.85-1
Browse files Browse the repository at this point in the history
- adjusted docker-build.sh and README because of the usage of prebuilt clang toolchain
  • Loading branch information
clickot committed Jan 28, 2024
1 parent e815303 commit d5dc900
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ execute `docker-build.sh` script in the root dir. This will
The script accepts the following params:
1. debian release (defaults to 'bullseye')
2. major llvm toolchain version (defaults to '18')
3. node version (defaults to '18')
2. node version (defaults to '18')

example: `./docker-build.sh bookworm 15 17`
example: `./docker-build.sh bookworm 17`

>Note that currently (starting from 120.xx) it seems chromium needs llvm 18 to complete the build successfully. Also, the `sysroot` feature with debian:bullseye is used to reach same compatibility as chromium itself. So you might face errors if you use other values than the defaults.
>Note that currently (starting from 120.xx) the `sysroot` feature with debian:bullseye is used to reach same compatibility as chromium itself. So it might be you face errors when executing chromium if you use other values than the defaults.
I do not recommend to call `build.sh` directly. This will only work if you have a debian or ubuntu installation with all the packages installed and at the same place in the filesystem on your machine as in the docker image. It's the idea behind this docker-based build that you do NOT need to manipulate your own linux installation to build ungoogled-chromium.

Expand Down
3 changes: 1 addition & 2 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ GIT_SUBMODULE="ungoogled-chromium"

RELEASE=${1:-'bullseye'}
NODE_VERSION=${2:-'18'}
LLVM_VERSION=${3:-'18'}

IMAGE="chromium-builder:${RELEASE}"

Expand All @@ -22,7 +21,7 @@ echo "==============================================================="
echo " docker build start at ${BUILD_START}"
echo "==============================================================="

cd ${BASE_DIR} && docker run -it -v ${BASE_DIR}:/repo ${IMAGE} /bin/bash -c "LLVM_VERSION=${LLVM_VERSION} /repo/build.sh"
cd ${BASE_DIR} && docker run -it -v ${BASE_DIR}:/repo ${IMAGE} /bin/bash -c "/repo/build.sh"

BUILD_END=$(date)
echo "==============================================================="
Expand Down
12 changes: 10 additions & 2 deletions docker/build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,20 @@ RUN apt-get -y update && apt-get -y upgrade
RUN apt-get -y install lsb-release wget software-properties-common gnupg

# add node repo (needed for bullseye to install nodejs > 12)
RUN wget -qO - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | tee /etc/apt/trusted.gpg.d/deb.nodesource.com.asc \
RUN wget -qO - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | tee /etc/apt/trusted.gpg.d/deb.nodesource.com.asc\
&& add-apt-repository "deb https://deb.nodesource.com/node_${NODE_VERSION}.x ${RELEASE} main"
RUN apt-get -y update && apt-get -y install nodejs && npm update -g npm

# install all remaining needed distro packages
RUN apt-get -y install bison debhelper desktop-file-utils flex gperf gsettings-desktop-schemas-dev imagemagick libasound2-dev libavcodec-dev libavformat-dev libavutil-dev libcap-dev libcups2-dev libcurl4-openssl-dev libdrm-dev libegl1-mesa-dev libelf-dev libevent-dev libexif-dev libflac-dev libgbm-dev libgcrypt20-dev libgl1-mesa-dev libgles2-mesa-dev libglew-dev libglib2.0-dev libglu1-mesa-dev libgtk-3-dev libhunspell-dev libjpeg-dev libjs-jquery-flot libjsoncpp-dev libkrb5-dev liblcms2-dev libminizip-dev libmodpbase64-dev libnspr4-dev libnss3-dev libopenjp2-7-dev libopus-dev libpam0g-dev libpci-dev libpipewire-0.3-dev libpng-dev libpulse-dev libre2-dev libsnappy-dev libspeechd-dev libudev-dev libusb-1.0-0-dev libva-dev libvpx-dev libwebp-dev libx11-xcb-dev libxcb-dri3-dev libxshmfence-dev libxslt1-dev libxss-dev libxt-dev libxtst-dev mesa-common-dev ninja-build pkg-config python3-jinja2 python3-setuptools python3-xcbgen python-is-python3 qtbase5-dev uuid-dev valgrind wdiff x11-apps xcb-proto xfonts-base xvfb xz-utils yasm
RUN apt-get -y install bison debhelper desktop-file-utils flex gperf gsettings-desktop-schemas-dev imagemagick\
libasound2-dev libavcodec-dev libavformat-dev libavutil-dev libcap-dev libcups2-dev libcurl4-openssl-dev libdrm-dev\
libegl1-mesa-dev libelf-dev libevent-dev libexif-dev libflac-dev libgbm-dev libgcrypt20-dev libgl1-mesa-dev libgles2-mesa-dev\
libglew-dev libglib2.0-dev libglu1-mesa-dev libgtk-3-dev libhunspell-dev libjpeg-dev libjs-jquery-flot libjsoncpp-dev\
libkrb5-dev liblcms2-dev libminizip-dev libmodpbase64-dev libnspr4-dev libnss3-dev libopenjp2-7-dev libopus-dev libpam0g-dev\
libpci-dev libpipewire-0.3-dev libpng-dev libpulse-dev libre2-dev libsnappy-dev libspeechd-dev libudev-dev libusb-1.0-0-dev\
libva-dev libvpx-dev libwebp-dev libx11-xcb-dev libxcb-dri3-dev libxshmfence-dev libxslt1-dev libxss-dev libxt-dev libxtst-dev\
mesa-common-dev ninja-build pkg-config python3-jinja2 python3-setuptools python3-xcbgen python-is-python3 qtbase5-dev uuid-dev\
valgrind wdiff x11-apps xcb-proto xfonts-base xvfb xz-utils yasm

# create and set workdir to mount in docker build
RUN mkdir /repo
Expand Down
2 changes: 1 addition & 1 deletion ungoogled-chromium
Submodule ungoogled-chromium updated 67 files
+1 −1 chromium_version.txt
+1 −0 docs/flags.md
+233 −261 domain_substitution.list
+6 −6 patches/core/bromite/disable-fetching-field-trials.patch
+46 −43 patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch
+10 −10 patches/core/inox-patchset/0003-disable-autofill-download-manager.patch
+1 −1 patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch
+1 −1 patches/core/inox-patchset/0021-disable-rlz.patch
+14 −14 patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch
+1 −1 patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch
+4 −4 patches/core/ungoogled-chromium/block-trk-and-subdomains.patch
+2 −2 patches/core/ungoogled-chromium/disable-crash-reporter.patch
+1 −1 patches/core/ungoogled-chromium/disable-gaia.patch
+25 −15 patches/core/ungoogled-chromium/disable-google-host-detection.patch
+3 −3 patches/core/ungoogled-chromium/disable-mei-preload.patch
+3 −3 patches/core/ungoogled-chromium/disable-privacy-sandbox.patch
+0 −164 patches/core/ungoogled-chromium/disable-web-environment-integrity.patch
+5 −5 patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch
+6 −6 patches/core/ungoogled-chromium/disable-webstore-urls.patch
+1 −1 patches/core/ungoogled-chromium/doh-changes.patch
+13 −12 patches/core/ungoogled-chromium/fix-building-with-prunned-binaries.patch
+190 −89 patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch
+393 −352 patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch
+8 −8 patches/core/ungoogled-chromium/toggle-translation-via-switch.patch
+16 −16 patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch
+8 −8 patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch
+4 −4 patches/extra/bromite/flag-max-connections-per-host.patch
+4 −4 patches/extra/inox-patchset/0006-modify-default-prefs.patch
+10 −5 patches/extra/inox-patchset/0008-restore-classic-ntp.patch
+1 −1 patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch
+1 −1 patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch
+1 −1 patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
+1 −1 patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch
+0 −39 patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch
+1 −1 patches/extra/iridium-browser/updater-disable-auto-update.patch
+8 −8 patches/extra/ungoogled-chromium/add-flag-for-close-confirmation.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-for-custom-ntp.patch
+4 −4 patches/extra/ungoogled-chromium/add-flag-for-disabling-link-drag.patch
+3 −3 patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch
+11 −11 patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-for-tab-hover-cards.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-disable-local-history-expiration.patch
+5 −5 patches/extra/ungoogled-chromium/add-flag-to-hide-extensions-menu.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-to-hide-fullscreen-exit-ui.patch
+3 −3 patches/extra/ungoogled-chromium/add-flag-to-hide-side-panel-button.patch
+2 −2 patches/extra/ungoogled-chromium/add-flag-to-hide-tab-close-buttons.patch
+4 −4 patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch
+1 −1 patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch
+6 −2 patches/extra/ungoogled-chromium/add-flags-for-existing-switches.patch
+9 −9 patches/extra/ungoogled-chromium/add-flags-for-referrer-customization.patch
+2 −2 patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch
+8 −8 patches/extra/ungoogled-chromium/add-suggestions-url-field.patch
+1 −1 patches/extra/ungoogled-chromium/add-ungoogled-flag-headers.patch
+7 −7 patches/extra/ungoogled-chromium/disable-download-quarantine.patch
+1 −1 patches/extra/ungoogled-chromium/disable-remote-optimization-guide.patch
+2 −2 patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch
+1 −1 patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch
+1 −1 patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch
+2 −2 patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch
+7 −12 patches/extra/ungoogled-chromium/first-run-page.patch
+1 −1 patches/extra/ungoogled-chromium/prepopulated-search-engines.patch
+25 −9 patches/extra/ungoogled-chromium/remove-uneeded-ui.patch
+0 −2 patches/series
+251 −9 pruning.list
+1 −0 utils/prune_binaries.py

0 comments on commit d5dc900

Please sign in to comment.