[arch-commits] Commit in vivaldi/trunk (2 files)

[Ike Devolder]

    Date: Monday, January 24, 2022 @ 19:33:55
  Author: idevolder
Revision: 1114875

upgpkg: vivaldi 5.0.2497.48-2

Added:
  vivaldi/trunk/0001-add-support-for-user-flags.patch
Modified:
  vivaldi/trunk/PKGBUILD

---------------------------------------+
 0001-add-support-for-user-flags.patch |   37 ++++++++++++++++++++++++++++++++
 PKGBUILD                              |   17 +++++++++++---
 2 files changed, 50 insertions(+), 4 deletions(-)

Added: 0001-add-support-for-user-flags.patch
===================================================================
--- 0001-add-support-for-user-flags.patch	                        (rev 0)
+++ 0001-add-support-for-user-flags.patch	2022-01-24 19:33:55 UTC (rev 1114875)
@@ -0,0 +1,37 @@
+From 68c2dec905a7c88895c458dd40708ab9989385cf Mon Sep 17 00:00:00 2001
+From: BlackEagle <ike.devolder at gmail.com>
+Date: Wed, 19 Jan 2022 20:57:58 +0100
+Subject: [PATCH] add support for user flags
+
+Signed-off-by: BlackEagle <ike.devolder at gmail.com>
+---
+ vivaldi-stable | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/vivaldi-stable b/vivaldi-stable
+index 5b5f1bf..8e95859 100755
+--- a/vivaldi-stable
++++ b/vivaldi-stable
+@@ -53,6 +53,13 @@ export CHROME_VERSION_EXTRA="stable"
+ # We don't want bug-buddy intercepting our crashes. http://crbug.com/24120
+ export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME
+ 
++# Allow users to override command-line options
++XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-$HOME/.config}
++VIVALDI_USER_FLAGS=""
++if [[ -f "$XDG_CONFIG_HOME/vivaldi-$CHROME_VERSION_EXTRA.conf" ]]; then
++   VIVALDI_USER_FLAGS="$(cat "$XDG_CONFIG_HOME/vivaldi-$CHROME_VERSION_EXTRA.conf")"
++fi
++
+ # Sanitize std{in,out,err} because they'll be shared with untrusted child
+ # processes (http://crbug.com/376567).
+ exec < /dev/null
+@@ -60,4 +67,4 @@ exec > >(exec cat)
+ exec 2> >(exec cat >&2)
+ 
+ # Note: exec -a below is a bashism.
+-exec -a "$0" "$HERE/vivaldi-bin" "$@"
++exec -a "$0" "$HERE/vivaldi-bin" $VIVALDI_USER_FLAGS "$@"
+-- 
+2.34.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-24 19:23:53 UTC (rev 1114874)
+++ PKGBUILD	2022-01-24 19:33:55 UTC (rev 1114875)
@@ -4,7 +4,7 @@
 pkgname=vivaldi
 _rpmversion=5.0.2497.48-1
 pkgver=5.0.2497.48
-pkgrel=1
+pkgrel=2
 pkgdesc='An advanced browser made with the power user in mind.'
 url="https://vivaldi.com"
 options=(!strip !zipman)
@@ -16,12 +16,18 @@
     'vivaldi-ffmpeg-codecs: playback of proprietary video/audio'
     'libnotify: native notifications'
 )
-source=("https://downloads.vivaldi.com/stable/vivaldi-stable-${_rpmversion}.x86_64.rpm")
-sha512sums=('875384bf6ffda065251b04bb05fcb3184f97c53c8ad4f5cd5acceb75ba4b90dbb60404577df44ed7d60f43b644790be0f8fa761f8cbe05657ee9510c602499de')
+source=("https://downloads.vivaldi.com/stable/vivaldi-stable-${_rpmversion}.x86_64.rpm"
+        '0001-add-support-for-user-flags.patch')
+sha512sums=('875384bf6ffda065251b04bb05fcb3184f97c53c8ad4f5cd5acceb75ba4b90dbb60404577df44ed7d60f43b644790be0f8fa761f8cbe05657ee9510c602499de'
+            '334db2056114fdbf07407b1cee24284f019df7a15acd711ed016bab1a1ab211abf3884ed848f3496486e7c78056108ccf1e88547e22b787bc4f548c6785f64d2')
 
 package() {
     cp --parents -a {opt,usr/bin,usr/share} "$pkgdir"
 
+    # add support for ~/.config/vivaldi-stable.conf
+    patch -p1 -i "$srcdir/0001-add-support-for-user-flags.patch" \
+        "$pkgdir/opt/$pkgname/$pkgname"
+
     # suid sandbox
     chmod 4755 "$pkgdir/opt/$pkgname/vivaldi-sandbox"
 
@@ -38,6 +44,10 @@
             "$pkgdir/usr/share/icons/hicolor/${res}x${res}/apps/$pkgname.png"
     done
 
+    # install global icon in case hicolor theme gets bypassed
+    install -Dm644 "$pkgdir/opt/$pkgname/product_logo_256.png" \
+        "$pkgdir/usr/share/pixmaps/$pkgname.png"
+
     # license
     install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
     w3m -dump "$pkgdir/opt/$pkgname/LICENSE.html" \
@@ -44,4 +54,3 @@
         | head -n 5 \
         > "$pkgdir/usr/share/licenses/$pkgname/license.txt"
 }
-