summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-07-23 09:14:28 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-07-23 09:14:28 +0800
commit7eef11a4054e5016619c72c0b04d5b01098f135b (patch)
treee29522354521021187c37e4c1c62a4f43f18ba8b
parent66fa79ec23b8d3e5d27cfe6871741efaf39607cf (diff)
downloadmarcuscom-ports-7eef11a4054e5016619c72c0b04d5b01098f135b.tar
marcuscom-ports-7eef11a4054e5016619c72c0b04d5b01098f135b.tar.gz
marcuscom-ports-7eef11a4054e5016619c72c0b04d5b01098f135b.tar.bz2
marcuscom-ports-7eef11a4054e5016619c72c0b04d5b01098f135b.tar.lz
marcuscom-ports-7eef11a4054e5016619c72c0b04d5b01098f135b.tar.xz
marcuscom-ports-7eef11a4054e5016619c72c0b04d5b01098f135b.tar.zst
marcuscom-ports-7eef11a4054e5016619c72c0b04d5b01098f135b.zip
Add a dist patch to fix some cairo problems.
Obtained from: http://people.freedesktop.org/~alp/webkit/gtk/webkit-cairo-canvas-r34625-for-1.0.1.patch git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11151 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--www/webkit-gtk2/Makefile3
-rw-r--r--www/webkit-gtk2/files/patch-cairo31
2 files changed, 33 insertions, 1 deletions
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index 6a04e7119..73ad99b9d 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,11 +3,12 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD: ports/www/webkit-gtk2/Makefile,v 1.2 2008/03/31 10:33:05 ahze Exp $
-# $MCom: ports/www/webkit-gtk2/Makefile,v 1.15 2008/06/06 21:38:54 marcus Exp $
+# $MCom: ports/www/webkit-gtk2/Makefile,v 1.16 2008/07/22 18:34:39 marcus Exp $
#
PORTNAME= webkit
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://people.freedesktop.org/~alp/webkit/gtk/
PKGNAMESUFFIX= -gtk2
diff --git a/www/webkit-gtk2/files/patch-cairo b/www/webkit-gtk2/files/patch-cairo
new file mode 100644
index 000000000..4bba0cc2a
--- /dev/null
+++ b/www/webkit-gtk2/files/patch-cairo
@@ -0,0 +1,31 @@
+--- WebCore/platform/graphics/BitmapImage.cpp
++++ WebCore/platform/graphics/BitmapImage.cpp
+@@ -203,7 +203,7 @@ float BitmapImage::frameDurationAtIndex(size_t index)
+ bool BitmapImage::frameHasAlphaAtIndex(size_t index)
+ {
+ if (index >= frameCount())
+- return 0;
++ return true;
+
+ if (index >= m_frames.size() || !m_frames[index].m_frame)
+ cacheFrame(index);
+--- WebCore/platform/graphics/cairo/ImageCairo.cpp
++++ WebCore/platform/graphics/cairo/ImageCairo.cpp
+@@ -76,6 +76,7 @@ BitmapImage::BitmapImage(cairo_surface_t* surface, ImageObserver* observer)
+
+ m_frames.grow(1);
+ m_frames[0].m_frame = surface;
++ m_frames[0].m_hasAlpha = cairo_surface_get_content(surface) != CAIRO_CONTENT_COLOR;
+ checkForSolidColor();
+ }
+
+--- WebCore/platform/graphics/cg/ImageCG.cpp
++++ WebCore/platform/graphics/cg/ImageCG.cpp
+@@ -87,6 +87,7 @@ BitmapImage::BitmapImage(CGImageRef cgImage, ImageObserver* observer)
+
+ m_frames.grow(1);
+ m_frames[0].m_frame = cgImage;
++ m_frames[0].m_hasAlpha = true;
+ checkForSolidColor();
+ }
+