pacho 15/01/21 23:23:46
Modified: webkit-gtk-2.4.8-r200.ebuild
webkit-gtk-2.4.8.ebuild ChangeLog
Removed: webkit-gtk-2.2.6-r201.ebuild
webkit-gtk-2.4.4-r1.ebuild
webkit-gtk-2.4.4-r201.ebuild
webkit-gtk-2.2.6-r1.ebuild
Log:
Fix building with x11+wayland (#536898 by Reinis Danne and Denis Lisov), drop
old
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
A188FBD4)
Revision Changes Path
1.2 net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild?r1=1.1&r2=1.2
Index: webkit-gtk-2.4.8-r200.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- webkit-gtk-2.4.8-r200.ebuild 14 Jan 2015 22:21:12 -0000 1.1
+++ webkit-gtk-2.4.8-r200.ebuild 21 Jan 2015 23:23:46 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.8-r200.ebuild,v 1.1
2015/01/14 22:21:12 pacho Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8-r200.ebuild,v 1.2
2015/01/21 23:23:46 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -182,6 +182,10 @@
# https://bugs.webkit.org/show_bug.cgi?id=137640
epatch "${FILESDIR}"/${PN}-2.4.7-disable-accelerated-compositing.patch
+ # Fix building with x11+wayland, bug #536898
+ # https://bugs.webkit.org/show_bug.cgi?id=140241
+ epatch "${FILESDIR}"/${PN}-2.4.8-wayland-webkit2.patch
+
AT_M4DIR=Source/autotools eautoreconf
gnome2_src_prepare
1.2 net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild?r1=1.1&r2=1.2
Index: webkit-gtk-2.4.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- webkit-gtk-2.4.8.ebuild 14 Jan 2015 22:21:12 -0000 1.1
+++ webkit-gtk-2.4.8.ebuild 21 Jan 2015 23:23:46 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.8.ebuild,v 1.1
2015/01/14 22:21:12 pacho Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild,v 1.2
2015/01/21 23:23:46 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -192,6 +192,10 @@
# https://bugs.webkit.org/show_bug.cgi?id=137640
epatch "${FILESDIR}"/${PN}-2.4.7-disable-accelerated-compositing.patch
+ # Fix building with x11+wayland, bug #536898
+ # https://bugs.webkit.org/show_bug.cgi?id=140241
+ epatch "${FILESDIR}"/${PN}-2.4.8-wayland-webkit2.patch
+
AT_M4DIR=Source/autotools eautoreconf
gnome2_src_prepare
1.306 net-libs/webkit-gtk/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.306&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.306&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.305&r2=1.306
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- ChangeLog 14 Jan 2015 22:21:12 -0000 1.305
+++ ChangeLog 21 Jan 2015 23:23:46 -0000 1.306
@@ -1,6 +1,17 @@
# ChangeLog for net-libs/webkit-gtk
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.305
2015/01/14 22:21:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.306
2015/01/21 23:23:46 pacho Exp $
+
+ 21 Jan 2015; Pacho Ramos <pa...@gentoo.org>
+ +files/webkit-gtk-2.4.8-wayland-webkit2.patch,
+ -files/webkit-gtk-2.2.4-unittests-build.patch,
+ -files/webkit-gtk-2.2.5-sparc64-build.patch,
+ -files/webkit-gtk-2.4.6-gstreamer-check.patch, -webkit-gtk-2.2.6-r1.ebuild,
+ -webkit-gtk-2.2.6-r201.ebuild, -webkit-gtk-2.4.4-r1.ebuild,
+ -webkit-gtk-2.4.4-r201.ebuild, webkit-gtk-2.4.8-r200.ebuild,
+ webkit-gtk-2.4.8.ebuild:
+ Fix building with x11+wayland (#536898 by Reinis Danne and Denis Lisov), drop
+ old
*webkit-gtk-2.4.8 (14 Jan 2015)
*webkit-gtk-2.4.8-r200 (14 Jan 2015)
