pacho 14/07/23 16:41:19
Modified: webkit-gtk-2.4.4-r200.ebuild
webkit-gtk-2.4.4.ebuild ChangeLog
Removed: webkit-gtk-2.4.3-r200.ebuild
webkit-gtk-2.4.3.ebuild
Log:
Reintroduce the ugly hack for nvidia setups as it keeps hanging in some. Drop
old.
(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed
Manifest commit with key A188FBD4)
Revision Changes Path
1.4 net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild?r1=1.3&r2=1.4
Index: webkit-gtk-2.4.4-r200.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- webkit-gtk-2.4.4-r200.ebuild 23 Jul 2014 15:24:00 -0000 1.3
+++ webkit-gtk-2.4.4-r200.ebuild 23 Jul 2014 16:41:19 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild,v 1.3
2014/07/23 15:24:00 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild,v 1.4
2014/07/23 16:41:19 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -94,6 +94,8 @@
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
+ nvidia_check || die #463960
+
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq
"-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with
debugging CFLAGS"
check-reqs_pkg_pretend
@@ -105,6 +107,8 @@
}
pkg_setup() {
+ nvidia_check || die #463960
+
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq
"-g*0" ; then
if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
@@ -275,3 +279,20 @@
# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
rm -rf "${ED}usr/share/gtk-doc" || die
}
+
+nvidia_check() {
+ if [[ ${MERGE_TYPE} != "binary" ]] &&
+ use introspection &&
+ has_version '=x11-drivers/nvidia-drivers-325*' &&
+ [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+ then
+ eerror "${PN} freezes while compiling if
x11-drivers/nvidia-drivers-325.* is"
+ eerror "used as the system OpenGL library."
+ eerror "You can either update to >=nvidia-drivers-331.13, or
temporarily select"
+ eerror "Mesa as the system OpenGL library:"
+ eerror " # eselect opengl set xorg-x11"
+ eerror "See https://bugs.gentoo.org/463960 for more details."
+ eerror
+ return 1
+ fi
+}
1.4 net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild?r1=1.3&r2=1.4
Index: webkit-gtk-2.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- webkit-gtk-2.4.4.ebuild 23 Jul 2014 15:24:00 -0000 1.3
+++ webkit-gtk-2.4.4.ebuild 23 Jul 2014 16:41:19 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild,v 1.3
2014/07/23 15:24:00 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild,v 1.4
2014/07/23 16:41:19 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -100,6 +100,8 @@
CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
pkg_pretend() {
+ nvidia_check || die #463960
+
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq
"-g*0" ; then
einfo "Checking for sufficient disk space to build ${PN} with
debugging CFLAGS"
check-reqs_pkg_pretend
@@ -111,6 +113,8 @@
}
pkg_setup() {
+ nvidia_check || die #463960
+
# Check whether any of the debugging flags is enabled
if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq
"-g*0" ; then
if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
@@ -277,3 +281,20 @@
# Prevents crashes on PaX systems
use jit && pax-mark m "${ED}usr/bin/jsc-3"
}
+
+nvidia_check() {
+ if [[ ${MERGE_TYPE} != "binary" ]] &&
+ use introspection &&
+ has_version '=x11-drivers/nvidia-drivers-325*' &&
+ [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+ then
+ eerror "${PN} freezes while compiling if
x11-drivers/nvidia-drivers-325.* is"
+ eerror "used as the system OpenGL library."
+ eerror "You can either update to >=nvidia-drivers-331.13, or
temporarily select"
+ eerror "Mesa as the system OpenGL library:"
+ eerror " # eselect opengl set xorg-x11"
+ eerror "See https://bugs.gentoo.org/463960 for more details."
+ eerror
+ return 1
+ fi
+}
\ No newline at end of file
1.271 net-libs/webkit-gtk/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.271&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.271&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.270&r2=1.271
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- ChangeLog 23 Jul 2014 15:24:00 -0000 1.270
+++ ChangeLog 23 Jul 2014 16:41:19 -0000 1.271
@@ -1,6 +1,12 @@
# ChangeLog for net-libs/webkit-gtk
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.270
2014/07/23 15:24:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.271
2014/07/23 16:41:19 pacho Exp $
+
+ 23 Jul 2014; Pacho Ramos <pa...@gentoo.org> -webkit-gtk-2.4.3-r200.ebuild,
+ -webkit-gtk-2.4.3.ebuild, webkit-gtk-2.4.4-r200.ebuild,
+ webkit-gtk-2.4.4.ebuild:
+ Reintroduce the ugly hack for nvidia setups as it keeps hanging in some. Drop
+ old.
23 Jul 2014; Agostino Sarubbo <a...@gentoo.org> webkit-gtk-2.4.4-r200.ebuild,
webkit-gtk-2.4.4.ebuild:
