[cvs] dists/10.4/stable/main/finkinfo/graphics cairomm1.patch, 1.2, 1.3 cairomm1.info, 1.4, 1.5

[monipol]

Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory 
fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15484/stable/main/finkinfo/graphics

Modified Files:
        cairomm1.info 
Added Files:
        cairomm1.patch 
Log Message:
Fix x86_64 build error (with maintainer's consent, aye!)


Index: cairomm1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/cairomm1.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cairomm1.info       27 Aug 2009 11:27:48 -0000      1.4
+++ cairomm1.info       20 Sep 2009 13:28:11 -0000      1.5
@@ -1,7 +1,6 @@
 Package: cairomm1
 Version: 1.8.0
-Revision: 1
-Architecture: i386, powerpc
+Revision: 2
 GCC: 4.0
 Depends: <<
        %N-shlibs (= %v-%r)
@@ -25,6 +24,8 @@
 BuildDependsOnly: true
 Source: http://cairographics.org/releases/cairomm-%v.tar.gz
 Source-MD5: 15c0f56eee57bb418c38463a6297d715
+PatchFile: %n.patch
+PatchFile-MD5: 5f65c836b30e48b44991d1429ade9cbd
 SetLDFLAGS: -L%p/lib/fontconfig2/lib
 NoSetCFLAGS: true
 SetCFLAGS: -Os

--- NEW FILE: cairomm1.patch ---
diff -Nurd cairomm-1.8.0.ori/cairomm/quartz_font.cc 
cairomm-1.8.0/cairomm/quartz_font.cc
--- cairomm-1.8.0.ori/cairomm/quartz_font.cc    2008-12-20 15:37:46.000000000 
-0200
+++ cairomm-1.8.0/cairomm/quartz_font.cc        2009-09-05 15:16:35.000000000 
-0300
@@ -30,21 +30,23 @@
   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.0.ori/cairomm/quartz_font.h 
cairomm-1.8.0/cairomm/quartz_font.h
--- cairomm-1.8.0.ori/cairomm/quartz_font.h     2008-12-20 15:37:46.000000000 
-0200
+++ cairomm-1.8.0/cairomm/quartz_font.h 2009-09-05 15:16:01.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
 };
 
 }


------------------------------------------------------------------------------
Come build with us! The BlackBerry&reg; Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9&#45;12, 2009. Register now&#33;
http://p.sf.net/sfu/devconf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs