summaryrefslogtreecommitdiffstats
path: root/extra/chromium/Pkgfile
diff options
context:
space:
mode:
Diffstat (limited to 'extra/chromium/Pkgfile')
-rw-r--r--extra/chromium/Pkgfile24
1 files changed, 13 insertions, 11 deletions
diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile
index c1386ff34..7566cc947 100644
--- a/extra/chromium/Pkgfile
+++ b/extra/chromium/Pkgfile
@@ -6,25 +6,30 @@
# Run on: gtk,dbus-glib,nss,alsa-lib,xdg-utils,bzip2,libevent,dejavu-ttf,desktop-file-utils,hicolor-icon-theme,keyutils
name=chromium
-version=14.0.835.186
+version=15.0.874.106
+#14.0.835.186
#12.0.742.100
release=1
source=(http://build.chromium.org/official/chromium-$version.tar.bz2
chromium.desktop
chromium.sh
chromium-gcc-4.6.patch
- webrtc-r240-r242-make-pulseaudio-optional.patch)
+ webrtc-r240-r242-make-pulseaudio-optional.patch
+ nacl.gypi)
+
build() {
cd $SRC/chromium-$version
+ cp ../nacl.gypi chrome/
+
patch -Np0 -i $SRC/chromium-gcc-4.6.patch
sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \
chrome/browser/ui/webui/print_preview_handler.cc
- patch -d third_party/webrtc -Np1 -i \
- $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch
+# patch -d third_party/webrtc -Np1 -i \
+# $SRC/webrtc-r240-r242-make-pulseaudio-optional.patch
### Configure
@@ -33,14 +38,11 @@ build() {
-e 's|/usr/bin/python$|\02|g' \
-e 's|(/usr/bin/python2)\.4$|\1|g' \
{} +
- # There are still a lot of relative calls which need a workaround
- mkdir "$SRC/python2-path"
- ln -s /usr/bin/python2 "$SRC/python2-path/python"
- export PATH="$SRC/python2-path:$PATH"
- # We need to disable system_ssl until "next protocol negotiation" support is
- # available in our nss package.
- # (See https://bugzilla.mozilla.org/show_bug.cgi?id=547312)
+ # There are still a lot of relative calls which need a workaround
+ mkdir $SRC/python2-path
+ ln -s /usr/bin/python2 $SRC/python2-path/python
+ export PATH=$SRC/python2-path:$PATH
build/gyp_chromium -f make build/all.gyp --depth=. \
-Dno_strict_aliasing=1 \