Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-google-chrome grimoire by Eric Sandall (7f4cab14b7b9c909b6198542fc49c1c0653ec335)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-google-chrome grimoire by Eric Sandall (7f4cab14b7b9c909b6198542fc49c1c0653ec335)
  • Date: Tue, 30 Mar 2010 18:13:40 -0500

GIT changes to devel-google-chrome grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

http/google-chromium/DEPENDS | 1
http/google-chromium/DETAILS | 11
http/google-chromium/HISTORY | 9
http/google-chromium/PRE_BUILD | 8
http/google-chromium/chromium-drop_sse2.patch | 32 +
http/google-chromium/chromium-use_system_libevent-1.4.13.patch | 206
----------
6 files changed, 53 insertions(+), 214 deletions(-)

New commits:
commit 7f4cab14b7b9c909b6198542fc49c1c0653ec335
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

google-chromium: Make INSTALL executable, never gotten this far to notice
:(

commit dff51be7d7f264747e1699584fffe969eb0eadd9
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

google-chromium: Cleanup whitespace

commit ed6e5e7b2e76fbaacbb586a030096846309c9ddc
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

google-chromium: Drop SSE2

See http://code.google.com/p/chromium/wiki/LinuxPackaging#SSE_flags

commit b4c55e0be20a9c0304ac6719e21c7ab928ece944
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

google-chromium: system libevent patch is now applied upstream

commit 48939359a13171b24ebc44ad0472a9f8df5e6577
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

google-chromium: Use our own tarball generated via
http://code.google.com/p/chromium/wiki/LinuxPackaging#Source_Packages

This provides a download of ~50Mb instead of 4Gb+ and is created with
the following method from the above link:
$ svn checkout --non-interactive -r HEAD
http://src.chromium.org/svn/trunk/src google-chromium
$ ln -s google-chromium src
$ python src/tools/export_tarball/export_tarball.py
--remove-nonessential-files ~/public_html/smgl/files/google-chromium
$ cd ~/public_html/smgl/files/
$ gurusign google-chromium.tar.bz2

I now have a ~/public_html/smgl/files/google-chromium.tar.bz2 created
which extracts to google-chromium/.

diff --git a/http/google-chromium/DEPENDS b/http/google-chromium/DEPENDS
index 1786b1b..bdddf03 100755
--- a/http/google-chromium/DEPENDS
+++ b/http/google-chromium/DEPENDS
@@ -21,4 +21,3 @@ optional_depends LIBAVCODEC \
'use system provided LIBAVCODEC' &&

suggest_depends xulrunner '' '' 'for Mozilla plugin support'
-
diff --git a/http/google-chromium/DETAILS b/http/google-chromium/DETAILS
index 9f77743..868a548 100755
--- a/http/google-chromium/DETAILS
+++ b/http/google-chromium/DETAILS
@@ -4,10 +4,13 @@ if [[ "$GOOGLE_CHROME_SCM_AUTOUPDATE" == "y" ]]; then
else
VERSION=svn
fi
- SOURCE=$SPELL-svn.tar.bz2
- SOURCE_IGNORE=volatile
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
- SOURCE_URL[0]=svn_http://src.chromium.org/svn/trunk/src:$SPELL
+ SOURCE=$SPELL.tar.bz2
+ SOURCE2=$SOURCE.sig
+ SOURCE_GPG="gurus.gpg:$SOURCE2:WORKS_FOR_ME"
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+ SOURCE_URL[0]=http://smgl.sandall.us/files/$SOURCE
+ SOURCE2_URL[0]=http://smgl.sandall.us/files/$SOURCE2
LICENSE[0]=BSD
WEB_SITE=http://chrome.google.com/
KEYWORDS="web http"
diff --git a/http/google-chromium/HISTORY b/http/google-chromium/HISTORY
index d1d9c62..06fce50 100644
--- a/http/google-chromium/HISTORY
+++ b/http/google-chromium/HISTORY
@@ -1,3 +1,12 @@
+2010-03-30 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Use our own tarball generated via
+
http://code.google.com/p/chromium/wiki/LinuxPackaging#Source_Packages
+ * PRE_BUILD: No longer apply chromium-use_system_libevent-1.4.13.patch
+ Apply chromium-drop_sse2.patch
+ * chromium-use_system_libevent-1.4.13.patch: Removed, now applied
upstream
+ * chromium-drop_sse2.patch: Added, see
+ http://code.google.com/p/chromium/wiki/LinuxPackaging#SSE_flags
+
2010-01-05 Eric Sandall <sandalle AT sourcemage.org>
* PREPARE, DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: Created
Much help from
http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/chromium-4.0.266.0.ebuild?rev=1.4&view=markup
:)
diff --git a/http/google-chromium/INSTALL b/http/google-chromium/INSTALL
old mode 100644
new mode 100755
diff --git a/http/google-chromium/PRE_BUILD b/http/google-chromium/PRE_BUILD
index 98e3402..e40612a 100755
--- a/http/google-chromium/PRE_BUILD
+++ b/http/google-chromium/PRE_BUILD
@@ -1,9 +1,11 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-# Use system libevent
-message "${MESSAGE_COLOR}Patching to use system libevent${DEFAULT_COLOR}" &&
-patch -p1 < $SCRIPT_DIRECTORY/chromium-use_system_libevent-1.4.13.patch &&
+#
+# Drop SSE2
+# See http://code.google.com/p/chromium/wiki/LinuxPackaging#SSE_flags
+#
+patch $SOURCE_DIRECTORY/build/common.gypi
$SCRIPT_DIRECTORY/chromium-drop_sse2.patch &&

