Author: ranger
Date: Fri Apr 25 18:51:42 2008
New Revision: 1162
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1162&repname=user%3a+ranger>
Log:
new upstream cairo
Added:
trunk/experimental/common/main/finkinfo/graphics/cairomm1.patch
Modified:
trunk/experimental/common/main/finkinfo/graphics/cairo.info
trunk/experimental/common/main/finkinfo/graphics/cairomm1.info
trunk/experimental/common/main/finkinfo/graphics/pixman.info
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=1162&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/cairo.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/cairo.info Fri Apr 25
18:51:42 2008
@@ -1,10 +1,10 @@
Package: cairo
-Version: 1.4.14
+Version: 1.6.4
Revision: 1
CustomMirror: RangerMirror
Source: http://cairographics.org/releases/%n-%v.tar.gz
-Source-MD5: e8c442ff821c0719a69508fecba9038f
+Source-MD5: a198d509f9e3a35b78de8bb02174ebb9
Patch: %n.patch
PatchScript: <<
perl -pi -e 's,have_glitz_agl=yes,have_glitz_agl=no,g' configure
@@ -14,6 +14,7 @@
fontconfig2-dev,
freetype219,
glitz (>= 0.5.6-1),
+ pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
libgl-dev,
libpng3,
@@ -31,14 +32,13 @@
SetCFLAGS: -Os
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/lib/fontconfig2/include -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2
-#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
+ConfigureParams: --disable-xcb --disable-dependency-tracking --disable-gtk-doc
--enable-quartz --disable-quartz-image --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
export PATH="%p/lib/freetype219/bin:%p/lib/fontconfig2/bin:$PATH"
export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:`pwd`:$PKG_CONFIG_PATH"
- ln -s %p/lib/pkgconfig/*libpng* .
+ ln -s %p/lib/pkgconfig/*libpng* %p/lib/pkgconfig/*pixman* .
./configure %c
find . -name Makefile | xargs perl -pi -e 's,^CAIRO_CFLAGS =
,CAIRO_CFLAGS = -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include ,'
make
@@ -59,6 +59,7 @@
glitz-shlibs (>= 0.5.6-1),
libgl-shlibs,
libpng3-shlibs,
+ pixman-shlibs (>= 0.10.0-1),
x11-shlibs,
xft2-shlibs
<<
@@ -68,9 +69,9 @@
Shlibs: <<
%p/lib/libcairo.2.dylib 14.0.0 %N-shlibs (>= 1.4.0-1)
<<
- DocFiles: AUTHORS COPYING ChangeLog* INSTALL NEWS README TODO
+ DocFiles: AUTHORS COPYING ChangeLog* INSTALL NEWS README
<<
-DocFiles: AUTHORS COPYING ChangeLog* INSTALL NEWS README TODO
+DocFiles: AUTHORS COPYING ChangeLog* INSTALL NEWS README
Description: Vector graphics library
License: BSD
Homepage: http://www.cairographics.org/
Modified: trunk/experimental/common/main/finkinfo/graphics/cairomm1.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/cairomm1.info&rev=1162&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/cairomm1.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/cairomm1.info Fri Apr 25
18:51:42 2008
@@ -1,12 +1,12 @@
Package: cairomm1
-Version: 1.4.8
+Version: 1.6.0
Revision: 1
GCC: 4.0
Depends: <<
%N-shlibs (= %v-%r)
<<
BuildDepends: <<
- cairo (>= 1.4-1),
+ cairo (>= 1.6-1),
doxygen,
expat1,
fontconfig2-dev,
@@ -20,7 +20,8 @@
<<
Source: http://cairographics.org/releases/cairomm-%v.tar.gz
-Source-MD5: 2b2025b3555fa1665d92cf9f9be1a4d3
+Source-MD5: 549b0c9eaa25d61c4dd92d2de1cb4a46
+Patch: %n.patch
NoSetLDFLAGS: true
SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib -L%p/lib
SetLIBS: -L/usr/X11R6/lib
@@ -28,7 +29,7 @@
SetCFLAGS: -Os
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/lib/freetype219/include
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include
-I%p/include -I/usr/X11R6/include
-ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/pkgconfig:$PKG_CONFIG_PATH"
InstallScript: <<
#!/bin/sh -ev
@@ -38,7 +39,7 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: cairo-shlibs (>= 1.2-1)
+ Depends: cairo-shlibs (>= 1.6-1)
Files: lib/lib*.*.*.dylib
Shlibs: <<
%p/lib/libcairomm-1.0.1.dylib 3.0.0 %n (>= 1.4-1)
Added: trunk/experimental/common/main/finkinfo/graphics/cairomm1.patch
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/graphics/cairomm1.patch&rev=1162&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/cairomm1.patch (added)
+++ trunk/experimental/common/main/finkinfo/graphics/cairomm1.patch Fri Apr 25
18:51:42 2008
@@ -1,0 +1,220 @@
+diff -Nurd cairomm-1.6.0/cairomm/Makefile.am
cairomm-1.6.0-new/cairomm/Makefile.am
+--- cairomm-1.6.0/cairomm/Makefile.am 2008-03-10 23:38:20.000000000 -0400
++++ cairomm-1.6.0-new/cairomm/Makefile.am 2008-04-25 11:54:16.000000000
-0400
+@@ -4,7 +4,7 @@
+
+ h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h
path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h
exception.h refptr.h scaledfont.h cairommconfig.h
+ h_sources_private = private.h
+-cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc
quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc
scaledfont.cc
++cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc
quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc
scaledfont.cc context_surface_quartz.cc context_surface_win32.cc
context_surface_xlib.cc
+ cc_sources_private = private.cc
+
+ # Support for DLL on cygwin/mingw using libtool > 1.4
+diff -Nurd cairomm-1.6.0/cairomm/Makefile.in
cairomm-1.6.0-new/cairomm/Makefile.in
+--- cairomm-1.6.0/cairomm/Makefile.in 2008-04-11 12:27:34.000000000 -0400
++++ cairomm-1.6.0-new/cairomm/Makefile.in 2008-04-25 11:56:01.000000000
-0400
+@@ -58,7 +58,7 @@
+ libcairomm_1_0_la_DEPENDENCIES =
+ am__objects_1 = context.lo fontface.lo fontoptions.lo path.lo \
+ pattern.lo quartz_surface.lo surface.lo xlib_surface.lo \
+- win32_surface.lo exception.lo scaledfont.lo
++ win32_surface.lo exception.lo scaledfont.lo context_surface_quartz.lo
context_surface_win32.lo context_surface_xlib.lo
+ am__objects_2 =
+ am__objects_3 = private.lo
+ am_libcairomm_1_0_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+@@ -231,7 +231,7 @@
+ INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@
+ h_sources_public = cairomm.h context.h enums.h fontface.h fontoptions.h
path.h pattern.h quartz_surface.h surface.h xlib_surface.h win32_surface.h
exception.h refptr.h scaledfont.h cairommconfig.h
+ h_sources_private = private.h
+-cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc
quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc
scaledfont.cc
++cc_sources = context.cc fontface.cc fontoptions.cc path.cc pattern.cc
quartz_surface.cc surface.cc xlib_surface.cc win32_surface.cc exception.cc
scaledfont.cc context_surface_quartz.cc context_surface_win32.cc
context_surface_xlib.cc
+ cc_sources_private = private.cc
+ @[EMAIL PROTECTED] =
+
+@@ -334,6 +334,9 @@
+ -rm -f *.tab.c
+
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+ @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
+diff -Nurd cairomm-1.6.0/cairomm/context.cc
cairomm-1.6.0-new/cairomm/context.cc
+--- cairomm-1.6.0/cairomm/context.cc 2008-03-10 23:36:32.000000000 -0400
++++ cairomm-1.6.0-new/cairomm/context.cc 2008-04-25 12:02:00.000000000
-0400
+@@ -20,9 +20,6 @@
+ #include <cairomm/context.h>
+ #include <cairomm/private.h>
+ #include <cairomm/surface.h>
+-#include <cairomm/win32_surface.h>
+-#include <cairomm/xlib_surface.h>
+-#include <cairomm/quartz_surface.h>
+
+ /* M_PI is defined in math.h in the case of Microsoft Visual C++ */
+ #if defined(_MSC_VER)
+@@ -684,7 +681,7 @@
+ #endif
+ #if CAIRO_HAS_XLIB_SURFACE
+ case CAIRO_SURFACE_TYPE_XLIB:
+- return RefPtr<XlibSurface>(new XlibSurface(surface, false /* does not
have reference */));
++ return get_surface_xlib(surface);
+ break;
+ #endif
+ #if CAIRO_HAS_GLITZ_SURFACE
+@@ -694,12 +691,12 @@
+ #endif
+ #if CAIRO_HAS_QUARTZ_SURFACE
+ case CAIRO_SURFACE_TYPE_QUARTZ:
+- return RefPtr<QuartzSurface>(new QuartzSurface(surface, false /* does
not have reference */));
++ return get_surface_quartz(surface);
+ break;
+ #endif
+ #if CAIRO_HAS_WIN32_SURFACE
+ case CAIRO_SURFACE_TYPE_WIN32:
+- return RefPtr<Win32Surface>(new Win32Surface(surface, false /* does not
have reference */));
++ return get_surface_win32(surface);
+ break;
+ #endif
+ #if CAIRO_HAS_SVG_SURFACE
+diff -Nurd cairomm-1.6.0/cairomm/context.h cairomm-1.6.0-new/cairomm/context.h
+--- cairomm-1.6.0/cairomm/context.h 2008-03-10 23:36:32.000000000 -0400
++++ cairomm-1.6.0-new/cairomm/context.h 2008-04-25 12:06:30.000000000
-0400
+@@ -1001,8 +1001,12 @@
+
+
+ cobject* m_cobject;
+ };
+
++ RefPtr<Surface> get_surface_quartz(cairo_surface_t*);
++ RefPtr<Surface> get_surface_win32(cairo_surface_t*);
++ RefPtr<Surface> get_surface_xlib(cairo_surface_t*);
++
+ } // namespace Cairo
+
+ #endif //__CAIROMM_CONTEXT_H
+diff -Nurd cairomm-1.6.0/cairomm/context_surface_quartz.cc
cairomm-1.6.0-new/cairomm/context_surface_quartz.cc
+--- cairomm-1.6.0/cairomm/context_surface_quartz.cc 1969-12-31
19:00:00.000000000 -0500
++++ cairomm-1.6.0-new/cairomm/context_surface_quartz.cc 2008-04-25
12:05:34.000000000 -0400
+@@ -0,0 +1,38 @@
++/* Copyright (C) 2008 The cairomm Development Team
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
++ */
++
++#include <cairomm/cairommconfig.h>
++#include <cairomm/refptr.h>
++#include <cairomm/surface.h>
++#include <cairomm/quartz_surface.h>
++
++namespace Cairo
++{
++
++RefPtr<Surface> get_surface_quartz(cairo_surface_t* surface)
++{
++#if CAIRO_HAS_QUARTZ_SURFACE
++ return RefPtr<QuartzSurface>(new QuartzSurface(surface, false /* does not
have reference */));
++#else
++ return RefPtr<Surface>(new Surface(surface, false /* does not have
reference */));
++#endif
++}
++
++} //namespace Cairo
++
++// vim: ts=2 sw=2 et
+diff -Nurd cairomm-1.6.0/cairomm/context_surface_win32.cc
cairomm-1.6.0-new/cairomm/context_surface_win32.cc
+--- cairomm-1.6.0/cairomm/context_surface_win32.cc 1969-12-31
19:00:00.000000000 -0500
++++ cairomm-1.6.0-new/cairomm/context_surface_win32.cc 2008-04-25
11:54:16.000000000 -0400
+@@ -0,0 +1,37 @@
++/* Copyright (C) 2008 The cairomm Development Team
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
++ */
++
++#include <cairomm/cairommconfig.h>
++#include <cairomm/surface.h>
++#include <cairomm/win32_surface.h>
++
++namespace Cairo
++{
++
++RefPtr<Surface> get_surface_win32(cairo_surface_t* surface)
++{
++#if CAIRO_HAS_WIN32_SURFACE
++ return RefPtr<Win32Surface>(new Win32Surface(surface, false /* does not
have reference */));
++#else
++ return RefPtr<Surface>(new Surface(surface, false /* does not have
reference */));
++#endif
++}
++
++} //namespace Cairo
++
++// vim: ts=2 sw=2 et
+diff -Nurd cairomm-1.6.0/cairomm/context_surface_xlib.cc
cairomm-1.6.0-new/cairomm/context_surface_xlib.cc
+--- cairomm-1.6.0/cairomm/context_surface_xlib.cc 1969-12-31
19:00:00.000000000 -0500
++++ cairomm-1.6.0-new/cairomm/context_surface_xlib.cc 2008-04-25
11:54:16.000000000 -0400
+@@ -0,0 +1,37 @@
++/* Copyright (C) 2008 The cairomm Development Team
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++ * 02110-1301, USA.
++ */
++
++#include <cairomm/cairommconfig.h>
++#include <cairomm/surface.h>
++#include <cairomm/xlib_surface.h>
++
++namespace Cairo
++{
++
++RefPtr<Surface> get_surface_xlib(cairo_surface_t* surface)
++{
++#if CAIRO_HAS_WIN32_SURFACE
++ return RefPtr<XlibSurface>(new XlibSurface(surface, false /* does not
have reference */));
++#else
++ return RefPtr<Surface>(new Surface(surface, false /* does not have
reference */));
++#endif
++}
++
++} //namespace Cairo
++
++// vim: ts=2 sw=2 et
Modified: trunk/experimental/common/main/finkinfo/graphics/pixman.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/graphics/pixman.info&rev=1162&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/graphics/pixman.info (original)
+++ trunk/experimental/common/main/finkinfo/graphics/pixman.info Fri Apr 25
18:51:42 2008
@@ -1,8 +1,8 @@
Package: pixman
-Version: 0.9.6
+Version: 0.10.0
Revision: 1
Source: http://xorg.freedesktop.org/archive/individual/lib/pixman-%v.tar.bz2
-Source-MD5: 7681334f55d41a705339228145d02c11
+Source-MD5: fb23e17a8a0308e8fad6dc153753ba9a
Conflicts: libpixman1
Replaces: libpixman1
@@ -16,7 +16,7 @@
SplitOff: <<
Package: %N-shlibs
Files: lib/libpixman-1.0*.dylib
- Shlibs: %p/lib/libpixman-1.0.dylib 10.0.0 %N-shlibs (>= 0.9.4-1)
+ Shlibs: %p/lib/libpixman-1.0.dylib 11.0.0 %N-shlibs (>= 0.10.0-1)
DocFiles: COPYING
<<
DocFiles: AUTHORS COPYING ChangeLog* INSTALL NEWS README TODO
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
