The following diff disables setting the XCB backend as higher
priority over the mature Xlib backend. The XCB backend is
marked as experimental and unsupported for a reason! It is
full of bugs. This isn't supposed to be enabled and we're
the only OS I can find that does so. Not surprisingly this
resolves the various screen corruption, images not displaying
at the right size, URL bar highlighting looking weird and
other weird rendering problems seen with Firefox and Midori
and poetnailly other applications.

This does not resolve the animated GIF issue with Firefox.
That is a separate and unrelated issue.

I bumped the major rev because it looks like there is
an API change and I'd rather be on the safe side.


Eric, stop enabling stuff that is clearly marked
experimental and unsupported especially when you're
not sending this stuff out for extensive testing.


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile    11 Oct 2010 08:09:44 -0000      1.28
+++ Makefile    17 Oct 2010 03:48:48 -0000
@@ -3,7 +3,8 @@
 COMMENT=               vector graphics library
 
 DISTNAME=              cairo-1.10.0
-SHARED_LIBS=           cairo 10.0
+REVISION=              0
+SHARED_LIBS=           cairo 11.0
 SHARED_LIBS+=          cairo-trace 0.0
 SHARED_LIBS+=          cairo-gobject 0.0
 SHARED_LIBS+=          cairo-script-interpreter 0.0
@@ -13,7 +14,7 @@ HOMEPAGE=             http://cairographics.org/intr
 
 MAINTAINER=            Eric Faurot <e...@openbsd.org>
 
-WANTLIB=               GL X11 X11-xcb Xau Xdamage Xdmcp Xext Xfixes Xrender \
+WANTLIB=               GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender \
                        Xxf86vm drm expat fontconfig freetype glib-2.0 \
                        gobject-2.0 gthread-2.0 m pcre pixman-1 png \
                        pthread-stubs xcb xcb-render xcb-shm z
@@ -40,9 +41,7 @@ CONFIGURE_ENV=                PTHREAD_LIBS="-pthread"
 CONFIGURE_ARGS=                --enable-gl \
                        --enable-xml \
                        --enable-xcb \
-                       --enable-xlib-xcb \
                        --disable-silent-rules
-
 
 REGRESS_DEPENDS=       :ghostscript-*:print/ghostscript/gnu
 
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/graphics/cairo/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   11 Oct 2010 08:09:44 -0000      1.8
+++ pkg/PLIST   17 Oct 2010 03:05:25 -0000
@@ -38,7 +38,6 @@ lib/pkgconfig/cairo-ps.pc
 lib/pkgconfig/cairo-svg.pc
 lib/pkgconfig/cairo-xcb-shm.pc
 lib/pkgconfig/cairo-xcb.pc
-lib/pkgconfig/cairo-xlib-xcb.pc
 lib/pkgconfig/cairo-xlib-xrender.pc
 lib/pkgconfig/cairo-xlib.pc
 lib/pkgconfig/cairo-xml.pc

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Reply via email to