# Disable compiling with -Werror
sed -i 's:-Werror::' build/common.gypi &&
diff --git a/http/google-chromium/chromium-drop_sse2.patch
b/http/google-chromium/chromium-drop_sse2.patch
new file mode 100644
index 0000000..1010524
--- /dev/null
+++ b/http/google-chromium/chromium-drop_sse2.patch
@@ -0,0 +1,32 @@
+#
+# Based on
http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/files/chromium-drop_sse2.patch?rev=1.1&view=markup
+#
+diff -Naur google-chromium.orig/build/common.gypi
google-chromium/build/common.gypi
+--- google-chromium.orig/build/common.gypi 2010-03-30 15:59:34.968075146
-0700
++++ google-chromium/build/common.gypi 2010-03-30 16:00:13.219075621 -0700
+@@ -881,15 +881,16 @@
+ # used during computation does not change depending on how the
+ # compiler optimized the code, since the value is always kept
+ # in its specified precision.
+- 'conditions': [
+- ['branding=="Chromium"', {
+- 'cflags': [
+- '-march=pentium4',
+- '-msse2',
+- '-mfpmath=sse',
+- ],
+- }],
+- ],
++ # Disabled: see
http://code.google.com/p/chromium/issues/detail?id=9007
++ # 'conditions': [
++ # ['branding=="Chromium"', {
++ # 'cflags': [
++ # '-march=pentium4',
++ # '-msse2',
++ # '-mfpmath=sse',
++ # ],
++ # }],
++ # ],
+ 'cflags': [
+ '-m32',
+ ],
diff --git a/http/google-chromium/chromium-use_system_libevent-1.4.13.patch
b/http/google-chromium/chromium-use_system_libevent-1.4.13.patch
deleted file mode 100644
index cbfe3df..0000000
--- a/http/google-chromium/chromium-use_system_libevent-1.4.13.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-#
-# Patch from Gentoo
-#
http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/chromium/files/chromium-use_system_libevent-1.4.13.patch?rev=1.1&view=markup
-#
-diff -Naur chromium-4.0.212.0_p26343.orig/base/message_pump_libevent.cc
chromium-4.0.212.0_p26343/base/message_pump_libevent.cc
---- chromium-4.0.212.0_p26343.orig/base/message_pump_libevent.cc
2009-09-17 17:06:50.000000000 +0200
-+++ chromium-4.0.212.0_p26343/base/message_pump_libevent.cc 2009-09-17
17:11:01.000000000 +0200
-@@ -12,7 +12,11 @@
- #include "base/scoped_nsautorelease_pool.h"
- #include "base/scoped_ptr.h"
- #include "base/time.h"
-+#if defined(USE_SYSTEM_LIBEVENT)
-+#include <event.h>
-+#else
- #include "third_party/libevent/event.h"
-+#endif
-
- // Lifecycle of struct event
- // Libevent uses two main data structures:
-diff -Naur
chromium-4.0.212.0_p26343.orig/chrome/browser/debugger/devtools_remote_listen_socket.cc

