Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=233c12c75a7c24e9b0b46ce871c2e5aca2757c02
commit 233c12c75a7c24e9b0b46ce871c2e5aca2757c02 Author: Devil505 <devil505li...@gmail.com> Date: Wed Oct 26 09:52:45 2011 +0200 chromium-browser-15.0.874.102-1-i686 * version bump diff --git a/source/xapps-extra/chromium-browser/FrugalBuild b/source/xapps-extra/chromium-browser/FrugalBuild index 6464acf..dc9421e 100644 --- a/source/xapps-extra/chromium-browser/FrugalBuild +++ b/source/xapps-extra/chromium-browser/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: Devil505 <devil505li...@gmail.com> pkgname=chromium-browser -pkgver=14.0.835.186 +pkgver=15.0.874.102 pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' url='http://www.chromium.org/' @@ -19,16 +19,20 @@ _F_archive_name="chromium" up2date="Flasttar http://build.chromium.org/buildbot/official/"; source=(http://build.chromium.org/official/$_F_archive_name-$pkgver.tar.bz2 \ gcc-4.6.patch \ - webrtc-r240-r242-make-pulseaudio-optional.patch \ + nacl.gypi \ $pkgname.desktop $pkgname.sh) -sha1sums=('898ac584fd5b50705864e84afa80aa407f25609b' \ +sha1sums=('d8dd8c5f57099ee879e8bd3ab53419f10339762c' \ '39999918746524fff30e73dc656754733df5c2c2' \ - '3d3aab601d2a96b52b179dfc31091c8a7fcf2462' \ + 'df4cee39e1d49e10f9c075f5e6e9db28e8260926' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ 'e06de4aee77b3deb77e3b08ebb175ec02da42ced') build() { Fcd + + # NaCL build remains faily + cp "$Fsrcdir/nacl.gypi" chrome/ || Fdie + # Fix build with CUPS 1.5 sed -i '/#include <cups\/cups.h>/ a #include <cups/ppd.h>' \ chrome/browser/ui/webui/print_preview_handler.cc || Fdie diff --git a/source/xapps-extra/chromium-browser/nacl.gypi b/source/xapps-extra/chromium-browser/nacl.gypi new file mode 100644 index 0000000..05638d6 --- /dev/null +++ b/source/xapps-extra/chromium-browser/nacl.gypi @@ -0,0 +1,8 @@ +{ + 'targets': [ + { + 'target_name': 'nacl', + 'type': 'static_library', + }, + ], +} diff --git a/source/xapps-extra/chromium-browser/webrtc-r240-r242-make-pulseaudio-optional.patch b/source/xapps-extra/chromium-browser/webrtc-r240-r242-make-pulseaudio-optional.patch deleted file mode 100644 index 03f360f..0000000 --- a/source/xapps-extra/chromium-browser/webrtc-r240-r242-make-pulseaudio-optional.patch +++ /dev/null @@ -1,122 +0,0 @@ -Index: third_party/webrtc/build/common.gypi -=================================================================== ---- third_party/webrtc/build/common.gypi (revision 239) -+++ third_party/webrtc/build/common.gypi (revision 240) -@@ -25,6 +25,13 @@ - 'direct_show_base_classes': - 'C:/Program Files/Microsoft SDKs/Windows/v7.1/Samples/multimedia/directshow/baseclasses/', - }], -+ ['build_with_chromium==1', { -+ # Exclude pulse audio on Chromium since its prerequisites don't -+ # include pulse audio. -+ 'include_pulse_audio%': 0, -+ }, { -+ 'include_pulse_audio%': 1, -+ }], - ], # conditions - }, - 'target_defaults': { -Index: third_party/webrtc/modules/audio_device/main/source/audio_device.gyp -=================================================================== ---- third_party/webrtc/modules/audio_device/main/source/audio_device.gyp (revision 239) -+++ third_party/webrtc/modules/audio_device/main/source/audio_device.gyp (revision 240) -@@ -52,18 +52,12 @@ - 'Linux/alsasymboltable.h', - 'Linux/audio_device_linux_alsa.cc', - 'Linux/audio_device_linux_alsa.h', -- 'Linux/audio_device_linux_pulse.cc', -- 'Linux/audio_device_linux_pulse.h', - 'Linux/audio_device_utility_linux.cc', - 'Linux/audio_device_utility_linux.h', - 'Linux/audio_mixer_manager_linux_alsa.cc', - 'Linux/audio_mixer_manager_linux_alsa.h', -- 'Linux/audio_mixer_manager_linux_pulse.cc', -- 'Linux/audio_mixer_manager_linux_pulse.h', - 'Linux/latebindingsymboltable.cc', - 'Linux/latebindingsymboltable.h', -- 'Linux/pulseaudiosymboltable.cc', -- 'Linux/pulseaudiosymboltable.h', - 'Mac/audio_device_mac.cc', - 'Mac/audio_device_mac.h', - 'Mac/audio_device_utility_mac.cc', -@@ -89,16 +83,10 @@ - 'Linux/alsasymboltable.h', - 'Linux/audio_device_linux_alsa.cc', - 'Linux/audio_device_linux_alsa.h', -- 'Linux/audio_device_linux_pulse.cc', -- 'Linux/audio_device_linux_pulse.h', - 'Linux/audio_mixer_manager_linux_alsa.cc', - 'Linux/audio_mixer_manager_linux_alsa.h', -- 'Linux/audio_mixer_manager_linux_pulse.cc', -- 'Linux/audio_mixer_manager_linux_pulse.h', - 'Linux/latebindingsymboltable.cc', - 'Linux/latebindingsymboltable.h', -- 'Linux/pulseaudiosymboltable.cc', -- 'Linux/pulseaudiosymboltable.h', - # Don't remove these, needed for dummy device - # 'Linux/audio_device_utility_linux.cc', - # 'Linux/audio_device_utility_linux.h', -@@ -131,7 +119,6 @@ - }], - ['OS=="linux"', { - 'defines': [ -- 'LINUX_PULSE', - 'LINUX_ALSA', - ], - 'include_dirs': [ -@@ -141,9 +128,28 @@ - 'libraries': [ - '-ldl', - '-lasound', -- '-lpulse', - ], - }, -+ 'conditions': [ -+ ['include_pulse_audio==1', { -+ 'defines': [ -+ 'LINUX_PULSE', -+ ], -+ 'sources': [ -+ 'Linux/audio_device_linux_pulse.cc', -+ 'Linux/audio_device_linux_pulse.h', -+ 'Linux/audio_mixer_manager_linux_pulse.cc', -+ 'Linux/audio_mixer_manager_linux_pulse.h', -+ 'Linux/pulseaudiosymboltable.cc', -+ 'Linux/pulseaudiosymboltable.h', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '-lpulse', -+ ], -+ }, -+ }], -+ ], - }], - ['OS=="mac"', { - 'include_dirs': [ -Index: third_party/webrtc/build/common.gypi -=================================================================== ---- third_party/webrtc/build/common.gypi (revision 241) -+++ third_party/webrtc/build/common.gypi (revision 242) -@@ -10,9 +10,19 @@ - - { - 'variables': { -- # TODO(ajm): use webrtc_standalone to match NaCl? -- 'build_with_chromium%': 1, # 1 to build webrtc with chromium -+ # Putting a variables dict inside another variables dict looks kind of -+ # weird. This is done so that 'build_with_chromium' is defined as -+ # variable within the outer variables dict here. This is necessary -+ # to get these variables defined for the conditions within this variables -+ # dict that operate on these variables (e.g., for setting -+ # 'include_pulse_audio', we need to have 'build_with_chromium' already set). -+ 'variables': { -+ # TODO(ajm): use webrtc_standalone to match NaCl? -+ 'build_with_chromium%': 1, # 1 to build webrtc with chromium -+ }, - -+ 'build_with_chromium%': '<(build_with_chromium)', -+ - # Selects fixed-point code where possible. - # TODO(ajm): we'd like to set this based on the target OS/architecture. - 'prefer_fixed_point%': 0, _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
