diff options
author | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-07-10 19:01:48 +0000 |
---|---|---|
committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2010-07-10 19:01:48 +0000 |
commit | c76edd557e0e4ba9b2c3817e3bd0ca5914f99ebc (patch) | |
tree | e49b53d020b62022d403ec966495fcec3b4a9fa7 /www-client | |
parent | marked ~ia64 (diff) | |
download | gentoo-2-c76edd557e0e4ba9b2c3817e3bd0ca5914f99ebc.tar.gz gentoo-2-c76edd557e0e4ba9b2c3817e3bd0ca5914f99ebc.tar.bz2 gentoo-2-c76edd557e0e4ba9b2c3817e3bd0ca5914f99ebc.zip |
Version bump for dev channel release. Removed old ebuilds and patches.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/chromium/ChangeLog | 11 | ||||
-rw-r--r-- | www-client/chromium/chromium-5.0.375.86.ebuild | 177 | ||||
-rw-r--r-- | www-client/chromium/chromium-6.0.458.1.ebuild (renamed from www-client/chromium/chromium-6.0.437.3.ebuild) | 63 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-flash-hang-workaround-r1.patch | 47 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-gyp-fixes-r1.patch | 28 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-gyp-fixes-r2.patch | 10 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-optional-cups-r1.patch | 21 |
7 files changed, 39 insertions, 318 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 74986de075d1..a9eeb0d8603d 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for www-client/chromium # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.135 2010/07/07 15:33:09 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.136 2010/07/10 19:01:48 phajdan.jr Exp $ + +*chromium-6.0.458.1 (10 Jul 2010) + + 10 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> + -files/chromium-flash-hang-workaround-r1.patch, + -chromium-5.0.375.86.ebuild, -files/chromium-gyp-fixes-r1.patch, + -chromium-6.0.437.3.ebuild, -files/chromium-gyp-fixes-r2.patch, + +chromium-6.0.458.1.ebuild, -files/chromium-optional-cups-r1.patch: + Version bump for dev channel release. Removed old ebuilds and patches. 07 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> metadata.xml: Transfer ownership to the new chromium herd. diff --git a/www-client/chromium/chromium-5.0.375.86.ebuild b/www-client/chromium/chromium-5.0.375.86.ebuild deleted file mode 100644 index 184c3bdd644f..000000000000 --- a/www-client/chromium/chromium-5.0.375.86.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.86.ebuild,v 1.3 2010/06/25 20:16:02 angelos Exp $ - -EAPI="2" - -inherit eutils flag-o-matic multilib pax-utils toolchain-funcs - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="+plugins-symlink" - -RDEPEND="app-arch/bzip2 - >=dev-libs/libevent-1.4.13 - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/nss-3.12.3 - >=gnome-base/gconf-2.24.0 - >=media-libs/alsa-lib-1.0.19 - media-libs/jpeg:0 - media-libs/libpng - media-video/ffmpeg[threads] - sys-libs/zlib - >=x11-libs/gtk+-2.14.7 - x11-libs/libXScrnSaver" -# dev-db/sqlite:3 -DEPEND="${RDEPEND} - dev-lang/perl - >=dev-util/gperf-3.0.3 - >=dev-util/pkgconfig-0.23 - sys-devel/flex" -RDEPEND+=" - || ( - x11-themes/gnome-icon-theme - x11-themes/oxygen-molecule - x11-themes/tango-icon-theme - x11-themes/xfce4-icon-theme - ) - x11-apps/xmessage - x11-misc/xdg-utils - virtual/ttf-fonts" - -# Incompatible system plugins: -# www-plugins/gecko-mediaplayer, bug #309231. -RDEPEND+=" - plugins-symlink? ( - !www-plugins/gecko-mediaplayer[gnome] - )" - -src_prepare() { - # Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007 - epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch - - # Allow supporting more media types. - epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch - - # Fix build failure with libpng-1.4, bug 310959. - epatch "${FILESDIR}"/${PN}-libpng-1.4.patch -} - -src_configure() { - export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - - # Workaround for bug #318969. - # TODO: remove when http://crbug.com/43778 is fixed. - append-flags -D__STDC_CONSTANT_MACROS - - # Fails to build on arm if we don't do this - use arm && append-flags -fno-tree-sink - - # Configuration options (system libraries) - local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1" - # -Duse_system_sqlite=1 : http://crbug.com/22208 - # Others still bundled: icu (not possible?), hunspell (changes required for sandbox support) - - # Sandbox paths - myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" - - # Disable the V8 snapshot. It breaks the build on hardened (bug #301880), - # and the performance gain isn't worth it. - myconf="${myconf} -Dv8_use_snapshot=0" - - # Disable tcmalloc memory allocator. It causes problems, - # for example bug #320419. - myconf="${myconf} -Dlinux_use_tcmalloc=0" - - # Disable gpu rendering, it is incompatible with nvidia-drivers, - # bug #319331. - myconf="${myconf} -Denable_gpu=0" - - # Use target arch detection logic from bug #296917. - local myarch="$ABI" - [[ $myarch = "" ]] && myarch="$ARCH" - - if [[ $myarch = amd64 ]] ; then - myconf="${myconf} -Dtarget_arch=x64" - elif [[ $myarch = x86 ]] ; then - myconf="${myconf} -Dtarget_arch=ia32" - elif [[ $myarch = arm ]] ; then - myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" - else - die "Failed to determine target arch, got '$myarch'." - fi - - if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then - myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44" - fi - - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. - myconf="${myconf} -Dwerror=" - - build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed" -} - -src_compile() { - emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \ - rootdir="${S}" \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) \ - || die "compilation failed" -} - -src_install() { - # Chromium does not have "install" target in the build system. - export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - - dodir ${CHROMIUM_HOME} - - exeinto ${CHROMIUM_HOME} - pax-mark m out/Release/chrome - doexe out/Release/chrome - doexe out/Release/chrome_sandbox - fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox - doexe out/Release/xdg-settings - doexe "${FILESDIR}"/chromium-launcher.sh - - insinto ${CHROMIUM_HOME} - doins out/Release/chrome.pak - - doins -r out/Release/locales - doins -r out/Release/resources - - # chrome.1 is for chromium --help - newman out/Release/chrome.1 chrome.1 - newman out/Release/chrome.1 chromium.1 - - # Chromium looks for these in its folder - # See media_posix.cc and base_paths_linux.cc - dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME} - - # Plugins symlink, optional wrt bug #301911 - if use plugins-symlink; then - dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins - fi - - # Icon and desktop entry - newicon out/Release/product_logo_48.png ${PN}-browser.png - dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium - make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" - sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ - || die "desktop file sed failed" - # Gnome default application entry - dodir /usr/share/gnome-control-center/default-apps - insinto /usr/share/gnome-control-center/default-apps - doins "${FILESDIR}"/chromium.xml -} diff --git a/www-client/chromium/chromium-6.0.437.3.ebuild b/www-client/chromium/chromium-6.0.458.1.ebuild index 40309db98fff..b0c0ca045bea 100644 --- a/www-client/chromium/chromium-6.0.437.3.ebuild +++ b/www-client/chromium/chromium-6.0.458.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.437.3.ebuild,v 1.2 2010/06/21 09:25:10 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.458.1.ebuild,v 1.1 2010/07/10 19:01:48 phajdan.jr Exp $ EAPI="2" @@ -17,8 +17,6 @@ IUSE="cups sse2" RDEPEND="app-arch/bzip2 >=dev-libs/libevent-1.4.13 - dev-libs/libxml2 - dev-libs/libxslt >=dev-libs/nss-3.12.3 >=gnome-base/gconf-2.24.0 >=media-libs/alsa-lib-1.0.19 @@ -46,6 +44,10 @@ RDEPEND+=" x11-misc/xdg-utils virtual/ttf-fonts" +get_chromium_home() { + echo "/usr/$(get_libdir)/chromium-browser" +} + remove_bundled_lib() { einfo "Removing bundled library $1 ..." local out @@ -60,37 +62,28 @@ src_prepare() { # Disable VP8 until we have a recent enough system-provided ffmpeg. epatch "${FILESDIR}"/${PN}-disable-vp8-r1.patch - # Make dependency on cups optional, bug #324105. - epatch "${FILESDIR}"/${PN}-optional-cups-r1.patch - - # Fix gyp files to correctly support system-provided libraries. - epatch "${FILESDIR}"/${PN}-gyp-fixes-r2.patch - remove_bundled_lib "third_party/bzip2" remove_bundled_lib "third_party/libevent" remove_bundled_lib "third_party/libjpeg" remove_bundled_lib "third_party/libpng" - remove_bundled_lib "third_party/libxml" - remove_bundled_lib "third_party/libxslt" + # TODO: also remove third_party/libxml and third_party/libxslt when + # http://crbug.com/29333 is fixed. # TODO: also remove third_party/zlib. For now the compilation fails if we # remove it (minizip-related). } src_configure() { - export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - - # Workaround for bug #318969. - # TODO: remove when http://crbug.com/43778 is fixed. - append-flags -D__STDC_CONSTANT_MACROS - local myconf="" # Make it possible to build chromium on non-sse2 systems. - if ! use sse2; then + if use sse2; then + myconf="${myconf} -Ddisable_sse2=0" + else myconf="${myconf} -Ddisable_sse2=1" fi # Use system-provided libraries. + # TODO: use_system_libxml (http://crbug.com/29333). # TODO: use_system_sqlite (http://crbug.com/22208). # TODO: use_system_icu, use_system_hunspell (upstream changes needed). # TODO: use_system_ssl when we have a recent enough system NSS. @@ -100,7 +93,6 @@ src_configure() { -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 - -Duse_system_libxml=1 -Duse_system_zlib=1" # The system-provided ffmpeg supports more codecs. Enable them in chromium. @@ -115,8 +107,8 @@ src_configure() { # Enable sandbox. myconf="${myconf} - -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox - -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome" + -Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox + -Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome" # Disable the V8 snapshot. It breaks the build on hardened (bug #301880), # and the performance gain isn't worth it. @@ -139,7 +131,10 @@ src_configure() { elif [[ $myarch = x86 ]] ; then myconf="${myconf} -Dtarget_arch=ia32" elif [[ $myarch = arm ]] ; then + # TODO: check this again after + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed. append-flags -fno-tree-sink + myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0" else die "Failed to determine target arch, got '$myarch'." @@ -168,20 +163,19 @@ src_compile() { } src_install() { - export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser - - dodir ${CHROMIUM_HOME} + dodir "$(get_chromium_home)" - exeinto ${CHROMIUM_HOME} + exeinto "$(get_chromium_home)" pax-mark m out/Release/chrome doexe out/Release/chrome doexe out/Release/chrome_sandbox - fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox + fperms 4755 "$(get_chromium_home)/chrome_sandbox" doexe out/Release/xdg-settings doexe "${FILESDIR}"/chromium-launcher.sh - insinto ${CHROMIUM_HOME} - doins out/Release/chrome.pak + insinto "$(get_chromium_home)" + doins out/Release/chrome.pak || die "installing chrome.pak failed" + doins out/Release/resources.pak || die "installing resources.pak failed" doins -r out/Release/locales doins -r out/Release/resources @@ -192,17 +186,18 @@ src_install() { # Chromium looks for these in its folder # See media_posix.cc and base_paths_linux.cc - dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME} - dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME} + dosym /usr/$(get_libdir)/libavcodec.so.52 "$(get_chromium_home)" + dosym /usr/$(get_libdir)/libavformat.so.52 "$(get_chromium_home)" + dosym /usr/$(get_libdir)/libavutil.so.50 "$(get_chromium_home)" # Use system plugins by default. - dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins + dosym /usr/$(get_libdir)/nsbrowser/plugins "$(get_chromium_home)/plugins" # Install icon and desktop entry. newicon out/Release/product_logo_48.png ${PN}-browser.png - dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium - make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" + dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium + make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \ + "MimeType=text/html;text/xml;application/xhtml+xml;" sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \ || die "desktop file sed failed" diff --git a/www-client/chromium/files/chromium-flash-hang-workaround-r1.patch b/www-client/chromium/files/chromium-flash-hang-workaround-r1.patch deleted file mode 100644 index bafeb23d82eb..000000000000 --- a/www-client/chromium/files/chromium-flash-hang-workaround-r1.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: webkit/glue/plugins/webplugin_delegate_impl.h -=================================================================== ---- webkit/glue/plugins/webplugin_delegate_impl.h (revision 48979) -+++ webkit/glue/plugins/webplugin_delegate_impl.h (working copy) -@@ -68,6 +68,7 @@ - PLUGIN_QUIRK_PATCH_REGENUMKEYEXW = 2048, // Windows - PLUGIN_QUIRK_ALWAYS_NOTIFY_SUCCESS = 4096, // Windows - PLUGIN_QUIRK_ALLOW_FASTER_QUICKDRAW_PATH = 8192, // Mac -+ PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK = 32768, // Linux - }; - - static WebPluginDelegateImpl* Create(const FilePath& filename, -Index: webkit/glue/plugins/webplugin_delegate_impl_gtk.cc -=================================================================== ---- webkit/glue/plugins/webplugin_delegate_impl_gtk.cc (revision 48979) -+++ webkit/glue/plugins/webplugin_delegate_impl_gtk.cc (working copy) -@@ -55,9 +55,13 @@ - memset(&window_, 0, sizeof(window_)); - if (instance_->mime_type() == "application/x-shockwave-flash") { - // Flash is tied to Firefox's whacky behavior with windowless plugins. See -- // comments in WindowlessPaint -+ // comments in WindowlessPaint. -+ // TODO(viettrungluu): PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK: Don't allow -+ // right-clicks in windowless content since Flash 10.1 (initial release, at -+ // least) hangs in that case. Remove this once Flash is fixed. - quirks_ |= PLUGIN_QUIRK_WINDOWLESS_OFFSET_WINDOW_TO_DRAW -- | PLUGIN_QUIRK_WINDOWLESS_INVALIDATE_AFTER_SET_WINDOW; -+ | PLUGIN_QUIRK_WINDOWLESS_INVALIDATE_AFTER_SET_WINDOW -+ | PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK; - } - - // TODO(evanm): I played with this for quite a while but couldn't -@@ -696,6 +700,14 @@ - if (!NPEventFromWebInputEvent(event, timestamp, &np_event)) { - return false; - } -+ // See comment about PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK in constructor. -+ if (windowless_ && -+ (quirks_ & PLUGIN_QUIRK_WINDOWLESS_NO_RIGHT_CLICK) && -+ (np_event.type == ButtonPress || np_event.type == ButtonRelease) && -+ (np_event.xbutton.button == Button3)) { -+ return false; -+ } -+ - bool ret = instance()->NPP_HandleEvent(&np_event) != 0; - - // Flash always returns false, even when the event is handled. diff --git a/www-client/chromium/files/chromium-gyp-fixes-r1.patch b/www-client/chromium/files/chromium-gyp-fixes-r1.patch deleted file mode 100644 index 885e8ed0f09c..000000000000 --- a/www-client/chromium/files/chromium-gyp-fixes-r1.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- chrome/chrome.gyp.orig 2010-06-10 10:25:49.000000000 +0200 -+++ chrome/chrome.gyp 2010-06-10 10:26:52.000000000 +0200 -@@ -462,6 +462,7 @@ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { - 'dependencies': [ - '../build/linux/system.gyp:gtk', -+ '../third_party/libevent/libevent.gyp:libevent', - ], - }], - ], ---- net/net.gyp.orig 2010-06-10 11:42:35.000000000 +0200 -+++ net/net.gyp 2010-06-10 11:43:21.000000000 +0200 -@@ -179,6 +179,7 @@ - '../build/linux/system.gyp:gconf', - '../build/linux/system.gyp:gdk', - '../build/linux/system.gyp:nss', -+ '../third_party/libevent/libevent.gyp:libevent', - ], - }, - { # else: OS is not in the above list -@@ -560,6 +561,7 @@ - '../build/linux/system.gyp:gconf', - '../build/linux/system.gyp:gdk', - '../build/linux/system.gyp:nss', -+ '../third_party/libevent/libevent.gyp:libevent', - ], - }, - { # else: OS is not in the above list diff --git a/www-client/chromium/files/chromium-gyp-fixes-r2.patch b/www-client/chromium/files/chromium-gyp-fixes-r2.patch deleted file mode 100644 index ffd4fba3a696..000000000000 --- a/www-client/chromium/files/chromium-gyp-fixes-r2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/chrome_common.gypi.orig 2010-06-16 21:14:51.000000000 +0200 -+++ chrome/chrome_common.gypi 2010-06-16 21:16:13.000000000 +0200 -@@ -130,6 +130,7 @@ - '../ipc/ipc.gyp:ipc', - '../net/net.gyp:net', - '../skia/skia.gyp:skia', -+ '../third_party/bzip2/bzip2.gyp:bzip2', - '../third_party/icu/icu.gyp:icui18n', - '../third_party/icu/icu.gyp:icuuc', - '../third_party/libxml/libxml.gyp:libxml', diff --git a/www-client/chromium/files/chromium-optional-cups-r1.patch b/www-client/chromium/files/chromium-optional-cups-r1.patch deleted file mode 100644 index f9e87a76643e..000000000000 --- a/www-client/chromium/files/chromium-optional-cups-r1.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- chrome/chrome.gyp.orig 2010-06-16 21:19:14.000000000 +0200 -+++ chrome/chrome.gyp 2010-06-16 21:26:33.000000000 +0200 -@@ -1098,6 +1098,9 @@ - 'include_dirs': [ - '..', - ], -+ 'variables': { -+ 'use_cups%': 1, -+ }, - 'conditions': [ - ['OS=="win"', { - 'defines': [ -@@ -1114,7 +1117,7 @@ - '../build/linux/system.gyp:gtk', - ], - }], -- ['OS=="linux" and chromeos==0 and target_arch!="arm"', { -+ ['OS=="linux" and chromeos==0 and target_arch!="arm" and use_cups==1', { - 'link_settings': { - 'libraries': [ - '-lcups', |