diff options
| -rw-r--r-- | www-client/chromium/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/chromium/Manifest | 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 |
5 files changed, 219 insertions, 8 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/Manifest b/www-client/chromium/Manifest index 5021a470362a..b7a88f90dd64 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,12 +1,13 @@ AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6 AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b +AUX chromium-use_system_libevent-1.4.13.patch 6919 RMD160 1417a38ad95afb61bf90ffab289caebb9de5dd81 SHA1 0337132b42377ccac9ce5b3f9270f26cab2666a7 SHA256 39878315ead10c3b08c5285c7a87a227280b6847d4342ec94c09ec8b8223effa AUX chromium-use_system_libevent.patch 7037 RMD160 97bbc89c749dea1cf8fc555dd055536745013d1c SHA1 54380af0c7a49c0c56c7d0b8c1970b3dffa7aa05 SHA256 cbac7bfab545fab11f1fef00437588bbd643f243168d160c8071422f1e37feeb DIST chromium-4.0.248.0.tar.bz2 136592064 RMD160 fbd155a01b296103144385ed156ff5b18c5d6e4d SHA1 a3916994e2ab8098124994d10dc01c9b063fa70d SHA256 635d762c63f56f79ab13c2279606ec7a7e8ae6b25e766c94351b0b93589c1565 DIST chromium-4.0.251.0.tar.bz2 133265804 RMD160 250d12cab201f53ff87b89c2e4b5a031d34951e8 SHA1 1e8d0e3c4defa13922f898f9612804dd347114f5 SHA256 db6a1a4d1547467bf95f49d175de0644f9917067b2be1e52931d692eba7d994e DIST chromium-4.0.260.0.tar.bz2 134032408 RMD160 6b390458306572f473b4858c8a06fb9cf8f724e0 SHA1 896ffbc613b8d75aeee3de0b3839aee086755556 SHA256 d09986e89b431476005333d00a1bfb8b59f5c7edcaf3781e6a8251468786c7cc EBUILD chromium-4.0.248.0.ebuild 4179 RMD160 72a02b1782b2c4f13088cbf52816ac46c0141975 SHA1 fc5bfdaf9179ac15089811e115c77896ce628995 SHA256 4782bb1aa863c87fdd1d19d698d8ce4564bba4fcf71cb5f18a0bdc1e9659090a EBUILD chromium-4.0.251.0.ebuild 4236 RMD160 c5997b5fc9fc2b394469c3d0ca6fe954659b0da6 SHA1 6ee4a87e064368631767f2d8c89230d5dd692473 SHA256 63ff133a9bfcca4ca37885a6ed3f1f536df246c143311f675af1bcecfeae73d1 -EBUILD chromium-4.0.260.0.ebuild 4061 RMD160 5d7f67069c2ad308f58f682fc3d0979636e8b811 SHA1 638f5e469ae42855a44d262c09e5fba3ec78cbc1 SHA256 2ddb676d8dbc1d143b8ade5aa2b9a22eeecfc089a42d6ce29a3a1105c824636e -EBUILD chromium-9999.ebuild 5954 RMD160 491b4a9c52720cd82d6b77adfdb378c6c2f6e7ac SHA1 0255a13e5af448fb87f1244c62677192ca11441a SHA256 454043ebc13f0a6076a8a96a7c632694878b8c0ff632a914c3afcdb8f71a8477 -MISC ChangeLog 6410 RMD160 f08f39ec3858b9e43fe8d5f55e5de5564d42b1c9 SHA1 536520329529217fa9a7d82fc3429d591a80d23f SHA256 1e9a0182511c100172354f527b16625ac8509a4ecba1f44b41e99f46a17daef6 +EBUILD chromium-4.0.260.0.ebuild 4223 RMD160 1b0767f025db21877cab4d7638e01e010ad92b03 SHA1 af22b3ef16f4e18bc05ae7cf335d99210a6b5510 SHA256 a5824b574bf8a7701f77f65a62a6a9d133786c38b9ee3fb86bec7fc0df766e14 +EBUILD chromium-9999.ebuild 5961 RMD160 91e5385324554740eb332fb4758012c11614a679 SHA1 b5c33ca819b41b090280bd7ffd63d785b3e6898a SHA256 d9c6f6658f9832ea91f1c59a33cd2b90c19a3c2fee7676ad21224642b310a0f2 +MISC ChangeLog 6646 RMD160 12451f82d8c10508c01c08fbcf4729f8a73cdd19 SHA1 82895e5f28cc9307c7e1ac0ffad004296e2c1b36 SHA256 21ec826cfedcedf6eebd899952eef53b9c72d6354af8ef2eaf6855c0afdcb0d7 MISC metadata.xml 482 RMD160 f426cbc83d5b780c7fbb40bbda4dd332d95a8835 SHA1 56486139b7d1bb63d31cb146672fa88405387969 SHA256 b32aa557e06fec6a5e2b838ced4bb8e7504369d8dbb78a1b87f1c385b646e552 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' ] +- }], ++ } + ], +- }, ++ }], + ], + } + |