diff --git a/chromium/.footprint b/chromium/.footprint index dbc76459c..92c54c7d0 100644 --- a/chromium/.footprint +++ b/chromium/.footprint @@ -24,6 +24,7 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/ElementsPanel.js -rw-r--r-- root/root usr/lib/chromium/resources/inspector/HeapSnapshotWorker.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ +-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/addIcon.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/applicationCache.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/back.png -rw-r--r-- root/root usr/lib/chromium/resources/inspector/Images/breakpointBorder.png diff --git a/chromium/.md5sum b/chromium/.md5sum index a8894cd2b..07ce3d9f0 100644 --- a/chromium/.md5sum +++ b/chromium/.md5sum @@ -1,3 +1,5 @@ -985f41e4ef7d4deb2d2c26febb110947 chromium-25.0.1364.97.tar.bz2 +e50a4d48a1f54d2344dbdc4365c0640d audio-buffer.patch +24283b95080a674a2f4f15e863a16bb4 chromium-26.0.1410.63.tar.xz 64968626706b07721983ac59fb3babbf chromium.sh +31267242d18b416f903f25231c3ece7f speech-dispatcher.patch d1a2b0663cbf38ebc71cc75073a39b43 use-siginfo_t.patch diff --git a/chromium/Pkgfile b/chromium/Pkgfile index 56e4236d9..3a6435d01 100644 --- a/chromium/Pkgfile +++ b/chromium/Pkgfile @@ -2,18 +2,20 @@ # URL: http://chromium.org/ # 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 yasm xorg-libxt alsa-lib gperf +# Depends on: dbus-glib gtk libevent nss xorg-libxscrnsaver xorg-libxtst libgcrypt xorg-libxdamage yasm xorg-libxt gperf speech-dispatcher name=chromium -version=25.0.1364.97 +version=26.0.1410.63 release=1 -source=(http://commondatastorage.googleapis.com/chromium-browser-official/$name-$version.tar.bz2 \ - $name.sh use-siginfo_t.patch) +source=(http://commondatastorage.googleapis.com/chromium-browser-official/$name-$version.tar.xz \ + $name.sh {audio-buffer,speech-dispatcher,use-siginfo_t}.patch) build() { cd $name-$version # fix building issues + patch -p1 -i $SRC/audio-buffer.patch + patch -p2 -i $SRC/speech-dispatcher.patch patch -p1 -i $SRC/use-siginfo_t.patch find third_party/WebKit/Source ui/base/ime \ @@ -23,7 +25,6 @@ build() { export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)" build/gyp_chromium -f make build/all.gyp --depth=. \ - -Dgcc_version=45 \ -Dno_strict_aliasing=1 \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ @@ -48,6 +49,8 @@ build() { -Duse_gnome_keyring=0 \ -Duse_kerberos=0 \ -Dlinux_link_gnome_keyring=0 \ + -Dlinux_link_libpci=1 \ + -Dlinux_link_libspeechd=1 \ -Denable_webrtc=1 \ -Ddisable_nacl=1 diff --git a/chromium/README b/chromium/README index b4101aef8..d9f0265e1 100644 --- a/chromium/README +++ b/chromium/README @@ -2,6 +2,19 @@ README for chromium +NOTES + + Some features of Chromium > 23.x.x.x use Google APIs, and to access those APIs + either an API Key or a set of OAuth 2.0 tokens is required. You can specify + the API keys to use either when you build Chromium, or at runtime using + environment variables. + After build chromium you will have a binary without API keys baked in, so + instead you should provide them at runtime. + + To read more about API keys: + http://www.chromium.org/developers/how-tos/api-keys + + POSTINSTALLATION If you can't run chromium and you got a message like this: diff --git a/chromium/audio-buffer.patch b/chromium/audio-buffer.patch new file mode 100644 index 000000000..be36e715f --- /dev/null +++ b/chromium/audio-buffer.patch @@ -0,0 +1,12 @@ +diff -upr chromium-26.0.1410.43.orig/media/audio/audio_util.cc chromium-26.0.1410.43/media/audio/audio_util.cc +--- chromium-26.0.1410.43.orig/media/audio/audio_util.cc 2013-03-29 02:10:07.000000000 +0200 ++++ chromium-26.0.1410.43/media/audio/audio_util.cc 2013-03-29 02:21:41.000000000 +0200 +@@ -201,8 +201,6 @@ size_t GetAudioHardwareBufferSize() { + HRESULT hr = CoreAudioUtil::GetPreferredAudioParameters(eRender, eConsole, + ¶ms); + return FAILED(hr) ? kFallbackBufferSize : params.frames_per_buffer(); +-#elif defined(OS_LINUX) +- return 512; + #else + return 2048; + #endif diff --git a/chromium/speech-dispatcher.patch b/chromium/speech-dispatcher.patch new file mode 100644 index 000000000..c2e11e6ee --- /dev/null +++ b/chromium/speech-dispatcher.patch @@ -0,0 +1,11 @@ +--- chromium-browser-26.0.1410.19/src/build/linux/system.gyp~ 2013-03-04 00:04:06.000000000 +0200 ++++ chromium-browser-26.0.1410.19/src/build/linux/system.gyp 2013-03-04 13:45:31.822101677 +0200 +@@ -494,7 +494,7 @@ + '--name', 'LibSpeechdLoader', + '--output-h', '<(output_h)', + '--output-cc', '<(output_cc)', +- '--header', '', ++ '--header', '', + '--link-directly=<(linux_link_libspeechd)', + 'spd_open', + 'spd_say',