diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-02 17:14:31 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2009-12-02 17:14:31 +0000 |
commit | 3e99b5d05d2453e24881d19af66f22dbf1b1051c (patch) | |
tree | efb5a25dd2a00de9baa04a0af16f28963a6ddd1c /www-client/chromium | |
parent | make khelpcenter optional (diff) | |
download | gentoo-2-3e99b5d05d2453e24881d19af66f22dbf1b1051c.tar.gz gentoo-2-3e99b5d05d2453e24881d19af66f22dbf1b1051c.tar.bz2 gentoo-2-3e99b5d05d2453e24881d19af66f22dbf1b1051c.zip |
Update external libevent patch and re-enable it, crash was unrelated to it
(Portage version: 2.2_rc54/cvs/Linux x86_64)
Diffstat (limited to 'www-client/chromium')
-rw-r--r-- | www-client/chromium/ChangeLog | 7 | ||||
-rw-r--r-- | www-client/chromium/chromium-4.0.260.0.ebuild | 7 | ||||
-rw-r--r-- | www-client/chromium/chromium-9999.ebuild | 4 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-use_system_libevent-1.4.13.patch | 202 |
4 files changed, 215 insertions, 5 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 6dcde4fe2224..0b494728aada 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/chromium # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.28 2009/12/01 16:01:32 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.29 2009/12/02 17:14:31 voyageur Exp $ + + 02 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org> + +files/chromium-use_system_libevent-1.4.13.patch, + chromium-4.0.260.0.ebuild, chromium-9999.ebuild: + Update external libevent patch and re-enable it, crash was unrelated to it 01 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org> chromium-4.0.260.0.ebuild, chromium-9999.ebuild: diff --git a/www-client/chromium/chromium-4.0.260.0.ebuild b/www-client/chromium/chromium-4.0.260.0.ebuild index b167e65a1afb..0848a822dec7 100644 --- a/www-client/chromium/chromium-4.0.260.0.ebuild +++ b/www-client/chromium/chromium-4.0.260.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.260.0.ebuild,v 1.2 2009/12/01 16:01:32 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-4.0.260.0.ebuild,v 1.3 2009/12/02 17:14:31 voyageur Exp $ EAPI="2" inherit eutils multilib toolchain-funcs @@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86" IUSE="+ffmpeg" RDEPEND="app-arch/bzip2 + >=dev-libs/libevent-1.4.13 dev-libs/libxml2 dev-libs/libxslt >=dev-libs/nss-3.12.3 @@ -43,6 +44,8 @@ src_prepare() { sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed" # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007 epatch "${FILESDIR}"/${PN}-drop_sse2.patch + # Add configuration flag to use system libevent + epatch "${FILESDIR}"/${PN}-use_system_libevent-1.4.13.patch # Disable prefixing to allow linking against system zlib sed -e '/^#include "mozzconf.h"$/d' \ @@ -64,7 +67,7 @@ EOF export HOME="${S}" # Configuration options (system libraries) - local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1" + local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1" # -Duse_system_sqlite=1 : http://crbug.com/22208 # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support) diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild index 278ec81a6d42..692a26d32b49 100644 --- a/www-client/chromium/chromium-9999.ebuild +++ b/www-client/chromium/chromium-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.10 2009/12/01 16:01:32 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.11 2009/12/02 17:14:31 voyageur Exp $ EAPI="2" inherit eutils multilib toolchain-funcs subversion @@ -89,7 +89,7 @@ src_prepare() { # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007 epatch "${FILESDIR}"/${PN}-drop_sse2.patch # Add configuration flag to use system libevent - epatch "${FILESDIR}"/${PN}-use_system_libevent.patch + epatch "${FILESDIR}"/${PN}-use_system_libevent-1.4.13.patch # Disable prefixing to allow linking against system zlib sed -e '/^#include "mozzconf.h"$/d' \ diff --git a/www-client/chromium/files/chromium-use_system_libevent-1.4.13.patch b/www-client/chromium/files/chromium-use_system_libevent-1.4.13.patch new file mode 100644 index 000000000000..3d1be28c4a0c --- /dev/null +++ b/www-client/chromium/files/chromium-use_system_libevent-1.4.13.patch @@ -0,0 +1,202 @@ +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' ] +- }], ++ } + ], +- }, ++ }], + ], + } + |