public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-6.0.472.25-r1.ebuild chromium-9999.ebuild
@ 2010-08-10 19:36 PaweA Hajdan (phajdan.jr)
  0 siblings, 0 replies; 3+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2010-08-10 19:36 UTC (permalink / raw
  To: gentoo-commits

phajdan.jr    10/08/10 19:36:59

  Modified:             ChangeLog chromium-6.0.472.25-r1.ebuild
                        chromium-9999.ebuild
  Log:
  Add workaround for bug #331945 by Evan Teran <eteran@alum.rit.edu>, also confirmed by kernelOfTruth on forums. No bump because gcc-4.5 is not even in ~arch.
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.152                www-client/chromium/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.152&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.152&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.151&r2=1.152

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- ChangeLog	10 Aug 2010 01:28:34 -0000	1.151
+++ ChangeLog	10 Aug 2010 19:36:59 -0000	1.152
@@ -1,6 +1,12 @@
 # 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.151 2010/08/10 01:28:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.152 2010/08/10 19:36:59 phajdan.jr Exp $
+
+  10 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-6.0.472.25-r1.ebuild, chromium-9999.ebuild:
+  Add workaround for bug #331945 by Evan Teran <eteran@alum.rit.edu>, also
+  confirmed by kernelOfTruth on forums. No bump because gcc-4.5 is not even
+  in ~arch.
 
 *chromium-6.0.472.25-r1 (10 Aug 2010)
 



1.2                  www-client/chromium/chromium-6.0.472.25-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild?r1=1.1&r2=1.2

Index: chromium-6.0.472.25-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chromium-6.0.472.25-r1.ebuild	10 Aug 2010 01:28:34 -0000	1.1
+++ chromium-6.0.472.25-r1.ebuild	10 Aug 2010 19:36:59 -0000	1.2
@@ -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.472.25-r1.ebuild,v 1.1 2010/08/10 01:28:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v 1.2 2010/08/10 19:36:59 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -157,6 +157,11 @@
 		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
 
+	# Work around a likely GCC bug, see bug #331945.
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
+		append-flags -fno-ipa-cp
+	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.



1.72                 www-client/chromium/chromium-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.71&r2=1.72

Index: chromium-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- chromium-9999.ebuild	8 Aug 2010 18:41:53 -0000	1.71
+++ chromium-9999.ebuild	10 Aug 2010 19:36:59 -0000	1.72
@@ -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-9999.ebuild,v 1.71 2010/08/08 18:41:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.72 2010/08/10 19:36:59 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -207,6 +207,11 @@
 		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
 	fi
 
+	# Work around a likely GCC bug, see bug #331945.
+	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
+		append-flags -fno-ipa-cp
+	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.






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-6.0.472.25-r1.ebuild chromium-9999.ebuild
@ 2010-08-11  0:03 PaweA Hajdan (phajdan.jr)
  0 siblings, 0 replies; 3+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2010-08-11  0:03 UTC (permalink / raw
  To: gentoo-commits

phajdan.jr    10/08/11 00:03:15

  Modified:             ChangeLog chromium-6.0.472.25-r1.ebuild
                        chromium-9999.ebuild
  Log:
  Fix compile with make-3.82, bug #332131 by polynomial-c.
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.153                www-client/chromium/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.152&r2=1.153

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog	10 Aug 2010 19:36:59 -0000	1.152
+++ ChangeLog	11 Aug 2010 00:03:15 -0000	1.153
@@ -1,6 +1,11 @@
 # 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.152 2010/08/10 19:36:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.153 2010/08/11 00:03:15 phajdan.jr Exp $
+
+  11 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-make-3.82-compatibility-r0.patch,
+  chromium-6.0.472.25-r1.ebuild, chromium-9999.ebuild:
+  Fix compile with make-3.82, bug #332131 by polynomial-c.
 
   10 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-6.0.472.25-r1.ebuild, chromium-9999.ebuild:



1.3                  www-client/chromium/chromium-6.0.472.25-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild?r1=1.2&r2=1.3

Index: chromium-6.0.472.25-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chromium-6.0.472.25-r1.ebuild	10 Aug 2010 19:36:59 -0000	1.2
+++ chromium-6.0.472.25-r1.ebuild	11 Aug 2010 00:03:15 -0000	1.3
@@ -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.472.25-r1.ebuild,v 1.2 2010/08/10 19:36:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v 1.3 2010/08/11 00:03:15 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -59,6 +59,9 @@
 }
 
 src_prepare() {
+	# Fix compilation, bug #332131.
+	epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/cros"



1.73                 www-client/chromium/chromium-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.72&r2=1.73

Index: chromium-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- chromium-9999.ebuild	10 Aug 2010 19:36:59 -0000	1.72
+++ chromium-9999.ebuild	11 Aug 2010 00:03:15 -0000	1.73
@@ -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-9999.ebuild,v 1.72 2010/08/10 19:36:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.73 2010/08/11 00:03:15 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -105,6 +105,9 @@
 }
 
 src_prepare() {
+	# Fix compilation, bug #332131.
+	epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/cros"






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-6.0.472.25-r1.ebuild chromium-9999.ebuild
@ 2010-08-11  3:20 PaweA Hajdan (phajdan.jr)
  0 siblings, 0 replies; 3+ messages in thread
From: PaweA Hajdan (phajdan.jr) @ 2010-08-11  3:20 UTC (permalink / raw
  To: gentoo-commits

phajdan.jr    10/08/11 03:20:07

  Modified:             ChangeLog chromium-6.0.472.25-r1.ebuild
                        chromium-9999.ebuild
  Log:
  Update plugins search path instead of using a symlink.
  (Portage version: 2.1.8.3/cvs/Linux i686)

Revision  Changes    Path
1.154                www-client/chromium/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/ChangeLog?r1=1.153&r2=1.154

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog	11 Aug 2010 00:03:15 -0000	1.153
+++ ChangeLog	11 Aug 2010 03:20:06 -0000	1.154
@@ -1,6 +1,11 @@
 # 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.153 2010/08/11 00:03:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.154 2010/08/11 03:20:06 phajdan.jr Exp $
+
+  11 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-plugins-path-r0.patch, chromium-6.0.472.25-r1.ebuild,
+  chromium-9999.ebuild:
+  Update plugins search path instead of using a symlink.
 
   11 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   +files/chromium-make-3.82-compatibility-r0.patch,



1.4                  www-client/chromium/chromium-6.0.472.25-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild?r1=1.3&r2=1.4

Index: chromium-6.0.472.25-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chromium-6.0.472.25-r1.ebuild	11 Aug 2010 00:03:15 -0000	1.3
+++ chromium-6.0.472.25-r1.ebuild	11 Aug 2010 03:20:06 -0000	1.4
@@ -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.472.25-r1.ebuild,v 1.3 2010/08/11 00:03:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.25-r1.ebuild,v 1.4 2010/08/11 03:20:06 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -62,6 +62,9 @@
 	# Fix compilation, bug #332131.
 	epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch
 
+	# Add Gentoo plugin paths.
+	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/cros"
@@ -208,9 +211,6 @@
 	doexe out/Release/ffmpegsumo_nolink || die
 	doexe out/Release/libffmpegsumo.so || die
 
-	# Use system plugins by default.
-	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 "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium



1.74                 www-client/chromium/chromium-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/chromium-9999.ebuild?r1=1.73&r2=1.74

Index: chromium-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- chromium-9999.ebuild	11 Aug 2010 00:03:15 -0000	1.73
+++ chromium-9999.ebuild	11 Aug 2010 03:20:06 -0000	1.74
@@ -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-9999.ebuild,v 1.73 2010/08/11 00:03:15 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.74 2010/08/11 03:20:06 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -108,6 +108,9 @@
 	# Fix compilation, bug #332131.
 	epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch
 
+	# Add Gentoo plugin paths.
+	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
+
 	remove_bundled_lib "third_party/bzip2"
 	remove_bundled_lib "third_party/codesighs"
 	remove_bundled_lib "third_party/cros"
@@ -261,9 +264,6 @@
 	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 "$(get_chromium_home)/plugins"
-
 	# Install icon and desktop entry.
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
 	dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-08-11  3:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-11  0:03 [gentoo-commits] gentoo-x86 commit in www-client/chromium: ChangeLog chromium-6.0.472.25-r1.ebuild chromium-9999.ebuild PaweA Hajdan (phajdan.jr)
  -- strict thread matches above, loose matches on Subject: below --
2010-08-11  3:20 PaweA Hajdan (phajdan.jr)
2010-08-10 19:36 PaweA Hajdan (phajdan.jr)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox