[gentoo-commits] gentoo-x86 commit in net-libs/webkit-gtk/files: webkit-gtk-2.4.7-disable-webgl.patch webkit-gtk-2.4.7-disable-accelerated-compositing.patch

[Pacho Ramos (pacho)]

pacho       14/10/25 16:14:58

  Added:                webkit-gtk-2.4.7-disable-webgl.patch
                        webkit-gtk-2.4.7-disable-accelerated-compositing.patch
  Log:
  Version bump, fix building when disabling accelerated compositing and webgl 
(#525072 and #500966 by Alexander Tsoy)
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
A188FBD4)

Revision  Changes    Path
1.1                  
net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch?rev=1.1&content-type=text/plain

Index: webkit-gtk-2.4.7-disable-webgl.patch
===================================================================
--- webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp       
2014-09-26 11:40:44.000000000 +0400
+++ webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp       
2014-10-13 15:38:38.496444600 +0400
@@ -17,7 +17,7 @@ 
  */
 
 #include "config.h"
-#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS)
+#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS) || USE(EGL) || USE(GLX)
 
 #define DISABLE_SHIMS
 #include "OpenGLShims.h"



1.1                  
net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-accelerated-compositing.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-accelerated-compositing.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-accelerated-compositing.patch?rev=1.1&content-type=text/plain

Index: webkit-gtk-2.4.7-disable-accelerated-compositing.patch
===================================================================
--- webkitgtk-2.4.6.orig/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp      
2014-09-26 11:40:45.000000000 +0400
+++ webkitgtk-2.4.6.orig/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp      
2014-10-11 20:43:16.687116807 +0400
@@ -110,7 +110,7 @@ 
     
WebCore::memoryCache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
     WebCore::pageCache()->setCapacity(pageCacheCapacity);
 
-#if PLATFORM(GTK)
+#if PLATFORM(GTK) && USE(ACCELERATED_COMPOSITING)
     WebCore::pageCache()->setShouldClearBackingStores(true);
 #endif