X-Git-Url: http://gitweb/?a=blobdiff_plain;f=chromium%2FPkgfile;h=89215a71cba61784abf4a07c90e3141346cf9d5c;hb=ee744317a139b615973fdac1cc11a7b669f3fbee;hp=9ecc45b80a4e421296582778f1692cfef7a318c3;hpb=3b61d695b17b241196861ebf9349fc7e5b096aeb;p=ports%2Fopt-arm.git

diff --git a/chromium/Pkgfile b/chromium/Pkgfile
index 9ecc45b..89215a7 100644
--- a/chromium/Pkgfile
+++ b/chromium/Pkgfile
@@ -3,24 +3,17 @@
 # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu
 # Maintainer: Jose V Beneyto, sepen at crux dot nu
 # Packager: Tadeusz Sosnierz, tadzikes gmail com
-# Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage xorg-libxt gperf speech-dispatcher
+# Depends on: ninja dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt gperf speech-dispatcher libdrm libexif pciutils
 
 name=chromium
-version=32.0.1700.107
+version=45.0.2454.85
 release=1
-source=(http://commondatastorage.googleapis.com/chromium-browser-official/$name-$version.tar.xz \
-        $name.sh icu-native-arm.patch)
+source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \
+        $name.sh $name.desktop)
 
 build() {
   cd $name-$version
 
-  # avoid 32-bit flags (g++: error: unrecognized command line option '-m32')
-  patch -p1 -i $SRC/icu-native-arm.patch
-
-  # fix for speech-dispatcher >= 0.8
-  sed -e 's|<<(libspeechd_h_prefix)libspeechd.h>|<speech-dispatcher/libspeechd.h>|' \
-      -i build/linux/system.gyp
-
   export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)"
   export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"
 
@@ -35,7 +28,7 @@ build() {
     esac
   done
 
-  build/gyp_chromium -f make build/all.gyp --depth=. \
+  build/gyp_chromium build/all.gyp --depth=. \
         -Dtarget_arch=arm \
         -Darm_float_abi=hard \
         -Darmv7=$USE_ARMV7 \
@@ -44,17 +37,18 @@ build() {
         -Dv8_target_arch=arm \
         -Dv8_use_arm_eabi_hardfloat=1 \
         -Dsysroot= \
+        -Dclang=0 \
         -Dpython_ver="2.7" \
         -Dno_strict_aliasing=1 \
         -Dwerror= \
-        -Dlinux_sandbox_path=/usr/lib/chromium/chrome-sandbox \
+        -Dlinux_sandbox_path=/usr/lib/$name/chrome-sandbox \
         -Dlinux_strip_binary=1 \
         -Dlinux_use_gold_binary=0 \
         -Dlinux_use_gold_flags=0 \
-        -Dlinux_use_tmalloc=0 \
         -Drelease_extra_cflags="$CFLAGS" \
         -Dproprietary_codecs=1 \
         -Dffmpeg_branding=Chrome \
+        -Dlibspeechd_h_prefix=speech-dispatcher/ \
         -Duse_system_libjpeg=1 \
         -Duse_system_libxslt=1 \
         -Duse_system_libxml=1 \
@@ -62,9 +56,10 @@ build() {
         -Duse_system_zlib=0 \
         -Duse_system_libpng=0 \
         -Duse_system_ffmpeg=0 \
-        -Duse_system_yasm=0 \
+        -Duse_system_yasm=1 \
         -Duse_system_libevent=1 \
         -Duse_system_sqlite=0 \
+        -Duse_system_ssl=0 \
         -Dremove_webcore_debug_symbols=1 \
         -Duse_gconf=0 \
         -Duse_cups=0 \
@@ -75,26 +70,29 @@ build() {
         -Dlinux_link_libpci=1 \
         -Dlinux_link_libspeechd=1 \
         -Denable_webrtc=1 \
-        -Ddisable_nacl=1
+        -Ddisable_nacl=1 \
+        -Dicu_use_data_file_flag=0
 
-  # fix issue with nspr libs
-  sed -e "s|LIBS := |LIBS := $LDFLAGS |" -i chrome/chrome.target.mk
+  ninja -C out/Release chrome chrome_sandbox
 
-  make chrome chrome_sandbox BUILDTYPE=Release
+  install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name
+  install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox
+  install -m 0644 -D out/Release/*.pak $PKG/usr/lib/$name
+  install -d $PKG/usr/lib/$name/locales
+  install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/$name/locales
+  cp -a out/Release/resources $PKG/usr/lib/$name
+  install -m 0644 -D out/Release/chrome.1 $PKG/usr/man/man1/$name.1
 
-  install -m 0755 -D out/Release/chrome $PKG/usr/lib/chromium/chromium
-  install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/chromium/chrome-sandbox
-  install -m 0644 -D out/Release/*.pak $PKG/usr/lib/chromium
-  install -m 0755 -D out/Release/libffmpegsumo.so $PKG/usr/lib/chromium
-  install -d $PKG/usr/lib/chromium/locales
-  install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/chromium/locales
-  cp -a out/Release/resources $PKG/usr/lib/chromium
-  install -m 0644 -D out/Release/chrome.1 $PKG/usr/man/man1/chromium.1
+  # fix v8 natives
+  cp -a out/Release/{natives,snapshot}_blob.bin $PKG/usr/lib/$name
 
   for size in 22 24 48 128 256; do
-    install -m 0644 -D chrome/app/theme/chromium/product_logo_${size}.png \
-      $PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
+    install -m 0644 -D chrome/app/theme/$name/product_logo_${size}.png \
+      $PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
   done
 
-  install -m 0755 -D $SRC/chromium.sh $PKG/usr/bin/chromium
+  install -d $PKG/usr/share/pixmaps
+  ln -sf /usr/share/icons/hicolor/48x48/apps/$name.png $PKG/usr/share/pixmaps/$name.png
+  install -m 0644 -D $SRC/$name.desktop $PKG/usr/share/applications/$name.desktop
+  install -m 0755 -D $SRC/$name.sh $PKG/usr/bin/$name
 }