Author: ranger
Date: Fri May 4 23:47:20 2007
New Revision: 781
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=781&repname=user%3a+ranger
Log:
fixie fixie
Removed:
trunk/experimental/10.3/main/finkinfo/graphics/cairo.info
trunk/experimental/10.3/main/finkinfo/graphics/cairo.patch
trunk/experimental/10.4/main/finkinfo/graphics/cairo.info
trunk/experimental/10.4/main/finkinfo/graphics/cairo.patch
Modified:
trunk/experimental/common/main/finkinfo/graphics/cairo.info
trunk/experimental/common/main/finkinfo/graphics/cairo.patch
Modified: trunk/experimental/common/main/finkinfo/graphics/cairo.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/cairo.info&rev=781&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/cairo.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/cairo.info Fri May 4
23:47:20 2007
@@ -1,25 +1,28 @@
Package: cairo
-Version: 1.3.12
-Revision: 1
+Version: 1.4.6
+Revision: 2
CustomMirror: RangerMirror
-#Source: http://cairographics.org/releases/%n-%v.tar.gz
-Source: http://cairographics.org/snapshots/%n-%v.tar.gz
-Source-MD5: b6ac81de3c47529d1f39390943728c3d
+Source: http://cairographics.org/releases/%n-%v.tar.gz
+Source-MD5: ae16e73f9dca46ac93b4ce435e93773c
Patch: %n.patch
+PatchScript: <<
+ perl -pi -e 's,have_glitz_agl=yes,have_glitz_agl=no,g' configure
+<<
BuildDepends: expat1, fontconfig2-dev, freetype219, glitz (>= 0.5.6-1),
pkgconfig (>= 0.20-1), libgl-dev, libpng3, x11-dev, xft2-dev
BuildDependsOnly: true
+# doesn't pass all tests yet :(
+#InfoTest: TestScript: LANG=C DISPLAY=:0 make check
Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.20-1)
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib/freetype219/lib
-SetLIBS: -L/usr/X11R6/lib -L%p/lib
+SetLIBS: -L/usr/X11R6/lib -L%p/lib -lexpat
NoSetCFLAGS: true
SetCFLAGS: -Os
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/lib/fontconfig2/include -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I/usr/X11R6/include
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
-ConfigureParams: --disable-xcb --disable-dependency-tracking --disable-gtk-doc
--enable-quartz --enable-png --enable-glitz --enable-ps --enable-pdf
--enable-atsui --infodir=%p/share/info --mandir=%p/share/man
+#ConfigureParams: --disable-xcb --disable-dependency-tracking
--disable-gtk-doc --enable-quartz --enable-png --enable-glitz --enable-ps
--enable-pdf --enable-atsui --infodir=%p/share/info --mandir=%p/share/man
+ConfigureParams: --disable-xcb --disable-dependency-tracking --disable-gtk-doc
--disable-quartz --enable-png --enable-glitz --enable-ps --enable-pdf
--disable-atsui --infodir=%p/share/info --mandir=%p/share/man
CompileScript: <<
#!/bin/sh -ex
export lt_cv_sys_max_cmd_len=65536
@@ -42,7 +45,7 @@
lib/libcairo.*.dylib
<<
Shlibs: <<
- %p/lib/libcairo.2.dylib 13.0.0 %N-shlibs (>= 1.3.0-1)
+ %p/lib/libcairo.2.dylib 14.0.0 %N-shlibs (>= 1.4.0-1)
<<
DocFiles: AUTHORS COPYING ChangeLog* INSTALL NEWS README TODO
<<
Modified: trunk/experimental/common/main/finkinfo/graphics/cairo.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/cairo.patch&rev=781&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/cairo.patch (original)
+++ trunk/experimental/common/main/finkinfo/graphics/cairo.patch Fri May 4
23:47:20 2007
@@ -1,42 +1,3 @@
-diff -uNr cairo-1.3.12/src/Makefile.in cairo-1.3.12-new/src/Makefile.in
---- cairo-1.3.12/src/Makefile.in Sat Jan 20 06:05:09 2007
-+++ cairo-1.3.12-new/src/Makefile.in Fri Feb 9 11:42:29 2007
-@@ -279,7 +279,7 @@
- CAIRO_HAS_XLIB_SURFACE_TRUE = @CAIRO_HAS_XLIB_SURFACE_TRUE@
- CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_FALSE@
- CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE = @CAIRO_HAS_XLIB_XRENDER_SURFACE_TRUE@
--CAIRO_LIBS = @CAIRO_LIBS@
-+CAIRO_LIBS = @CAIRO_LIBS@ -lexpat
- CAIRO_NONPKGCONFIG_CFLAGS = @CAIRO_NONPKGCONFIG_CFLAGS@
- CAIRO_NONPKGCONFIG_LIBS = @CAIRO_NONPKGCONFIG_LIBS@
- CAIRO_REQUIRES = @CAIRO_REQUIRES@
-diff -uNr cairo-1.3.12/src/cairo-atsui-font.c
cairo-1.3.12-new/src/cairo-atsui-font.c
---- cairo-1.3.12/src/cairo-atsui-font.c Tue Jan 9 17:25:06 2007
-+++ cairo-1.3.12-new/src/cairo-atsui-font.c Fri Feb 9 11:42:15 2007
-@@ -61,6 +61,9 @@
- #define CG_BITMAP_BYTE_ORDER_FLAG kCGBitmapByteOrder32Host
- #endif
-
-+/* Public in 10.4, present in 10.3.9 */
-+CG_EXTERN CGRect CGRectApplyAffineTransform (CGRect, CGAffineTransform);
-+
- typedef struct _cairo_atsui_font_face cairo_atsui_font_face_t;
- typedef struct _cairo_atsui_font cairo_atsui_font_t;
- typedef struct _cairo_atsui_scaled_path cairo_atsui_scaled_path_t;
-diff -uNr cairo-1.3.12/src/cairo-quartz-surface.c
cairo-1.3.12-new/src/cairo-quartz-surface.c
---- cairo-1.3.12/src/cairo-quartz-surface.c Fri Dec 1 14:12:20 2006
-+++ cairo-1.3.12-new/src/cairo-quartz-surface.c Fri Feb 9 11:42:15 2007
-@@ -55,9 +55,6 @@
- {
- cairo_quartz_surface_t *surface = abstract_surface;
-
-- if (CGBitmapContextGetBitmapInfo (surface->context) != 0) {
-- /* XXX: We can create an image out of the bitmap here */
-- }
-
- return CAIRO_INT_STATUS_UNSUPPORTED;
- }
-diff -uNr cairo-1.3.12/xrender.pc cairo-1.3.12-new/xrender.pc
--- 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
@@ -0,0 +1,10 @@
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
