Update of /cvsroot/fink/experimental/monipol/unstable
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13098
Added Files:
cairomm1.diff cairomm1.info
Log Message:
Fix x86_64 build error on the unstable tree due to cairomm1 using cairo
functions that are not available in 64 bits.
--- NEW FILE: cairomm1.info ---
Package: cairomm1
Version: 1.8.2
Revision: 2
Description: C++ interface for the cairo library
License: LGPL
Maintainer: Benjamin Reed <cairo...@fink.racoonfink.com>
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
cairo (>= 1.8.8-1),
doxygen,
expat1,
fink (>= 0.29.7-1),
fontconfig2-dev,
freetype219 (>= 2.3.7-7),
glitz (>= 0.5.6-1),
libgl-dev,
libpng3,
libsigc++2,
pixman (>= 0.16.0-1),
pkgconfig (>= 0.23-0),
x11-dev,
xft2-dev
<<
BuildDependsOnly: true
GCC: 4.0
Source: http://cairographics.org/releases/cairomm-%v.tar.gz
Source-MD5: 24aa46a4f92bdb2af7cd80e6b335f07f
PatchFile: %n.diff
PatchFile-MD5: e055c751895d45a8e3e151364b46c1fa
SetCFLAGS: -Os
SetCPPFLAGS: -I%p/lib/fontconfig2/include -DENABLE_GCC_VISIBILITY=1
SetLDFLAGS: -L%p/lib/fontconfig2/lib
NoSetCFLAGS: true
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
InstallScript: <<
#!/bin/sh -ev
make -j1 install DESTDIR="%d"
install -d -m 755 %i/share/doc/%N
mv examples %i/share/doc/%N/
<<
DocFiles: AUTHORS COPYING ChangeLog INSTALL MAINTAINERS NEWS README
SplitOff: <<
Package: %N-shlibs
Depends: <<
cairo-shlibs (>= 1.8.8-1),
libsigc++2-shlibs
<<
DocFiles: COPYING
Files: lib/lib*.*.*.dylib
Shlibs: %p/lib/libcairomm-1.0.1.dylib 6.0.0 %n (>= 1.8.2-1)
<<
Homepage: http://cairographics.org/
--- NEW FILE: cairomm1.diff ---
diff -Nurd cairomm-1.8.2.ori/cairomm/quartz_font.cc
cairomm-1.8.2/cairomm/quartz_font.cc
--- cairomm-1.8.2.ori/cairomm/quartz_font.cc 2008-12-20 15:37:46.000000000
-0200
+++ cairomm-1.8.2/cairomm/quartz_font.cc 2009-09-05 14:47:35.000000000
-0300
@@ -30,21 +30,24 @@
check_object_status_and_throw_exception(*this);
}
-QuartzFontFace::QuartzFontFace(ATSUFontID font_id) :
- FontFace(cairo_quartz_font_face_create_for_atsu_font_id(font_id), true)
+RefPtr<QuartzFontFace> QuartzFontFace::create(CGFontRef font)
{
- check_object_status_and_throw_exception(*this);
+ return RefPtr<QuartzFontFace>(new QuartzFontFace(font));
}
-RefPtr<QuartzFontFace> QuartzFontFace::create(CGFontRef font)
+
+#ifndef __LP64__
+QuartzFontFace::QuartzFontFace(ATSUFontID font_id) :
+ FontFace(cairo_quartz_font_face_create_for_atsu_font_id(font_id), true)
{
- return RefPtr<QuartzFontFace>(new QuartzFontFace(font));
+ check_object_status_and_throw_exception(*this);
}
RefPtr<QuartzFontFace> QuartzFontFace::create(ATSUFontID font_id)
{
return RefPtr<QuartzFontFace>(new QuartzFontFace(font_id));
}
+#endif
}
diff -Nurd cairomm-1.8.2.ori/cairomm/quartz_font.h
cairomm-1.8.2/cairomm/quartz_font.h
--- cairomm-1.8.2.ori/cairomm/quartz_font.h 2008-12-20 15:37:46.000000000
-0200
+++ cairomm-1.8.2/cairomm/quartz_font.h 2009-09-05 14:53:00.000000000 -0300
@@ -46,6 +46,7 @@
*/
static RefPtr<QuartzFontFace> create(CGFontRef font);
+#ifndef __LP64__
/** Creates a new font for the Quartz font backend based on an ATSUFontID.
* This font can then be used with Context::set_font_face() or
* ScaledFont::create().
@@ -55,11 +56,14 @@
* @since 1.8
*/
static RefPtr<QuartzFontFace> create(ATSUFontID font_id);
+#endif
protected:
QuartzFontFace(CGFontRef font);
+#ifndef __LP64__
QuartzFontFace(ATSUFontID font_id);
+#endif
};
}
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
