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
This commit is contained in:
Raymond Wooninck
2011-12-10 18:59:34 +00:00
committed by Git OBS Bridge
parent b32b9fbfdf
commit 386752c0ed
6 changed files with 47 additions and 25 deletions

View File

@@ -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': [
- '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
- ],
+ 'include_dirs': [
+ 'config',
+ 'ffmpeg-0.6-headers',
+ ],
],
'direct_dependent_settings': {
- 'cflags': [
- '<!@(pkg-config --cflags libavcodec libavformat libavutil)',
@@ -20,4 +19,4 @@ diff -up chromium-6.0.425.0-20100603svn48830/third_party/ffmpeg/ffmpeg.gyp.BAD c
+ 'ffmpeg-0.6-headers',
],
},
}, { # else use_system_ffmpeg==0, add local copy to include path
}, { # else use_system_ffmpeg == 0, add local copy to include path

View File

@@ -31,10 +31,10 @@ diff -up chromium-7.0.500.0-20100819svn56724/build/linux/system.gyp.speex chromi
diff -up chromium-7.0.500.0-20100819svn56724/content/content_browser.gypi.speex chromium-7.0.500.0-20100819svn56724/chrome/chrome_browser.gypi
--- chromium-7.0.500.0-20100819svn56724/src/content/content_browser.gypi.speex 2010-08-19 16:23:14.594998783 -0400
+++ chromium-7.0.500.0-20100819svn56724/src/content/content_browser.gypi 2010-08-19 16:25:27.921293238 -0400
@@ -12,7 +12,7 @@
@@ -10,7 +10,7 @@
'../ppapi/ppapi_internal.gyp:ppapi_proxy',
'../skia/skia.gyp:skia',
'../third_party/flac/flac.gyp:libflac',
# TODO(ericu): remove leveldb ref after crbug.com/6955013 is fixed.
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
- '../third_party/speex/speex.gyp:libspeex',
+ '../build/linux/system.gyp:speex',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b5d84785752925b000f71a1d0d1a54d44e872649d4b57e7cdafe3914ec1e61b
size 218200030

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87321b0daece6c2903ca6fa0f3f23c7815203a9fdd7379b51d28fa1bf9a2db9c
size 257878712

View File

@@ -1,4 +1,20 @@
-------------------------------------------------------------------
Sat Dec 10 18:51:39 UTC 2011 - tittiatcoke@gmail.com
- Update to 18.0.968
+ Print preview: Disable the right context menu items in print
preview. (issue#106876,#106915)
+ Fix page zoom for plug-in documents (PDF, etc.)
(issue#106013,#106228)
+ ntp: track number of times a user switches pages in a single
session (issue#106575)
+ <video> 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

View File

@@ -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