Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19993
Modified Files:
cairo.info cairo.patch
Log Message:
fix build against older xrender
Index: cairo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/cairo.info,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cairo.info 5 Nov 2008 15:06:56 -0000 1.27
+++ cairo.info 5 Nov 2008 16:40:46 -0000 1.28
@@ -11,14 +11,17 @@
<<
Source: http://cairographics.org/releases/%n-%v.tar.gz
Source-MD5: 44d406e199c338cb60f7db32ffb32bdb
-Patch: %n.patch
+PatchFile: %n.patch
+PatchFile-MD5: 49ffef147eeb07f9e18b42e549705225
PatchScript: <<
+ patch -p1 < %{PatchFile}
perl -pi -e 's,have_glitz_agl=yes,have_glitz_agl=no,g' configure
perl -pi -e
's,(POPPLER_VERSION_REQUIRED=).*,${1}99999.FORCE.NONDETECT,' configure
perl -pi -e
's,(LIBRSVG_VERSION_REQUIRED=).*,${1}99999.FORCE.NONDETECT,' configure
<<
BuildDepends: <<
expat1,
+ fink (>= 0.28-1),
fontconfig2-dev,
freetype219 (>= 2.3.7-7),
glitz (>= 0.5.6-1),
Index: cairo.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/cairo.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cairo.patch 24 Mar 2008 14:11:30 -0000 1.5
+++ cairo.patch 5 Nov 2008 16:40:46 -0000 1.6
@@ -1,5 +1,26 @@
---- cairo-1.3.12/xrender.pc Wed Dec 31 19:00:00 1969
-+++ cairo-1.3.12-new/xrender.pc Fri Feb 9 11:42:15 2007
+diff -Nurd cairo-1.8.2/src/cairo-xlib-xrender-private.h
cairo-1.8.2-new/src/cairo-xlib-xrender-private.h
+--- cairo-1.8.2/src/cairo-xlib-xrender-private.h 2008-10-30
10:34:25.000000000 -0400
++++ cairo-1.8.2-new/src/cairo-xlib-xrender-private.h 2008-11-05
11:29:42.000000000 -0500
+@@ -45,6 +45,16 @@
+ #include <X11/extensions/Xrender.h>
+ #include <X11/extensions/renderproto.h>
+
++#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
++
++/* Extended repeat attributes included in 0.10 */
++#define RepeatNone 0
++#define RepeatNormal 1
++#define RepeatPad 2
++#define RepeatReflect 3
++
++#endif /* RENDER_MINOR < 10 */
++
+ #else /* !CAIRO_HAS_XLIB_XRENDER_SURFACE */
+
+ /* Provide dummy symbols and macros to get it compile and take the fallback
+diff -Nurd cairo-1.8.2/xrender.pc cairo-1.8.2-new/xrender.pc
+--- cairo-1.8.2/xrender.pc 1969-12-31 19:00:00.000000000 -0500
++++ cairo-1.8.2-new/xrender.pc 2008-11-05 11:15:24.000000000 -0500
@@ -0,0 +1,10 @@
+prefix=/usr/X11R6
+exec_prefix=${prefix}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
