ssuominen 14/08/21 11:19:07
Modified: webkit-gtk-2.4.4-r200.ebuild
webkit-gtk-2.4.4.ebuild ChangeLog
Log:
Fix building with media-libs/jpeg >= 9a wrt #481688 by Maurice van der Pot
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
4868F14D)
Revision Changes Path
1.7 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.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild?rev=1.7&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.6&r2=1.7
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- webkit-gtk-2.4.4-r200.ebuild 21 Aug 2014 10:45:31 -0000 1.6
+++ webkit-gtk-2.4.4-r200.ebuild 21 Aug 2014 11:19:07 -0000 1.7
@@ -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.6
2014/08/21 10:45:31 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4-r200.ebuild,v 1.7
2014/08/21 11:19:07 ssuominen Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -175,6 +175,8 @@
# https://bugs.webkit.org/show_bug.cgi?id=129542
epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
+ epatch "${FILESDIR}"/${P}-jpeg-9a.patch #481688
+
AT_M4DIR=Source/autotools eautoreconf
gnome2_src_prepare
1.8 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.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild?rev=1.8&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.7&r2=1.8
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- webkit-gtk-2.4.4.ebuild 21 Aug 2014 10:45:31 -0000 1.7
+++ webkit-gtk-2.4.4.ebuild 21 Aug 2014 11:19:07 -0000 1.8
@@ -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.7
2014/08/21 10:45:31 ago Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.4.4.ebuild,v 1.8
2014/08/21 11:19:07 ssuominen Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -185,6 +185,8 @@
# https://bugs.webkit.org/show_bug.cgi?id=130837
epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
+ epatch "${FILESDIR}"/${P}-jpeg-9a.patch #481688
+
AT_M4DIR=Source/autotools eautoreconf
gnome2_src_prepare
@@ -301,4 +303,4 @@
eerror
return 1
fi
-}
\ No newline at end of file
+}
1.275 net-libs/webkit-gtk/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.275&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.275&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.274&r2=1.275
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- ChangeLog 21 Aug 2014 10:45:31 -0000 1.274
+++ ChangeLog 21 Aug 2014 11:19:07 -0000 1.275
@@ -1,6 +1,11 @@
# 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.274
2014/08/21 10:45:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.275
2014/08/21 11:19:07 ssuominen Exp $
+
+ 21 Aug 2014; Samuli Suominen <[email protected]>
+ +files/webkit-gtk-2.4.4-jpeg-9a.patch, webkit-gtk-2.4.4-r200.ebuild,
+ webkit-gtk-2.4.4.ebuild:
+ Fix building with media-libs/jpeg >= 9a wrt #481688 by Maurice van der Pot
21 Aug 2014; Agostino Sarubbo <[email protected]> webkit-gtk-2.4.4-r200.ebuild,
webkit-gtk-2.4.4.ebuild:
