From 845d83d71f7fccf4287725fc0ba30516bee8f04e Mon Sep 17 00:00:00 2001 From: xiota Date: Fri, 19 Apr 2024 07:07:48 +0000 Subject: [PATCH] remove opt deps --- .SRCINFO | 4 ---- PKGBUILD | 16 +++++----------- PKGBUILD.avx | 20 +++++++------------- PKGBUILD.avx2 | 20 +++++++------------- PKGBUILD.sse3 | 20 +++++++------------- thorium-browser.install | 4 ++-- 6 files changed, 28 insertions(+), 56 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6a424e3866b50..d6ca8e49e444d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -6,10 +6,6 @@ pkgbase = thorium-browser-bin install = thorium-browser.install arch = x86_64 license = BSD - optdepends = gnome-keyring: for storing passwords in GNOME keyring - optdepends = kdialog: for file dialogs in KDE - optdepends = kwallet5: for storing passwords in KWallet - optdepends = pipewire: WebRTC desktop sharing under Wayland noextract = thorium-browser_122.0.6261.132_SSE3.deb options = !emptydirs options = !strip diff --git a/PKGBUILD b/PKGBUILD index e268d7fda7097..85a701d99a03c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Dominik Adrian Grzywak # options -if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ] ; then +if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ]; then : ${_autoupdate:=false} else : ${_autoupdate:=true} @@ -25,12 +25,6 @@ _main_package() { depends=() makedepends=() - optdepends=( - 'gnome-keyring: for storing passwords in GNOME keyring' - 'kdialog: for file dialogs in KDE' - 'kwallet5: for storing passwords in KWallet' - 'pipewire: WebRTC desktop sharing under Wayland' - ) options=('!emptydirs' '!strip') install="$_pkgname.install" @@ -49,7 +43,7 @@ _main_package() { # common functions prepare() { - install -Dvm644 /dev/stdin "$_pkgname.sh" < Removing Debian Cron job, duplicate product logos and menu directory..." rm -r -- \ - "$pkgdir/opt/chromium.org" \ + "$pkgdir/opt/chromium.org" \ "$pkgdir/etc/cron.daily/" \ "$pkgdir/usr/share/doc/" \ "$pkgdir/opt/$_pkgname/cron/" \ @@ -160,7 +154,7 @@ package() { _update_version() { : ${_pkgver:=${pkgver%%.r*}} - if [[ "${_autoupdate::1}" != "t" ]] ; then + if [[ "${_autoupdate::1}" != "t" ]]; then return fi @@ -174,7 +168,7 @@ _update_version() { local _pkgver_new="${_tag#M}" # update _pkgver - if [ "$_pkgver" != "${_pkgver_new:?}" ] ; then + if [ "$_pkgver" != "${_pkgver_new:?}" ]; then _pkgver="${_pkgver_new:?}" fi } diff --git a/PKGBUILD.avx b/PKGBUILD.avx index 6d6817fb2542f..f9459285217bc 100644 --- a/PKGBUILD.avx +++ b/PKGBUILD.avx @@ -1,7 +1,7 @@ # Maintainer: # options -if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ] ; then +if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ]; then : ${_autoupdate:=false} else : ${_autoupdate:=true} @@ -23,12 +23,6 @@ _main_package() { depends=() makedepends=() - optdepends=( - 'gnome-keyring: for storing passwords in GNOME keyring' - 'kdialog: for file dialogs in KDE' - 'kwallet5: for storing passwords in KWallet' - 'pipewire: WebRTC desktop sharing under Wayland' - ) options=('!emptydirs' '!strip' '!debug') @@ -46,7 +40,7 @@ _main_package() { # common functions prepare() { - install -Dvm644 /dev/stdin "$_pkgname.sh" < Removing Debian Cron job, duplicate product logos and menu directory..." rm -r -- \ - "$pkgdir/opt/chromium.org" \ + "$pkgdir/opt/chromium.org" \ "$pkgdir/etc/cron.daily/" \ "$pkgdir/usr/share/doc/" \ "$pkgdir/opt/$_pkgname/cron/" \ @@ -193,7 +187,7 @@ package() { _update_version() { : ${_pkgver:=${pkgver%%.r*}} - if [[ "${_autoupdate::1}" != "t" ]] ; then + if [[ "${_autoupdate::1}" != "t" ]]; then return fi local _blacklist _response _tags _tag _pkgver_new @@ -207,14 +201,14 @@ _update_version() { | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ | grep -Ev '[a-z]{2}' ) - for i in "${_blacklist[@]}" ; do - _tags=${_tags/$i} + 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 + if [ "$_pkgver" != "${_pkgver_new:?}" ]; then _pkgver="${_pkgver_new:?}" fi } diff --git a/PKGBUILD.avx2 b/PKGBUILD.avx2 index 7d50da28056ad..941156b27e932 100644 --- a/PKGBUILD.avx2 +++ b/PKGBUILD.avx2 @@ -1,7 +1,7 @@ # Maintainer: # options -if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ] ; then +if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ]; then : ${_autoupdate:=false} else : ${_autoupdate:=true} @@ -23,12 +23,6 @@ _main_package() { depends=() makedepends=() - optdepends=( - 'gnome-keyring: for storing passwords in GNOME keyring' - 'kdialog: for file dialogs in KDE' - 'kwallet5: for storing passwords in KWallet' - 'pipewire: WebRTC desktop sharing under Wayland' - ) options=('!emptydirs' '!strip' '!debug') @@ -46,7 +40,7 @@ _main_package() { # common functions prepare() { - install -Dvm644 /dev/stdin "$_pkgname.sh" < Removing Debian Cron job, duplicate product logos and menu directory..." rm -r -- \ - "$pkgdir/opt/chromium.org" \ + "$pkgdir/opt/chromium.org" \ "$pkgdir/etc/cron.daily/" \ "$pkgdir/usr/share/doc/" \ "$pkgdir/opt/$_pkgname/cron/" \ @@ -193,7 +187,7 @@ package() { _update_version() { : ${_pkgver:=${pkgver%%.r*}} - if [[ "${_autoupdate::1}" != "t" ]] ; then + if [[ "${_autoupdate::1}" != "t" ]]; then return fi local _blacklist _response _tags _tag _pkgver_new @@ -209,14 +203,14 @@ _update_version() { | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ | grep -Ev '[a-z]{2}' ) - for i in "${_blacklist[@]}" ; do - _tags=${_tags/$i} + 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 + if [ "$_pkgver" != "${_pkgver_new:?}" ]; then _pkgver="${_pkgver_new:?}" fi } diff --git a/PKGBUILD.sse3 b/PKGBUILD.sse3 index 21906090d673a..64da20f8a84c4 100644 --- a/PKGBUILD.sse3 +++ b/PKGBUILD.sse3 @@ -1,7 +1,7 @@ # Maintainer: # options -if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ] ; then +if [ -n "$_srcinfo" ] || [ -n "$_pkgver" ]; then : ${_autoupdate:=false} else : ${_autoupdate:=true} @@ -23,12 +23,6 @@ _main_package() { depends=() makedepends=() - optdepends=( - 'gnome-keyring: for storing passwords in GNOME keyring' - 'kdialog: for file dialogs in KDE' - 'kwallet5: for storing passwords in KWallet' - 'pipewire: WebRTC desktop sharing under Wayland' - ) options=('!emptydirs' '!strip' '!debug') @@ -46,7 +40,7 @@ _main_package() { # common functions prepare() { - install -Dvm644 /dev/stdin "$_pkgname.sh" < Removing Debian Cron job, duplicate product logos and menu directory..." rm -r -- \ - "$pkgdir/opt/chromium.org" \ + "$pkgdir/opt/chromium.org" \ "$pkgdir/etc/cron.daily/" \ "$pkgdir/usr/share/doc/" \ "$pkgdir/opt/$_pkgname/cron/" \ @@ -193,7 +187,7 @@ package() { _update_version() { : ${_pkgver:=${pkgver%%.r*}} - if [[ "${_autoupdate::1}" != "t" ]] ; then + if [[ "${_autoupdate::1}" != "t" ]]; then return fi local _blacklist _response _tags _tag _pkgver_new @@ -207,14 +201,14 @@ _update_version() { | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ | grep -Ev '[a-z]{2}' ) - for i in "${_blacklist[@]}" ; do - _tags=${_tags/$i} + 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 + if [ "$_pkgver" != "${_pkgver_new:?}" ]; then _pkgver="${_pkgver_new:?}" fi } diff --git a/thorium-browser.install b/thorium-browser.install index 89fbe77d7c0b9..3f5b2bbb2b706 100644 --- a/thorium-browser.install +++ b/thorium-browser.install @@ -4,11 +4,11 @@ msg_blue() { } note1() { - printf "${BLUE}==>${YELLOW} NOTE:${BOLD} $1${ALL_OFF}\n" + printf "${BLUE}==>${YELLOW} NOTE:${WHITE} $1${ALL_OFF}\n" } note2() { - printf "${BLUE}==> ${BOLD} $1${ALL_OFF}\n" + printf "${BLUE}==> ${WHITE} $1${ALL_OFF}\n" } ALL_OFF="$(tput sgr0)"