Skip to content
This repository has been archived by the owner on May 22, 2019. It is now read-only.

Commit

Permalink
Merge pull request #319 from killajoe/master
Browse files Browse the repository at this point in the history
update to latest version
  • Loading branch information
lots0logs committed Apr 27, 2018
2 parents 85a1675 + b3d6b80 commit 6485cd9
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 41 deletions.
22 changes: 9 additions & 13 deletions antergos/vivaldi/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkgbase = vivaldi
pkgdesc = An advanced browser made with the power user in mind.
pkgver = 1.14.1077.60
pkgrel = 2
pkgver = 1.15.1147.36
pkgrel = 1
url = https://vivaldi.com
arch = x86_64
groups = browser
Expand Down Expand Up @@ -61,25 +61,21 @@ pkgbase = vivaldi
noextract = chrome.rpm
options = !strip
options = !zipman
source = https://downloads.vivaldi.com/stable/vivaldi-stable-1.14.1077.60-1.x86_64.rpm
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3325.181.tar.xz
source = https://downloads.vivaldi.com/stable/vivaldi-stable-1.15.1147.36-1.x86_64.rpm
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-66.0.3359.139.tar.xz
source = chrome.rpm::https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm
source = chrome-eula_text.html::https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html
source = fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch?h=packages/chromium
source = fix-frame-buttons-rendering-too-large-when-using-OSX.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/fix-frame-buttons-rendering-too-large-when-using-OSX.patch?h=packages/chromium
source = chromium-skia-harmony.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-skia-harmony.patch?h=packages/chromium
source = chromium-clang-r2.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-clang-r2.patch?h=packages/chromium
source = chromium-math.h-r0.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-math.h-r0.patch?h=packages/chromium
source = chromium-stdint.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-stdint.patch?h=packages/chromium
source = chromium-widevine.patch::https://git.archlinux.org/svntogit/packages.git/plain/trunk/chromium-widevine.patch?h=packages/chromium
md5sums = 63563bd6de21459f3c9bafe579277192
md5sums = 717988367527423b897712ec0e25a5dd
md5sums = 0e194b102a468958f71eef594510131b
md5sums = c7d271f76140c891b1b6e96ae4b3b71c
md5sums = b6318ddd70f1b31f71511cbd49603c7c
md5sums = aff080a985d0d20473ccec3a4e485560
md5sums = d50d8f0a6940791eabc41c4f64e6a3cf
md5sums = a9e07c22ce941c58e8885405c082ea50
md5sums = 6bf54d3ceeec5f13ba68b0ef74db9e20
md5sums = 254061cb349cff714230b7cca83b0a4c
md5sums = 27dbd1479d469346d1ffe27c7e7c0011
md5sums = 01f7422efc71c1dd9255b5d9f72a36ec
md5sums = 9d6eab4a8302b23a991ddc8682ecaaab
md5sums = 95535a28e5041183ef715c7daa476732

pkgname = vivaldi
Expand Down
57 changes: 29 additions & 28 deletions antergos/vivaldi/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Maintainer: Antergos Developers <dev@antergos.com>
# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
# Contributor: TZ86
# Contributor: killajoe

_archgit_url='https://git.archlinux.org/svntogit/packages.git/plain/trunk'

Expand All @@ -9,9 +10,9 @@ _from_arch_pkg() {
}

pkgname=vivaldi
pkgver=1.14.1077.60
# https://update.vivaldi.com/update/1.0/relnotes/1.14.1077.60.html
_chromium=65.0.3325.181 # https://omahaproxy.appspot.com
pkgver=1.15.1147.36
# https://update.vivaldi.com/update/1.0/relnotes/1.15.1147.36.html
_chromium=66.0.3359.139 # https://omahaproxy.appspot.com
pkgrel=2
pkgdesc='An advanced browser made with the power user in mind.'
groups=('browser')
Expand All @@ -37,25 +38,23 @@ source=(
"chrome.rpm::https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm"
'chrome-eula_text.html::https://www.google.com/intl/en/chrome/browser/privacy/eula_text.html'
"$(_from_arch_pkg fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch)"
"$(_from_arch_pkg fix-frame-buttons-rendering-too-large-when-using-OSX.patch)"
"$(_from_arch_pkg chromium-skia-harmony.patch)"
"$(_from_arch_pkg chromium-clang-r2.patch)"
"$(_from_arch_pkg chromium-math.h-r0.patch)"
"$(_from_arch_pkg chromium-stdint.patch)"
"$(_from_arch_pkg chromium-widevine.patch)"



)
md5sums=('63563bd6de21459f3c9bafe579277192'
'717988367527423b897712ec0e25a5dd'
'0e194b102a468958f71eef594510131b'
md5sums=('c7d271f76140c891b1b6e96ae4b3b71c'
'b6318ddd70f1b31f71511cbd49603c7c'
'aff080a985d0d20473ccec3a4e485560'
'd50d8f0a6940791eabc41c4f64e6a3cf'
'a9e07c22ce941c58e8885405c082ea50'
'6bf54d3ceeec5f13ba68b0ef74db9e20'
'254061cb349cff714230b7cca83b0a4c'
'27dbd1479d469346d1ffe27c7e7c0011'
'01f7422efc71c1dd9255b5d9f72a36ec'
'9d6eab4a8302b23a991ddc8682ecaaab'
'95535a28e5041183ef715c7daa476732')


# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
# Keys are the names in the above script; values are the dependencies in Arch
declare -rgA _system_libs=(
Expand Down Expand Up @@ -102,22 +101,24 @@ prepare() {
echo "LASTCHANGE=$_chrome_build_hash-" >build/util/LASTCHANGE


# Enable support for the Widevine CDM plugin
# libwidevinecdm.so is not included, but can be copied over from Chrome
# (Version string doesn't seem to matter so let's go with "Pinkie Pie")
sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch |
patch -Np1

# https://crbug.com/822820
patch -Np1 -i ../fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch

# https://crbug.com/skia/6663#c10
patch -Np4 -i ../chromium-skia-harmony.patch

# Fixes from Gentoo
patch -Np1 -i ../chromium-clang-r2.patch
patch -Np1 -i ../chromium-math.h-r0.patch
patch -Np1 -i ../chromium-stdint.patch
# Enable support for the Widevine CDM plugin
# libwidevinecdm.so is not included, but can be copied over from Chrome
# (Version string doesn't seem to matter so let's go with "Pinkie Pie")
sed "s/@WIDEVINE_VERSION@/Pinkie Pie/" ../chromium-widevine.patch |
patch -Np1

# Work around broken screen sharing in Google Meet
# https://crbug.com/829916#c16
sed -i 's/"Chromium/"Chrome/' chrome/common/chrome_content_client_constants.cc

# https://crbug.com/822820
patch -Np1 -i ../fix-crash-in-is_cfi-true-builds-with-unbundled-ICU.patch

# https://crbug.com/821881
patch -Np1 -i ../fix-frame-buttons-rendering-too-large-when-using-OSX.patch

# https://crbug.com/skia/6663#c10
patch -Np4 -i ../chromium-skia-harmony.patch

# Remove compiler flags not supported by our system clang
sed -i \
Expand Down

0 comments on commit 6485cd9

Please sign in to comment.