From d5dc900a073bd568a8d6e441d3f3f4f4e6afd65c Mon Sep 17 00:00:00 2001 From: Clickot Date: Sun, 28 Jan 2024 19:28:09 +0100 Subject: [PATCH] - upgrade to ungoogled-chromium 121.0.6167.85-1 - adjusted docker-build.sh and README because of the usage of prebuilt clang toolchain --- README.md | 7 +++---- docker-build.sh | 3 +-- docker/build.Dockerfile | 12 ++++++++++-- ungoogled-chromium | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1b0eb21..84e1bd0 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/docker-build.sh b/docker-build.sh index bd9c175..93c9c5b 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -5,7 +5,6 @@ GIT_SUBMODULE="ungoogled-chromium" RELEASE=${1:-'bullseye'} NODE_VERSION=${2:-'18'} -LLVM_VERSION=${3:-'18'} IMAGE="chromium-builder:${RELEASE}" @@ -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 "===============================================================" diff --git a/docker/build.Dockerfile b/docker/build.Dockerfile index b7b0b66..f9afff2 100644 --- a/docker/build.Dockerfile +++ b/docker/build.Dockerfile @@ -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 diff --git a/ungoogled-chromium b/ungoogled-chromium index 3bf3de3..223fe76 160000 --- a/ungoogled-chromium +++ b/ungoogled-chromium @@ -1 +1 @@ -Subproject commit 3bf3de344107c6c82e608bcf612c10dfa4bbc8dd +Subproject commit 223fe76bb263a216341739ce2ee333752642cf47