projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 84b94ce)
Fix build failures: bug #386931 by Kamen Dokov (disabled NaCl again), bug #387145...
authorPaweł Hajdan <phajdan.jr@gentoo.org>
Sat, 15 Oct 2011 03:12:32 +0000 (03:12 +0000)
committerPaweł Hajdan <phajdan.jr@gentoo.org>
Sat, 15 Oct 2011 03:12:32 +0000 (03:12 +0000)
Package-Manager: portage-2.1.10.11/cvs/Linux i686

www-client/chromium/ChangeLog patch | blob | history
www-client/chromium/Manifest patch | blob | history
www-client/chromium/chromium-16.0.904.0-r2.ebuild patch | blob | history
www-client/chromium/chromium-9999-r1.ebuild patch | blob | history

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 128161e6db0d63e8b13c0f3655ccd41f299cac99..f83c79dba46793061070929878bf1ea9837fb346 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.467 2011/10/13 04:11:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.468 2011/10/15 03:12:32 phajdan.jr Exp $
+
+  15 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-16.0.904.0-r2.ebuild, chromium-9999-r1.ebuild:
+  Fix build failures: bug #386931 by Kamen Dokov (disabled NaCl again), bug
+  #387145 by Agostino Sarubbo (required recent enough V8).
 
   13 Oct 2011; Mike Gilbert <floppym@gentoo.org> chromium-9999-r1.ebuild:
   Don't depend on scons; we are using the bundled copy.
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f88f1aaabbe086202351375360a9a13ed9a0d33f..0371673bde206fa28d5400b98a0a9b4a5a3e7744 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
 AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99
@@ -22,14 +22,14 @@ EBUILD chromium-15.0.874.83.ebuild 14224 RMD160 df78a96ac7bd075a4a8f21fd24a1fc3b
 EBUILD chromium-15.0.874.92.ebuild 14224 RMD160 0188245d09b5d7eb8152c5d6247fc54a36dafc59 SHA1 960f6920c927393948fca81dd93c26aef09d976f SHA256 47e9062d9f357861abc7592cf48a596003961d59a88b4ec2ac8bca4233b46093
 EBUILD chromium-16.0.899.0.ebuild 13949 RMD160 5a5333ade34f2aacc504f70e16faf4b2ad4144b7 SHA1 06bb027a26c5517240ae9c2e4aef2a8eee7e5e70 SHA256 cd314d18256783329639ab69f9e088daad5c6fe5344a6c0e4a6c0c848c5a8cf4
 EBUILD chromium-16.0.904.0-r1.ebuild 14033 RMD160 10e2b2168b0b28fd5b0917a1f07da74403a0a51e SHA1 3e6312696579f3b30f4a71ba66b08649c80b8d79 SHA256 695c873b84ac7712f307de2c0d4a9cfee7b00d4e99b92a8375d57e6fba521682
-EBUILD chromium-16.0.904.0-r2.ebuild 14762 RMD160 35dc78eedd7d3c4c313d43d1329412ce939547ff SHA1 d04b09478c1129e420880cab3ac10d7aa5c51555 SHA256 3dc72820096c558e6de790c6e0d3c7531a67584e8f73a8ba901d803eebd422c8
-EBUILD chromium-9999-r1.ebuild 17339 RMD160 c1f31b13dcc091eca8977889a698d0d2e91304bf SHA1 49c17717fefe8d9e32213fc2f102cbbfa48c1b38 SHA256 9cdab1ce5c40a97a1021ec06a477b6f6b5af6bd2019178aae2b881fb7241d81b
-MISC ChangeLog 102976 RMD160 3274d321a58536c11bbf3ef86169b9b66d083500 SHA1 036d3cd5a63d30f29da9b2ce6fcd16d4a28c4895 SHA256 4915c85dd821ad0101480e5bd8485b61e440653cd3909494815e671ac95f455b
+EBUILD chromium-16.0.904.0-r2.ebuild 14749 RMD160 c56f6e5ee4d4ee9201c108e51fb29469b6a01120 SHA1 71d006f584b236d3777e8a0fc5cecf3a498c3ac3 SHA256 39822699972fe1b6eadbd3eb55d62902fee06ed495979dabba30dc306a01ad60
+EBUILD chromium-9999-r1.ebuild 17326 RMD160 cf66e7261e9d5a890b4c06cd915d1bcf183b7faf SHA1 0e86aaf64abe72a3cba204060672631cfa480cef SHA256 5d6593c55705dbd7af2dbfd50abe042bda4d1f8f6bab4ed2b3a667357e1ddde9
+MISC ChangeLog 103228 RMD160 09ffea2f67955a98fc1acfb2e9a6b064c204d464 SHA1 8540882d6e0f9f3014659e4d383d047aca73f473 SHA256 4747db26c29d2e002fb4a57eefb4e4833fbf5417fce8ad8a0b57ee80d9c13666
 MISC metadata.xml 495 RMD160 91f2c4344cde85374523c8c16f5987ad0320b607 SHA1 5e97c7979fac0de374958532e38fcbca1191963b SHA256 375fb24d5d647728a58b3a7d0d552bf7d8eb5f26eef3c249dcf9a2dcb9e5bb37
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6WZRYACgkQC77qH+pIQ6S5uQEAgSSuDDbOtu3IvuiNMpZdNnhH
-uVu5vuIlgML0Bmvr52kA/0SqEdpsmGYzlOho36JTqJsa0AvdF+zqJXC2Ke0/nGhx
-=XWRg
+iEYEAREKAAYFAk6Y+icACgkQuUQtlDBCeQKpoACeMoZxAs133L61VwKTuyWaj1ap
+C5cAn3apDKMne0OHnMnGZn9iimPhCskX
+=duC0
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-16.0.904.0-r2.ebuild b/www-client/chromium/chromium-16.0.904.0-r2.ebuild
index 8dabd365fdf1b542843fe760ec57050b806f7391..23e6103810e9a889320d866398b5271911ab90cf 100644 (file)
--- a/www-client/chromium/chromium-16.0.904.0-r2.ebuild
+++ b/www-client/chromium/chromium-16.0.904.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.904.0-r2.ebuild,v 1.2 2011/10/13 03:48:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.904.0-r2.ebuild,v 1.3 2011/10/15 03:12:32 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -26,7 +26,7 @@ for lang in ${LANGS}; do
 done
 
 RDEPEND="app-arch/bzip2
