From 8a70a3d735d5855af9f2d2775b0312267ae96fca Mon Sep 17 00:00:00 2001 From: xiota Date: Sat, 6 Jan 2024 12:52:33 -0800 Subject: [PATCH] 119.0.6045.214 --- .SRCINFO | 24 ++++++++++------- PKGBUILD | 60 ++++++++++++++++++++++++----------------- thorium-browser.install | 18 ++++++++----- thorium-browser.sh | 11 ++++---- 4 files changed, 67 insertions(+), 46 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1ce687b4afbe9..ce5f7dd82ab60 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = thorium-browser-bin pkgdesc = Chromium fork focused on high performance and security - pkgver = 117.0.5938.157 - pkgrel = 5 + pkgver = 119.0.6045.214 + pkgrel = 2 url = https://github.com/Alex313031/Thorium install = thorium-browser.install arch = x86_64 @@ -10,23 +10,27 @@ pkgbase = thorium-browser-bin optdepends = kdialog: for file dialogs in KDE optdepends = kwallet5: for storing passwords in KWallet optdepends = pipewire: WebRTC desktop sharing under Wayland - noextract = thorium-browser_117.0.5938.157_amd64.deb + noextract = thorium-browser_119.0.6045.214_amd64.deb options = !emptydirs options = !strip - source = https://github.com/Alex313031/Thorium/releases/download/M117.0.5938.157/thorium-browser_117.0.5938.157_amd64.deb + source = https://github.com/Alex313031/Thorium/releases/download/M119.0.6045.214/thorium-browser_119.0.6045.214_amd64.deb source = thorium-browser.sh sha256sums = SKIP - sha256sums = 56ea0cd85fef5b61620c554aa8939c2f1c6b3fdb3d13d182167e66e9f884cdaa + sha256sums = 1e76ad0a1d9a8d5fa3aa4b049e2ef52de7c3c7745204c70f72fc9218eb38a738 pkgname = thorium-browser-bin depends = alsa-lib - depends = gtk3 + depends = at-spi2-core + depends = cairo + depends = dbus depends = libcups depends = libnotify - depends = libxss - depends = libxtst + depends = libxcomposite + depends = libxkbcommon + depends = libxrandr + depends = mesa + depends = nspr depends = nss - depends = ttf-liberation - depends = xdg-utils + depends = pango provides = thorium-browser conflicts = thorium-browser diff --git a/PKGBUILD b/PKGBUILD index a7665ac88f89e..8e7db41d9f6f6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,21 +3,17 @@ # Contributor: Dominik Adrian Grzywak # options -if [ ! -z "$_srcinfo" ] ; then - _autoupdate=false -elif [ -z "$_pkgver" ] ; then - : ${_autoupdate:=true} -else +if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ] ; then : ${_autoupdate:=false} +else + : ${_autoupdate:=true} fi -: ${_pkgver:=117.0.5938.157} - # basic info _pkgname="thorium-browser" pkgname="$_pkgname-bin" -pkgver=117.0.5938.157 -pkgrel=5 +pkgver=119.0.6045.214 +pkgrel=2 pkgdesc="Chromium fork focused on high performance and security" url="https://github.com/Alex313031/Thorium" license=('BSD') @@ -42,13 +38,14 @@ _main_package() { _dl_url="https://github.com/Alex313031/Thorium/releases/download/M${_pkgver:?}" _dl_filename="${_pkgname}_${_pkgver:?}_amd64.deb" noextract+=("$_dl_filename") + source=( "$_dl_url/$_dl_filename" "$_pkgname.sh" ) sha256sums=( 'SKIP' - '56ea0cd85fef5b61620c554aa8939c2f1c6b3fdb3d13d182167e66e9f884cdaa' + '1e76ad0a1d9a8d5fa3aa4b049e2ef52de7c3c7745204c70f72fc9218eb38a738' ) pkgver() { @@ -63,14 +60,28 @@ package() { depends+=( 'alsa-lib' - 'gtk3' + 'at-spi2-core' + 'cairo' + 'dbus' 'libcups' 'libnotify' # notify-send - 'libxss' - 'libxtst' + 'libxcomposite' + 'libxkbcommon' + 'libxrandr' + 'mesa' + 'nspr' 'nss' - 'ttf-liberation' - 'xdg-utils' + 'pango' + + ## implicit + #expat + #glib2 + #libdrm + #libx11 + #libxcb + #libxdamage + #libxext + #libxfixes ) echo " -> Extracting the archive..." @@ -119,23 +130,24 @@ package() { # update version _update_version() { - if [[ x"${_autoupdate::1}" != "xt" ]] ; then + : ${_pkgver:=${pkgver%%.r*}} + + if [[ "${_autoupdate::1}" != "t" ]] ; then return fi - _repo="${url#*//*/}" - _response=$(curl "https://api.github.com/repos/${_repo:?}/releases" -s) - - _regex='^.*thorium-browser_([0-9\.]+)_.*\.deb.*$' - _pkgver_new=$( + local _response=$(curl -Ssf "$url/releases.atom") + local _tag=$( printf '%s' "$_response" \ - | grep -E "$_regex" | head -1 | sed -E "s@$_regex@\1@" + | grep -E '"https://.*/releases/tag/.*"' \ + | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ + | grep -Ev '[a-z]{2}' | sort -rV | head -1 ) + local _pkgver_new="${_tag#M}" # update _pkgver - if [ x"$_pkgver" != x"${_pkgver_new:?}" ] ; then + if [ "$_pkgver" != "${_pkgver_new:?}" ] ; then _pkgver="${_pkgver_new:?}" - sed -Ei 's@^(\s*: \$\{_pkgver):=.*\}$@\1:='"${_pkgver:?}"'}@' "$startdir/PKGBUILD" fi } diff --git a/thorium-browser.install b/thorium-browser.install index 0382ff2fe1d18..6d53b444df4d7 100644 --- a/thorium-browser.install +++ b/thorium-browser.install @@ -3,10 +3,14 @@ msg_blue() { printf "${BLUE}==>${BOLD} $1${ALL_OFF}\n" } -note() { +note1() { printf "${BLUE}==>${YELLOW} NOTE:${BOLD} $1${ALL_OFF}\n" } +note2() { + printf "${BLUE}==> ${BOLD} $1${ALL_OFF}\n" +} + ALL_OFF="$(tput sgr0)" BOLD="${ALL_OFF}$(tput bold)" BLACK="${BOLD}$(tput setaf 0)" @@ -20,14 +24,14 @@ WHITE="${BOLD}$(tput setaf 7)" post_install() { if /usr/lib/ld-linux-x86-64.so.2 --help | grep -qsE '^\s+x86-64-v3.*supported.*$' ; then - note "Custom flags should be put directly in: ~/.config/thorium-flags.conf" - note "The launcher is called: 'thorium-browser'" + note1 "Custom flags should be put directly in: ~/.config/thorium-flags.conf" + note2 "The launcher is called: 'thorium-browser'" elif /usr/lib/ld-linux-x86-64.so.2 --help | grep -qsE '^\s+x86-64-v2.*supported.*$' ; then - note "Your processor supports x86-64-v2, but not x86-64-v3." - note "You may want to install thorium-browser-sse3-bin instead." + note1 "Your processor supports x86-64-v2, but not x86-64-v3." + note2 "You may want to install thorium-browser-sse3-bin instead." else - note "Your processor does not support x86-64-v2 or x86-64-v3." - note "thorium-browser may not work on your computer." + note1 "Your processor does not support x86-64-v2 or x86-64-v3." + note2 "thorium-browser may not work on your computer." fi } diff --git a/thorium-browser.sh b/thorium-browser.sh index 9e9465475f246..a2c2e20f6b97f 100644 --- a/thorium-browser.sh +++ b/thorium-browser.sh @@ -14,11 +14,12 @@ else _message+=$'thorium-browser may not work on your computer.' fi -XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config} - # Allow users to override command-line options -if [[ -f "$XDG_CONFIG_HOME/thorium-flags.conf" ]]; then - THORIUM_USER_FLAGS="$(cat $XDG_CONFIG_HOME/thorium-flags.conf)" +XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config} +_FLAGS_FILE="$XDG_CONFIG_HOME/thorium-flags.conf" + +if [[ -f "$_FLAGS_FILE" ]]; then + _USER_FLAGS="$(cat "$_FLAGS_FILE")" fi # display processor support message @@ -29,4 +30,4 @@ else fi # Launch -exec /opt/thorium-browser/thorium-browser $THORIUM_USER_FLAGS "$@" +exec /opt/thorium-browser/thorium-browser $_USER_FLAGS "$@"