From 7a442b35ac437073d8befb52835ad5517675b0ab Mon Sep 17 00:00:00 2001 From: xiota Date: Thu, 9 May 2024 02:39:47 +0000 Subject: [PATCH] update blacklist --- PKGBUILD | 22 ++++-- PKGBUILD.avx | 1 + PKGBUILD.avx2 | 1 + PKGBUILD.i386 | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD.sse3 | 1 + 5 files changed, 217 insertions(+), 7 deletions(-) create mode 100644 PKGBUILD.i386 diff --git a/PKGBUILD b/PKGBUILD index 01cea2bca1ca5..7b7f8d1044f8e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -157,15 +157,23 @@ _update_version() { if [[ "${_autoupdate::1}" != "t" ]]; then return fi + local _blacklist _response _tags _tag _pkgver_new - local _response=$(curl -Ssf "$url/releases.atom") - local _tag=$( - printf '%s' "$_response" \ - | grep -E '"https://.*/releases/tag/.*"' \ - | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ - | grep -Ev '[a-z]{2}' | sort -rV | head -1 + _blacklist=( + 123.0.6312.134 ) - local _pkgver_new="${_tag#M}" + _response=$(curl -Ssf "$url/releases.atom") + _tags=$( + printf '%s' "$_response" \ + | grep '/releases/tag/' \ + | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ + | grep -Ev '[a-z]{2}' + ) + for i in "${_blacklist[@]}"; do + _tags=${_tags/$i/} + done + _tag=$(printf '%s' "$_tags" | sort -rV | head -1) + _pkgver_new="${_tag#M}" # update _pkgver if [ "$_pkgver" != "${_pkgver_new:?}" ]; then diff --git a/PKGBUILD.avx b/PKGBUILD.avx index 43c1782c00b8b..295407ad1bcc2 100644 --- a/PKGBUILD.avx +++ b/PKGBUILD.avx @@ -193,6 +193,7 @@ _update_version() { local _blacklist _response _tags _tag _pkgver_new _blacklist=( + 123.0.6312.134 ) _response=$(curl -Ssf "$url/releases.atom") _tags=$( diff --git a/PKGBUILD.avx2 b/PKGBUILD.avx2 index 224a5b1aa1ba4..1221b6c3af967 100644 --- a/PKGBUILD.avx2 +++ b/PKGBUILD.avx2 @@ -193,6 +193,7 @@ _update_version() { local _blacklist _response _tags _tag _pkgver_new _blacklist=( + 123.0.6312.134 119.0.6045.214-2 # 32-bit SSE2 119.0.6045.214-1 # Windows ) diff --git a/PKGBUILD.i386 b/PKGBUILD.i386 new file mode 100644 index 0000000000000..9001f0f23013e --- /dev/null +++ b/PKGBUILD.i386 @@ -0,0 +1,199 @@ +# Maintainer: + +# options +if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ]; then + : ${_autoupdate:=false} +else + : ${_autoupdate:=true} +fi + +# basic info +_pkgname="thorium-browser-i386" +pkgname="$_pkgname-bin" +pkgver=123.0.6312.134 +pkgrel=1 +pkgdesc="Chromium fork focused on high performance and security" +url="https://github.com/Alex313031/Thorium" +license=('BSD') +arch=('i386') + +# main package +_main_package() { + _update_version + + depends=() + makedepends=() + + options=('!emptydirs' '!strip' '!debug') + + _dl_url="$url/releases/download/M${_pkgver:?}" + _dl_filename="${_pkgname%-i386}_${_pkgver:?}_i386.deb" + noextract+=("$_dl_filename") + + source=("$_dl_url/$_dl_filename") + sha256sums=('SKIP') + + pkgver() { + echo "${_pkgver:?}" + } +} + +# common functions +prepare() { + install -Dvm644 /dev/stdin "$_pkgname.sh" << END +#!/usr/bin/env bash + +# Allow users to override command-line options +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 + +# Launch +exec /opt/$_pkgname/thorium-browser \$_USER_FLAGS "\$@" +END +} + +package() { + provides=("$_pkgname") + conflicts=("$_pkgname") + + depends+=( + 'alsa-lib' + 'at-spi2-core' + 'cairo' + 'dbus' + 'libcups' + 'libxcomposite' + 'libxkbcommon' + 'libxrandr' + 'mesa' + 'nspr' + 'nss' + 'pango' + + ## implicit + #expat + #glib2 + #libdrm + #libx11 + #libxcb + #libxdamage + #libxext + #libxfixes + ) + + echo " -> Extracting the archive..." + bsdtar -xf "$_dl_filename" data.tar.xz + bsdtar -xf data.tar.xz -C "$pkgdir/" + rm data.tar.xz + + echo " -> Moving files in place..." + mv "$pkgdir/opt/chromium.org/thorium" "$pkgdir/opt/$_pkgname" + unlink "$pkgdir/usr/bin/thorium-browser" + unlink "$pkgdir/usr/bin/pak" + + # thorium-browser + install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" + chmod 4755 "$pkgdir/opt/$_pkgname/chrome-sandbox" + + # thorium-shell + sed -E \ + -e "s@/opt/chromium.org/thorium/@/opt/$_pkgname/@" \ + -i "$pkgdir/usr/bin/thorium-shell" + + mv "$pkgdir/usr/bin/thorium-shell" "$pkgdir/usr/bin/thorium-shell-${_pkgname: -4}" + + # thorium-browser.xml + sed -E \ + -e "s@thorium-browser@$_pkgname@" \ + -e "s@/opt/chromium.org/thorium/@/opt/$_pkgname/@" \ + -i "$pkgdir/usr/share/gnome-control-center/default-apps/thorium-browser.xml" + + mv "$pkgdir/usr/share/gnome-control-center/default-apps/thorium-browser.xml" "$pkgdir/usr/share/gnome-control-center/default-apps/$_pkgname.xml" + + # thorium-browser.appdata.xml + sed -E \ + -e "s@thorium-browser@$_pkgname@" \ + -i "$pkgdir/usr/share/appdata/thorium-browser.appdata.xml" + + mv "$pkgdir/usr/share/appdata/thorium-browser.appdata.xml" "$pkgdir/usr/share/appdata/$_pkgname.appdata.xml" + + # thorium-browser.desktop + sed -E \ + -e "s@thorium-browser@$_pkgname@" \ + -e "s@thorium-shell@thorium-shell-${_pkgname: -4}@" \ + -e "s@^(Name\S*=.*)\$@\1 i386@" \ + -e "s@^(GenericName\S*=.*)\$@\1 i386@" \ + -i "$pkgdir/usr/share/applications/thorium-browser.desktop" + + mv "$pkgdir/usr/share/applications/thorium-browser.desktop" "$pkgdir/usr/share/applications/$_pkgname.desktop" + + # thorium-shell.desktop + sed -E \ + -e "s@^Icon=.*\$@Icon=thorium-shell-${_pkgname: -4}@" \ + -e "s@thorium-shell@thorium-shell-${_pkgname: -4}@" \ + -e "s@thorium_shell@thorium_shell_${_pkgname: -4}@" \ + -e "s@^(Name\S*=.*)\$@\1 i386@" \ + -e "s@^(GenericName\S*=.*)\$@\1 i386@" \ + -i "$pkgdir/usr/share/applications/thorium-shell.desktop" + + mv "$pkgdir/usr/share/applications/thorium-shell.desktop" "$pkgdir/usr/share/applications/thorium-shell-${_pkgname: -4}.desktop" + + # man page + mv "$pkgdir/usr/share/man/man1/thorium-browser.1.gz" "$pkgdir/usr/share/man/man1/$_pkgname.1.gz" + + # Icons + for i in 16 24 32 48 64 128 256; do + install -Dm644 "$pkgdir/opt/$_pkgname/product_logo_${i}.png" \ + "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgname.png" + done + + install -Dm644 "$pkgdir/opt/$_pkgname/thorium_shell.png" \ + "$pkgdir/usr/share/icons/hicolor/256x256/apps/thorium-shell-${_pkgname: -4}.png" + + # clean-up + echo " -> Removing Debian Cron job, duplicate product logos and menu directory..." + rm -r -- \ + "$pkgdir/opt/chromium.org" \ + "$pkgdir/etc/cron.daily/" \ + "$pkgdir/usr/share/doc/" \ + "$pkgdir/opt/$_pkgname/cron/" \ + "$pkgdir/opt/$_pkgname"/product_logo_*.{png,xpm} \ + "$pkgdir/usr/share/menu/" +} + +# update version +_update_version() { + : ${_pkgver:=${pkgver%%.r*}} + + if [[ "${_autoupdate::1}" != "t" ]]; then + return + fi + local _blacklist _response _tags _tag _pkgver_new + + _blacklist=( + ) + _response=$(curl -Ssf "$url/releases.atom") + _tags=$( + printf '%s' "$_response" \ + | grep '/releases/tag/' \ + | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ + | grep -Ev '[a-z]{2}' + ) + for i in "${_blacklist[@]}"; do + _tags=${_tags/$i/} + done + _tag=$(printf '%s' "$_tags" | sort -rV | head -1) + _pkgver_new="${_tag#M}" + + # update _pkgver + if [ "$_pkgver" != "${_pkgver_new:?}" ]; then + _pkgver="${_pkgver_new:?}" + fi +} + +# execute +_main_package diff --git a/PKGBUILD.sse3 b/PKGBUILD.sse3 index 5af9520c75140..8d498492bce7a 100644 --- a/PKGBUILD.sse3 +++ b/PKGBUILD.sse3 @@ -193,6 +193,7 @@ _update_version() { local _blacklist _response _tags _tag _pkgver_new _blacklist=( + 123.0.6312.134 ) _response=$(curl -Ssf "$url/releases.atom") _tags=$(