[packages/chromium-browser] up to 21.0.1180.57, builds without nacl
glen
glen at pld-linux.org
Wed Aug 1 17:26:25 CEST 2012
commit dd1509bdfaa04657cf0c66505f1111b501401ab8
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Aug 1 18:26:09 2012 +0300
up to 21.0.1180.57, builds without nacl
chromium-alignment-r0.patch | 15 -----
chromium-browser-c++.patch | 144 -------------------------------------------
chromium-browser-pulse.patch | 129 --------------------------------------
chromium-browser.spec | 20 ++----
dlopen_sonamed_gl.patch | 6 +-
nacl-build-irt.patch | 18 +++---
system-expat.patch | 12 ----
tcmalloc.patch | 25 --------
update-source.sh | 4 --
9 files changed, 18 insertions(+), 355 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index 113dd4e..228330a 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -51,12 +51,12 @@
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
-Version: 20.0.1132.57
-Release: 2
+Version: 21.0.1180.57
+Release: 0.1
License: BSD, LGPL v2+ (ffmpeg)
Group: X11/Applications/Networking
Source0: http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.tar.xz
-# Source0-md5: 49ca9c418a10d99196951ecef01bcb5a
+# Source0-md5: 15242c061905204e93cd364a5db954cc
Source1: %{name}.default
Source2: %{name}.sh
Source3: %{name}.desktop
@@ -73,14 +73,9 @@ Patch5: options-support.patch
Patch6: get-webkit_revision.patch
Patch7: dlopen_sonamed_gl.patch
Patch8: chromium_useragent.patch.in
-Patch9: system-expat.patch
-Patch10: %{name}-pulse.patch
# https://bugs.gentoo.org/show_bug.cgi?id=393471
# libjpeg-turbo >= 1.1.90 supports that feature
Patch11: chromium-revert-jpeg-swizzle-r2.patch
-Patch12: tcmalloc.patch
-Patch13: %{name}-c++.patch
-Patch14: chromium-alignment-r0.patch
Patch15: nacl-build-irt.patch
Patch16: nacl-linkingfix.patch
URL: http://www.chromium.org/Home
@@ -114,7 +109,7 @@ BuildRequires: libpng-devel
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libstdc++-devel
%{?with_system_vpx:BuildRequires: libvpx-devel >= 0.9.5-2}
-%{?with_system_libwebp:BuildRequires: libwebp-devel >= 0.1.3}
+%{?with_system_libwebp:BuildRequires: libwebp-devel >= 0.1.99}
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: lzma
@@ -227,12 +222,7 @@ ln -s %{SOURCE7} src
%patch6 -p1
%patch7 -p1
cd src
-%patch9 -p1
-%patch10 -p1
%{!?with_libjpegturbo:%patch11 -p0}
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
%patch15 -p1
%patch16 -p1
cd ..
@@ -418,6 +408,8 @@ fi
%{_libdir}/%{name}/locales/en-US.pak
%dir %{_libdir}/%{name}/resources
%{_libdir}/%{name}/resources/inspector
+%dir %{_libdir}/%{name}/resources/extension
+%{_libdir}/%{name}/resources/extension/demo
%dir %{_libdir}/%{name}/themes
%dir %{_libdir}/%{name}/extensions
%dir %{_libdir}/%{name}/plugins
diff --git a/dlopen_sonamed_gl.patch b/dlopen_sonamed_gl.patch
index 9ac9fe5..93e3806 100644
--- a/dlopen_sonamed_gl.patch
+++ b/dlopen_sonamed_gl.patch
@@ -4,9 +4,9 @@ as we don't want to Depend on the -dev packages for the .so files:
- libGLESv2.so.2: Mesa-libGLES-7.11-0.20110227.1
- libEGL.so.1: Mesa-libEGL-7.10-1
---- chromium-browser-14.0.803.0~svn20110625r90472/src/ui/gfx/gl/gl_implementation_linux.cc.orig 2011-06-23 04:01:00.000000000 +0200
-+++ chromium-browser-14.0.803.0~svn20110625r90472/src/ui/gfx/gl/gl_implementation_linux.cc 2011-06-25 06:28:03.219139002 +0200
-@@ -61,7 +61,7 @@
+--- chromium-browser-21.0.1180.57/src/ui/gl/gl_implementation_linux.cc~ 2012-07-27 04:02:32.000000000 +0300
++++ chromium-browser-21.0.1180.57/src/ui/gl/gl_implementation_linux.cc 2012-08-01 00:18:16.271402111 +0300
+@@ -75,7 +75,7 @@
}
base::NativeLibrary library = LoadLibrary(
diff --git a/nacl-build-irt.patch b/nacl-build-irt.patch
index ff7e5de..dc3bad6 100644
--- a/nacl-build-irt.patch
+++ b/nacl-build-irt.patch
@@ -9,10 +9,9 @@
# ----------------------------------------------------------
# Possibly install an sdk by downloading it
-diff -up chromium-17.0.963.46/native_client/site_scons/site_tools/naclsdk.py.buildnacl chromium-17.0.963.46/native_client/site_scons/site_tools/naclsdk.py
---- chromium-17.0.963.46/native_client/site_scons/site_tools/naclsdk.py.buildnacl 2012-01-27 03:03:50.000000000 -0500
-+++ chromium-17.0.963.46/native_client/site_scons/site_tools/naclsdk.py 2012-02-13 17:09:38.402988894 -0500
-@@ -138,18 +138,21 @@ def _SetEnvForX86Sdk(env, sdk_path):
+--- chromium-browser-21.0.1180.57/native_client/site_scons/site_tools/naclsdk.py~ 2012-07-27 04:03:45.000000000 +0300
++++ chromium-browser-21.0.1180.57/native_client/site_scons/site_tools/naclsdk.py 2012-08-01 11:31:37.996568146 +0300
+@@ -142,10 +142,15 @@
# does not run under Cygwin and does not follow Cygwin symlinks.
if env['TARGET_SUBARCH'] == default_subarch:
libsuffix = 'lib'
@@ -30,11 +29,12 @@ diff -up chromium-17.0.963.46/native_client/site_scons/site_tools/naclsdk.py.bui
as_mode_flag = '--%s' % env['TARGET_SUBARCH']
if env['TARGET_SUBARCH'] == '64':
ld_mode_flag = ' -melf64_nacl'
- else:
- ld_mode_flag = ' -melf_nacl'
+@@ -154,8 +159,6 @@
+
+ if arch == 'arm-nacl':
+ cc_mode_flag = ''
+- else:
+- cc_mode_flag = '-m%s' % env['TARGET_SUBARCH']
-- cc_mode_flag = '-m%s' % env['TARGET_SUBARCH']
--
env.Replace(# Replace header and lib paths.
# where to put nacl extra sdk headers
- # TODO(robertm): switch to using the mechanism that
diff --git a/update-source.sh b/update-source.sh
index e187cd6..ae2ef7a 100644
--- a/update-source.sh
+++ b/update-source.sh
@@ -74,7 +74,6 @@ if [ "$quiet" = "1" ]; then
exec 1>/dev/null
fi
-test -e $specfile || cvs up $specfile
# take baseurl from .spec Source0
baseurl=$(awk '/^Source0:/{print $2}' $specfile | xargs dirname)
@@ -108,9 +107,6 @@ if [ ! -f $tarball ]; then
wget $(test "$quiet" = "1" && echo -q) -c $url
fi
-# cvs up specfile, rename in case of conflicts
-cvs up $specfile || { set -x; mv -b $specfile $specfile.old && cvs up $specfile; }
-
extract_version $tarball
url_tpl=$(url2version $tarball)
More information about the pld-cvs-commit
mailing list