commit fb336f2452c89a961167f5018155fcd5ae97fc63
Author: Elan Ruusamäe <[email protected]>
Date: Thu Oct 3 12:57:47 2013 +0300
up to 30.0.1599.66; builds without nacl and system libusb
chromium-browser.spec | 15 +++++++++------
dlopen_sonamed_gl.patch | 25 ++++++++++++-------------
master-prefs-path.patch | 4 ++--
plugin-searchdirs.patch | 4 ++--
system-icu.patch | 26 ++++++++++++++++++++++++++
5 files changed, 51 insertions(+), 23 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index c9c1e6c..90bead2 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -59,9 +59,9 @@
# - http://code.google.com/p/chromium/wiki/LinuxBuildInstructionsPrerequisites
# - to look for new tarball, use update-source.sh script
-%define branch 29.0.1547
-%define basever 57
-%define patchver 76
+%define branch 30.0.1599
+%define basever 66
+#define patchver 76
%define gyp_rev 1014
Summary: A WebKit powered web browser
Name: chromium-browser
@@ -73,8 +73,8 @@ Version: %{branch}.%{basever}
Release: 1
License: BSD%{!?with_system_ffmpeg:, LGPL v2+ (ffmpeg)}
Group: X11/Applications/Networking
-Source0:
http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{branch}.%{basever}.tar.xz
-# Source0-md5: fcdeb8cb650d64e326d4ae84ca491432
+Source0:
http://carme.pld-linux.org/~glen/chromium-browser/src/beta/%{name}-%{branch}.%{basever}.tar.gz
+# Source0-md5: 48e0806c4eab5dcc428fd59a826d0498
%if "%{?patchver}" != ""
Patch0:
http://carme.pld-linux.org/~glen/chromium-browser/src/stable/%{name}-%{version}.patch.xz
# Patch0-md5: ffbb56731a752ce52caaf0448dd6e073
@@ -103,6 +103,7 @@ Patch24: nacl-verbose.patch
Patch25: gnome3-volume-control.patch
Patch26: master-prefs-path.patch
Patch28: system-mesa.patch
+Patch29: system-icu.patch
URL: http://www.chromium.org/Home
%{?with_gconf:BuildRequires: GConf2-devel}
%{?with_system_mesa:BuildRequires: Mesa-libGL-devel >= 9.1}
@@ -283,7 +284,7 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
%{__sed} -e 's,@localedir@,%{_datadir}/%{name},' %{SOURCE5} > find-lang.sh
ln -s %{SOURCE7} .
-%patch1 -p2
+%patch1 -p1
%patch4 -p3
%patch7 -p1
%patch10 -p1
@@ -296,7 +297,9 @@ ln -s %{SOURCE7} .
%patch18 -p1
%patch24 -p2
%patch26 -p2
+%patch29 -p0
+exit 0
sh -x clean-source.sh \
%{!?with_nacl:nacl=0} \
%{!?with_system_libvpx:libvpx=0} \
diff --git a/dlopen_sonamed_gl.patch b/dlopen_sonamed_gl.patch
index 4043c86..a040e19 100644
--- a/dlopen_sonamed_gl.patch
+++ b/dlopen_sonamed_gl.patch
@@ -1,17 +1,16 @@
dlopen the sonamed libs directly, like it has already been done for libGL.so.1,
as we don't want to Depend on the -dev packages for the .so files:
-- libosmesa.so.7: Mesa-libOSMesa-7.10-1
-- libGLESv2.so.2: Mesa-libGLES-7.11-0.20110227.1
-- libEGL.so.1: Mesa-libEGL-7.10-1
-
---- chromium-browser-28.0.1500.20/ui/gl/gl_implementation_x11.cc~
2013-05-21 05:45:59.000000000 +0300
-+++ chromium-browser-28.0.1500.20/ui/gl/gl_implementation_x11.cc
2013-05-28 00:21:02.745914853 +0300
-@@ -79,7 +79,7 @@
- }
+- libOSMesa.so.8: Mesa-libOSMesa-9.2.0-2
+- libGLESv2.so.2: Mesa-libGLES-9.2.0-2
+- libEGL.so.1: Mesa-libEGL-9.2.0-2
+--- chromium-browser-30.0.1599.66/./ui/gl/gl_implementation_linux.cc~
2013-09-28 20:10:53.000000000 +0300
++++ chromium-browser-30.0.1599.66/./ui/gl/gl_implementation_linux.cc
2013-10-02 20:06:36.152324746 +0300
+@@ -37,7 +37,7 @@
+ return false;
+ }
- base::NativeLibrary library = LoadLibrary(
-- module_path.Append("libosmesa.so"));
-+ module_path.Append("libosmesa.so.7"));
- if (!library)
- return false;
+- base::NativeLibrary library =
LoadLibrary(module_path.Append("libosmesa.so"));
++ base::NativeLibrary library =
LoadLibrary(module_path.Append("libOSMesa.so.8"));
+ if (!library)
+ return false;
diff --git a/master-prefs-path.patch b/master-prefs-path.patch
index abccc61..40b6618 100644
--- a/master-prefs-path.patch
+++ b/master-prefs-path.patch
@@ -1,5 +1,5 @@
----
chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_linux.cc~
2013-02-21 12:11:48.000000000 +0200
-+++
chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_linux.cc
2013-02-25 16:00:59.000031225 +0200
+---
chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_internal_linux.cc~
2013-02-21 12:11:48.000000000 +0200
++++
chromium-browser-26.0.1410.12/src/chrome/browser/first_run/first_run_internal_linux.cc
2013-02-25 16:00:59.000031225 +0200
@@ -71,8 +71,7 @@
base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
diff --git a/plugin-searchdirs.patch b/plugin-searchdirs.patch
index 0f5c527..b0c3ba5 100644
--- a/plugin-searchdirs.patch
+++ b/plugin-searchdirs.patch
@@ -3,8 +3,8 @@
2. $MOZ_PLUGIN_PATH (colon separated)
3. ~/.mozilla/plugins
----
chromium-browser-10.0.632.0~svn20110107r70714/src/webkit/plugins/npapi/plugin_list_posix.cc~
2010-12-22 04:02:37.000000000 +0100
-+++
chromium-browser-10.0.632.0~svn20110107r70714/src/webkit/plugins/npapi/plugin_list_posix.cc
2011-01-07 17:41:38.193692743 +0100
+---
chromium-browser-10.0.632.0~svn20110107r70714/content/common/plugin_list_posix.cc~
2010-12-22 04:02:37.000000000 +0100
++++
chromium-browser-10.0.632.0~svn20110107r70714/content/common/plugin_list_posix.cc
2011-01-07 17:41:38.193692743 +0100
@@ -146,6 +146,8 @@
if (!home.empty())
plugin_dirs->push_back(home.Append(".mozilla/plugins"));
diff --git a/system-icu.patch b/system-icu.patch
new file mode 100644
index 0000000..5138afc
--- /dev/null
+++ b/system-icu.patch
@@ -0,0 +1,26 @@
+--- build/linux/unbundle/icu.gyp.orig 2013-09-27 18:18:50.531839532 +0000
++++ build/linux/unbundle/icu.gyp 2013-09-27 18:19:08.301950500 +0000
+@@ -7,6 +7,7 @@
+ {
+ 'target_name': 'system_icu',
+ 'type': 'none',
++ 'toolsets': ['host', 'target'],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'U_USING_ICU_NAMESPACE=0',
+@@ -30,6 +31,7 @@
+ {
+ 'target_name': 'icui18n',
+ 'type': 'none',
++ 'toolsets': ['host', 'target'],
+ 'dependencies': ['system_icu'],
+ 'export_dependent_settings': ['system_icu'],
+ 'variables': {
+@@ -116,6 +118,7 @@
+ {
+ 'target_name': 'icuuc',
+ 'type': 'none',
++ 'toolsets': ['host', 'target'],
+ 'dependencies': ['system_icu'],
+ 'export_dependent_settings': ['system_icu'],
+ 'variables': {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/3934d76723a2df96607cb66196d2d40b709168bc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
