summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD20
2 files changed, 22 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 111a091e3fdd..a58f7799075c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = chromium-dev
pkgdesc = The open-source project behind Google Chrome (Dev Channel)
- pkgver = 48.0.2535.0
+ pkgver = 48.0.2540.0
pkgrel = 1
url = http://www.chromium.org
install = chromium-dev.install
@@ -43,16 +43,9 @@ pkgbase = chromium-dev
depends = ffmpeg
depends = gtk3
depends = libpulse
- optdepends = chromium-pepper-flash-dev: PPAPI Flash Player (Dev Channel)
- optdepends = kdebase-kdialog: Needed for file dialogs in KDE4
- optdepends = kwalletmanager4: Needed for storing passwords in KWallet in KDE4
- optdepends = kdialog-frameworks-git: Needed for file dialogs in KF5
- optdepends = kwalletmanager: Needed for storing passwords in KWallet in KF5
- optdepends = libappindicator-gtk2: Needed for show systray icon in the panel in plasma-next (KF5)
- optdepends = libexif: Need for read EXIF metadata
- optdepends = ttf-font: For some typography
+ optdepends = libappindicator-gtk3: Needed for show systray icon in the panel in plasma-next (KF5)
options = !strip
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-48.0.2535.0.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-48.0.2540.0.tar.xz
source = chromium-launcher-3.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v3.tar.gz
source = chromium-dev.desktop
source = chromium-dev.xml
@@ -60,7 +53,9 @@ pkgbase = chromium-dev
source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-jinja-r7.patch
source = https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
source = enable_vaapi_on_linux-r1.diff
- sha1sums = 9e897ff526bd2bf36ce74f53a2e7a1c54fdee3bb
+ source = https://codereview.chromium.org/download/issue1411863003_20001.diff
+ source = https://codereview.chromium.org/download/issue1409243004_1.diff
+ sha1sums = 96a1648e695c06c5cced7e37a077948329671871
sha1sums = d18f8d96e80be9c31d994cc6362d7d8041c53319
sha1sums = 0acc45b901418f270d0b2068502e39c407c74ea4
sha1sums = 2b98c549332e7337307ce287e150930cfc1dfa5f
@@ -68,6 +63,8 @@ pkgbase = chromium-dev
sha1sums = c24d14029714d2295f3220a7173a5a7362f578a2
sha1sums = 8e828ffd7de532becdd30378cdcc8411575a7b0b
sha1sums = 255d71cd9b9e55265e1bfeaa4612bcf60d293204
+ sha1sums = ddcd48080cdebdda868fb7b846ee902f8c242038
+ sha1sums = 9a3b40cacbc9ffdc23cb025eaec24a8d4cda25cf
makedepends_x86_64 = lib32-gcc-libs
makedepends_x86_64 = lib32-zlib
diff --git a/PKGBUILD b/PKGBUILD
index 530e493f15ef..75273f3a09eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ _use_gtk3=1 # If set 1, then build with GTK3 support, if set 0, then
## -- Package and components information -- ##
##############################################
pkgname=chromium-dev
-pkgver=48.0.2535.0
+pkgver=48.0.2540.0
_launcher_ver=3
pkgrel=1
pkgdesc="The open-source project behind Google Chrome (Dev Channel)"
@@ -70,8 +70,6 @@ optdepends=('chromium-pepper-flash-dev: PPAPI Flash Player (Dev Channel)'
'kdialog-frameworks-git: Needed for file dialogs in KF5'
'kwalletmanager: Needed for storing passwords in KWallet in KF5'
#
- 'libappindicator-gtk2: Needed for show systray icon in the panel in plasma-next (KF5)'
- #
'libexif: Need for read EXIF metadata'
'ttf-font: For some typography')
source=("https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz"
@@ -85,7 +83,8 @@ source=("https://commondatastorage.googleapis.com/chromium-browser-official/chro
# Misc Patches
'enable_vaapi_on_linux-r1.diff'
# Patch from crbug (chromium bugtracker)
-
+ 'https://codereview.chromium.org/download/issue1411863003_20001.diff'
+ 'https://codereview.chromium.org/download/issue1409243004_1.diff'
)
sha1sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/?marker=chromium-${pkgver}.tar.x | awk -v FS='<td>"' -v RS='"</td>' '$0=$2' | head -n1)"
"$(curl -sL "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${pkgver}.tar.xz.hashes" | grep sha1 | cut -d " " -f3)"
@@ -99,7 +98,8 @@ sha1sums=( #"$(curl -sL https://gsdview.appspot.com/chromium-browser-official/?m
# Misc Patches
'255d71cd9b9e55265e1bfeaa4612bcf60d293204'
# Patch from crbug (chromium bugtracker)
-
+ 'ddcd48080cdebdda868fb7b846ee902f8c242038'
+ '9a3b40cacbc9ffdc23cb025eaec24a8d4cda25cf'
)
options=('!strip')
install=chromium-dev.install
@@ -148,8 +148,10 @@ fi
if [ "${_use_gtk3}" = "1" ]; then
depends+=('gtk3')
_launcher_gtk='GTK=3'
+ optdepends=('libappindicator-gtk3: Needed for show systray icon in the panel in plasma-next (KF5)')
elif [ "${_use_gtk3}" = "0" ]; then
depends+=('gtk2')
+ optdepends=('libappindicator-gtk2: Needed for show systray icon in the panel in plasma-next (KF5)')
fi
# Need you use ccache?
@@ -431,9 +433,15 @@ prepare() {
patch -p1 -i ../enable_vaapi_on_linux-r1.diff
# Patch from crbug (chromium bugtracker)
- # fix the missing define (if not, fail build) (need upstream fix) (https://crbug.com/473866)
+ # fix the missing define (if not, fail build) (need upstream fix) # https://crbug.com/473866
sed '14i#define WIDEVINE_CDM_VERSION_STRING "The Cake Is a Lie"' -i "third_party/widevine/cdm/stub/widevine_cdm_version.h"
+ # use correct libappindicator when use GTK2 or GTK3 build # https://crbug.com/543219
+ patch -p1 -i ../issue1411863003_20001.diff
+ # Fix https://bugs.archlinux.org/task/46756 # https://crbug.com/505226
+ patch -d third_party/pdfium -p1 -i ../../../issue1409243004_1.diff
+
+ ##
# Make it possible to remove third_party/adobe
echo > "${srcdir}/flapper_version.h"