From 386752c0edeb9fcefc43eb9653f39d9df875b45d974b8a38fbddc36350bb478c Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 10 Dec 2011 18:59:34 +0000 Subject: [PATCH] Accepting request 96250 from home:tittiatcoke:branches:network:chromium Update to 18.0.968 OBS-URL: https://build.opensuse.org/request/show/96250 OBS-URL: https://build.opensuse.org/package/show/network:chromium/chromium?expand=0&rev=88 --- chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch | 11 +++---- chromium-7.0.500.0-system-speex.patch | 6 ++-- chromium.17.0.952.0.svn.tar.lzma | 3 -- chromium.18.0.968.0.svn.tar.lzma | 3 ++ chromium.changes | 16 ++++++++++ chromium.spec | 33 ++++++++++++-------- 6 files changed, 47 insertions(+), 25 deletions(-) delete mode 100644 chromium.17.0.952.0.svn.tar.lzma create mode 100644 chromium.18.0.968.0.svn.tar.lzma diff --git a/chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch b/chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch index 8150e6f..3acfbfd 100644 --- a/chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch +++ b/chromium-6.0.425.0-ffmpeg-no-pkgconfig.patch @@ -1,17 +1,16 @@ diff -up chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp.BAD chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp --- chromium-6.0.425.0-20100603svn48830/src/third_party/ffmpeg/ffmpeg.gyp.BAD 2010-06-03 13:48:45.196313786 -0400 +++ chromium-6.0.425.0-20100603svn48830/src/third_party/ffmpeg/ffmpeg.gyp 2010-06-03 13:50:10.580325776 -0400 -@@ -818,12 +818,14 @@ +@@ -501,12 +501,14 @@ - # Add pkg-config result to include path when use_system_ffmpeg!=0 - ['use_system_ffmpeg!=0', { + # Add pkg-config result to include path when use_system_ffmpeg != 0 + ['use_system_ffmpeg != 0', { - 'cflags': [ - ' decode in hardware! (issue#104579) + + New tab button icons (issue#100775) + + Profile/user menu on NTP should look more clickable? + (issue#102685) + +- Enable the build of the Native Client (NaCl) +------------------------------------------------------------------- Thu Dec 1 12:11:40 UTC 2011 - idoenmez@suse.de - Support ISO_8859-X as an alias to ISO-8859-X diff --git a/chromium.spec b/chromium.spec index 3bf7580..3d5de7f 100644 --- a/chromium.spec +++ b/chromium.spec @@ -15,14 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define v8_ver 3.7.10.0 +%define v8_ver 3.7.12.6 Name: chromium -Version: 17.0.952.0 -Release: 1 -License: BSD-3-Clause and LGPL-2.1+ +Version: 18.0.968.0 +Release: 0 Summary: Google's opens source browser project +License: BSD-3-Clause and LGPL-2.1+ Group: Productivity/Networking/Web/Browsers Url: http://code.google.com/p/chromium/ Source0: %{name}.%{version}.svn.tar.lzma @@ -93,7 +92,7 @@ BuildRequires: libbz2-devel BuildRequires: libevent BuildRequires: libexpat-devel BuildRequires: libgnutls-devel -BuildRequires: libjpeg-devel +#uildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: libvpx-devel @@ -104,8 +103,8 @@ BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-nss-devel BuildRequires: openssl-devel BuildRequires: pam-devel -BuildRequires: perl(Switch) BuildRequires: pkg-config +BuildRequires: perl(Switch) %if 0%{?suse_version} <= 1120 BuildRequires: cairo-devel BuildRequires: dbus-1-devel @@ -147,6 +146,10 @@ BuildRequires: libicu-devel >= 4.0 %endif BuildRequires: speex-devel BuildRequires: hicolor-icon-theme +# For NaCl +%ifarch x86_64 +BuildRequires: gcc-c++-32bit +%endif Requires: alsa Requires: xdg-utils @@ -172,7 +175,6 @@ Chromium is the open-source project behind Google Chrome. We invite you to join %package desktop-kde Summary: Update to chromium to use KDE's kwallet to store passwords -Group: Productivity/Networking/Web/Browsers Supplements: packageand(chromium:kdebase4-session) Conflicts: chromium-desktop-gnome Provides: Chromium-password = %{version} @@ -186,7 +188,6 @@ are also not converted to kwallet. %package desktop-gnome Summary: Update to chromium to use Gnome keyring to store passwords -Group: Productivity/Networking/Web/Browsers Supplements: packageand(chromium:gnome-session) Conflicts: chromium-desktop-kde Provides: Chromium-password = %{version} @@ -201,7 +202,6 @@ are also not converted to Gnome's Keyring. Summary: A suid helper to let a process willingly drop privileges on Linux Url: http://code.google.com/p/setuid-sandbox/ -Group: Productivity/Networking/Web/Browsers Requires(pre): permissions %description suid-helper @@ -279,12 +279,11 @@ pushd src -Duse_system_libpng=1 \ -Duse_system_bzip2=1 \ -Duse_system_libbz2=1 \ --Duse_system_libjpeg=1 \ +-Duse_system_libjpeg=0 \ -Duse_system_libxml=1 \ -Duse_system_libxslt=1 \ -Duse_system_libevent=1 \ -Duse_system_vpx=1 \ --Ddisable_nacl=1 \ -Dremove_webcore_debug_symbols=1 \ -Duse_system_v8=1 \ -Dproprietary_codecs=1 \ @@ -301,7 +300,7 @@ pushd src %endif -Drelease_extra_cflags=-fPIC -make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release DISABLE_NACL=1 +make -r %{?_smp_mflags} chrome V=1 BUILDTYPE=Release # Build the required SUID_SANDBOX helper make -r %{?_smp_mflags} chrome_sandbox V=1 BUILDTYPE=Release @@ -340,6 +339,12 @@ cp -a chrome %{buildroot}%{_libdir}/chromium/chromium cp -a chrome.1 %{buildroot}%{_mandir}/man1/chrome.1 cp -a chrome.1 %{buildroot}%{_mandir}/man1/chromium.1 %fdupes %{buildroot}%{_mandir}/man1/ + +# NaCl +cp -a nacl_helper %{buildroot}%{_libdir}/chromium/ +cp -a nacl_helper_bootstrap %{buildroot}%{_libdir}/chromium/ +cp -a nacl_irt_*.nexe %{buildroot}%{_libdir}/chromium/ +cp -a libppGoogleNaClPluginChrome.so %{buildroot}%{_libdir}/chromium/ popd mkdir -p %{buildroot}%{_datadir}/icons/ @@ -430,6 +435,8 @@ update-alternatives --auto chromium %{_libdir}/chromium/chromium-generic %{_libdir}/chromium/plugins/ %{_libdir}/chromium/locales/ +%{_libdir}/chromium/nacl_* +%{_libdir}/chromium/libppGoogleNaClPluginChrome.so %attr(755,root,root) %{_libdir}/chromium/xdg-settings %attr(755,root,root) %{_libdir}/chromium/xdg-mime %{_libdir}/chromium/*.pak