-       dev-lang/v8
+       >=dev-lang/v8-3.6.5.1
        dev-libs/dbus-glib
        dev-libs/elfutils
        >=dev-libs/icu-4.4.1
@@ -54,7 +54,6 @@ RDEPEND="app-arch/bzip2
        x11-libs/libXtst
        kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
-       dev-lang/nacl-toolchain-newlib
        dev-lang/perl
        >=dev-util/gperf-3.0.3
        >=dev-util/pkgconfig-0.23
@@ -131,9 +130,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       ln -s "/usr/$(get_libdir)/nacl-toolchain-newlib" \
-               "native_client/toolchain/linux_x86_newlib" || die
-
        # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
        sed -i '1i#define OF(x) x' \
                third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
@@ -211,6 +207,9 @@ src_configure() {
        # additions, bug #336871.
        myconf+=" -Ddisable_sse2=1"
 
+       # Disable NaCl temporarily, bug #386931 (amd64-specific).
+       myconf+=" -Ddisable_nacl=1"
+
        # Use system-provided libraries.
        # TODO: use_system_ffmpeg
        # TODO: use_system_hunspell (upstream changes needed).
@@ -340,17 +339,17 @@ src_install() {
        fi
 
        # Install Native Client files on platforms that support it.
-       insinto "${CHROMIUM_HOME}"
-       case "$(tc-arch)" in
-               amd64)
-                       doins out/Release/nacl_irt_x86_64.nexe || die
-                       doins out/Release/libppGoogleNaClPluginChrome.so || die
-               ;;
-               x86)
-                       doins out/Release/nacl_irt_x86_32.nexe || die
-                       doins out/Release/libppGoogleNaClPluginChrome.so || die
-               ;;
-       esac
+       # insinto "${CHROMIUM_HOME}"
+       # case "$(tc-arch)" in
+       #       amd64)
+       #               doins out/Release/nacl_irt_x86_64.nexe || die
+       #               doins out/Release/libppGoogleNaClPluginChrome.so || die
+       #       ;;
+       #       x86)
+       #               doins out/Release/nacl_irt_x86_32.nexe || die
+       #               doins out/Release/libppGoogleNaClPluginChrome.so || die
+       #       ;;
+       # esac
 
        newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
 
diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild
index 3f8222da3ef6cdfa16b9623bd39098231eb92039..aa225c55bc68f70a8ce2365c44f73e64af42183a 100644 (file)
--- a/www-client/chromium/chromium-9999-r1.ebuild
+++ b/www-client/chromium/chromium-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.59 2011/10/13 04:11:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.60 2011/10/15 03:12:32 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -26,7 +26,7 @@ for lang in ${LANGS}; do
 done
 
 RDEPEND="app-arch/bzip2
-       dev-lang/v8
+       >=dev-lang/v8-3.6.5.1
        dev-libs/dbus-glib
        dev-libs/elfutils
        >=dev-libs/icu-4.4.1
@@ -54,7 +54,6 @@ RDEPEND="app-arch/bzip2
        x11-libs/libXtst
        kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
-       dev-lang/nacl-toolchain-newlib
        dev-lang/perl
        dev-python/simplejson
        >=dev-util/gperf-3.0.3
@@ -184,9 +183,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       ln -s "/usr/$(get_libdir)/nacl-toolchain-newlib" \
-               "native_client/toolchain/linux_x86_newlib" || die
-
        # zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
        sed -i '1i#define OF(x) x' \
                third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
@@ -264,6 +260,9 @@ src_configure() {
        # additions, bug #336871.
        myconf+=" -Ddisable_sse2=1"
 
+       # Disable NaCl temporarily, bug #386931 (amd64-specific).
+       myconf+=" -Ddisable_nacl=1"
+
        # Use system-provided libraries.
        # TODO: use_system_ffmpeg
        # TODO: use_system_hunspell (upstream changes needed).
@@ -393,17 +392,17 @@ src_install() {
        fi
 
        # Install Native Client files on platforms that support it.
-       insinto "${CHROMIUM_HOME}"
-       case "$(tc-arch)" in
-               amd64)
-                       doins out/Release/nacl_irt_x86_64.nexe || die
-                       doins out/Release/libppGoogleNaClPluginChrome.so || die
-               ;;
-               x86)
-                       doins out/Release/nacl_irt_x86_32.nexe || die
-                       doins out/Release/libppGoogleNaClPluginChrome.so || die
-               ;;
-       esac
+       # insinto "${CHROMIUM_HOME}"
+       # case "$(tc-arch)" in
+       #       amd64)
+       #               doins out/Release/nacl_irt_x86_64.nexe || die
+       #               doins out/Release/libppGoogleNaClPluginChrome.so || die
+       #       ;;
+       #       x86)
+       #               doins out/Release/nacl_irt_x86_32.nexe || die
+       #               doins out/Release/libppGoogleNaClPluginChrome.so || die
+       #       ;;
+       # esac
 
        newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
        sed "s:chromium-browser:chromium-browser${SUFFIX}:g" \
Unnamed repository; edit this file 'description' to name the repository.