summaryrefslogtreecommitdiffstats
path: root/chromium
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-09-03 07:25:56 +0000
committer Eric Hameleers <alien@slackware.com>2015-09-03 07:25:56 +0000
commitab578ad5b62a5ef8989420dee5c5716973ed7cba (patch)
treea99a5bd20c6ef8176906fe102b5f6575933d50f9 /chromium
parent5fcf971ad7521c83558c62da3befef33dfec00b2 (diff)
downloadasb-ab578ad5b62a5ef8989420dee5c5716973ed7cba.tar.gz
asb-ab578ad5b62a5ef8989420dee5c5716973ed7cba.tar.xz
chromium: the kwallet patch has been applied to chromium-45 already
Diffstat (limited to 'chromium')
-rwxr-xr-xchromium/build/chromium.SlackBuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/build/chromium.SlackBuild b/chromium/build/chromium.SlackBuild
index c0d58079..a5795900 100755
--- a/chromium/build/chromium.SlackBuild
+++ b/chromium/build/chromium.SlackBuild
@@ -423,8 +423,10 @@ cat $SRCDIR/patches/chromium_vaapi.patch | patch -p1 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
# Fix broken password manager on KDE, http://crbug.com/494229
# This patch will be included in Chromium 45.
-cat $SRCDIR/patches/chromium_kde_pickles.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+if [ $(echo $VERSION |cut -d. -f1) -lt 45 ]; then
+ cat $SRCDIR/patches/chromium_kde_pickles.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
if [ "$ARCH" != "x86_64" ]; then
# For now, disable NaCl except on x86_64 because the precompiled toolchain is