chromium-4.0.212.0_p26343/chrome/browser/debugger/devtools_remote_listen_socket.cc
----
chromium-4.0.212.0_p26343.orig/chrome/browser/debugger/devtools_remote_listen_socket.cc
2009-09-17 17:06:51.000000000 +0200
-+++
chromium-4.0.212.0_p26343/chrome/browser/debugger/devtools_remote_listen_socket.cc
2009-09-17 17:10:49.000000000 +0200
-@@ -18,8 +18,12 @@
- #include "base/message_loop.h"
- #include "base/message_pump_libevent.h"
- #include "net/base/net_errors.h"
-+#if defined(USE_SYSTEM_LIBEVENT)
-+#include <event.h>
-+#else
- #include "third_party/libevent/event.h"
- #endif
-+#endif
-
- #include "base/eintr_wrapper.h"
- #include "base/platform_thread.h"
-diff -Naur chromium-4.0.212.0_p26343.orig/net/base/listen_socket.cc
chromium-4.0.212.0_p26343/net/base/listen_socket.cc
---- chromium-4.0.212.0_p26343.orig/net/base/listen_socket.cc 2009-09-17
17:06:23.000000000 +0200
-+++ chromium-4.0.212.0_p26343/net/base/listen_socket.cc 2009-09-17
17:10:12.000000000 +0200
-@@ -13,8 +13,12 @@
- #include <sys/socket.h>
- #include <arpa/inet.h>
- #include "net/base/net_errors.h"
-+#if defined(USE_SYSTEM_LIBEVENT)
-+#include <event.h>
-+#else
- #include "third_party/libevent/event.h"
- #endif
-+#endif
-
- #include "base/eintr_wrapper.h"
- #include "net/base/net_util.h"
-diff -Naur chromium-4.0.212.0_p26343.orig/net/base/telnet_server.cc
chromium-4.0.212.0_p26343/net/base/telnet_server.cc
---- chromium-4.0.212.0_p26343.orig/net/base/telnet_server.cc 2009-09-17
17:06:23.000000000 +0200
-+++ chromium-4.0.212.0_p26343/net/base/telnet_server.cc 2009-09-17
17:10:06.000000000 +0200
-@@ -13,7 +13,11 @@
- #include <sys/socket.h>
- #include "base/message_loop.h"
- #include "net/base/net_errors.h"
-+#if defined(USE_SYSTEM_LIBEVENT)
-+#include <event.h>
-+#else
- #include "third_party/libevent/event.h"
-+#endif
- #include "base/message_pump_libevent.h"
- #endif
-
-diff -Naur
chromium-4.0.212.0_p26343.orig/net/socket/tcp_client_socket_libevent.cc
chromium-4.0.212.0_p26343/net/socket/tcp_client_socket_libevent.cc
---- chromium-4.0.212.0_p26343.orig/net/socket/tcp_client_socket_libevent.cc
2009-09-17 17:06:23.000000000 +0200
-+++ chromium-4.0.212.0_p26343/net/socket/tcp_client_socket_libevent.cc
2009-09-17 17:09:49.000000000 +0200
-@@ -15,8 +15,11 @@
- #include "base/trace_event.h"
- #include "net/base/io_buffer.h"
- #include "net/base/net_errors.h"
-+#if defined(USE_SYSTEM_LIBEVENT)
-+#include <event.h>
-+#else
- #include "third_party/libevent/event.h"
--
-+#endif
-
- namespace net {
-
-diff -Naur chromium-4.0.212.0_p26343.orig/third_party/libevent/libevent.gyp
chromium-4.0.212.0_p26343/third_party/libevent/libevent.gyp
---- chromium-4.0.212.0_p26343.orig/third_party/libevent/libevent.gyp
2009-12-02 17:36:16.000000000 +0100
-+++ chromium-4.0.212.0_p26343/third_party/libevent/libevent.gyp
2009-12-02 17:46:03.000000000 +0100
-@@ -3,54 +3,78 @@
- # found in the LICENSE file.
-
- {
-- 'targets': [
-- {
-- 'target_name': 'libevent',
-- 'product_name': 'event',
-- 'type': '<(library)',
-- 'sources': [
-- 'buffer.c',
-- 'evbuffer.c',
-- 'evdns.c',
-- 'event.c',
-- 'event_tagging.c',
-- 'evrpc.c',
-- 'evutil.c',
-- 'http.c',
-- 'log.c',
-- 'poll.c',
-- 'select.c',
-- 'signal.c',
-- 'strlcpy.c',
-+ 'variables': {
-+ 'use_system_libevent%': 0,
-+ },
-+ 'conditions': [
-+ ['use_system_libevent==0', {
-+ 'targets': [
-+ {
-+ 'target_name': 'libevent',
-+ 'product_name': 'event',
-+ 'type': '<(library)',
-+ 'sources': [
-+ 'buffer.c',
-+ 'evbuffer.c',
-+ 'evdns.c',
-+ 'event.c',
-+ 'event_tagging.c',
-+ 'evrpc.c',
-+ 'evutil.c',
-+ 'http.c',
-+ 'log.c',
-+ 'poll.c',
-+ 'select.c',
-+ 'signal.c',
-+ 'strlcpy.c',
-+ ],
-+ 'defines': [
-+ 'HAVE_CONFIG_H',
-+ ],
-+ 'include_dirs': [
-+ '.', # libevent includes some of its own headers with
#include <...>
-+ # instead of #include "..."
-+ ],
-+ 'conditions': [
-+ # libevent has platform-specific implementation files. Since
its
-+ # native build uses autoconf, platform-specific config.h files
are
-+ # provided and live in platform-specific directories.
-+ [ 'OS == "linux"', {
-+ 'sources': [ 'epoll.c', 'epoll_sub.c' ],
-+ 'include_dirs': [ 'linux' ],
-+ 'link_settings': {
-+ 'libraries': [
-+ # We need rt for clock_gettime().
-+ # TODO(port) Maybe on FreeBSD as well?
-+ '-lrt',
-+ ],
-+ },
-+ }],
-+ [ 'OS == "mac" or OS == "freebsd"', {
-+ 'sources': [ 'kqueue.c' ],
-+ 'include_dirs': [ 'mac' ]
-+ }],
-+ ],
-+ },
- ],
-- 'defines': [
-- 'HAVE_CONFIG_H',
-- ],
-- 'include_dirs': [
-- '.', # libevent includes some of its own headers with #include
<...>
-- # instead of #include "..."
-- ],
-- 'conditions': [
-- # libevent has platform-specific implementation files. Since its
-- # native build uses autoconf, platform-specific config.h files are
-- # provided and live in platform-specific directories.
-- [ 'OS == "linux"', {
-- 'sources': [ 'epoll.c', 'epoll_sub.c' ],
-- 'include_dirs': [ 'linux' ],
-+ }, {
-+ 'targets': [
-+ {
-+ 'target_name': 'libevent',
-+ 'type': 'settings',
-+ 'direct_dependent_settings': {
-+ 'defines': [
-+ 'USE_SYSTEM_LIBEVENT',
-+ ],
-+ },
- 'link_settings': {
- 'libraries': [
-- # We need rt for clock_gettime().
-- # TODO(port) Maybe on FreeBSD as well?
-- '-lrt',
-+ '-levent',
- ],
- },
-- }],
-- [ 'OS == "mac" or OS == "freebsd"', {
-- 'sources': [ 'kqueue.c' ],
-- 'include_dirs': [ 'mac' ]
-- }],
-+ }
- ],
-- },
-+ }],
- ],
- }
-



  • [SM-Commit] GIT changes to devel-google-chrome grimoire by Eric Sandall (7f4cab14b7b9c909b6198542fc49c1c0653ec335), Eric Sandall, 03/30/2010

Archive powered by MHonArc 2.6.24.

Top of Page