Opened 16 years ago

Closed 16 years ago

#16007 closed enhancement (fixed)

Allow cairo to build 64-bit

Reported by: jmroot (Joshua Root) Owned by: ryandesign (Ryan Carsten Schmidt)
Priority: Normal Milestone:
Component: ports Version:
Keywords: Cc: pguyot (Paul Guyot), arcata@…, MarcusCalhoun-Lopez (Marcus Calhoun-Lopez)
Port: cairo, cairo-devel

Description

Attached patch uses the value of the universal_archs variable if present instead of hardcoding {i386 ppc}, and disables Quartz font support if building for 64-bit, since that feature uses Carbon functions that are not present in the 64-bit libs.

Attachments (1)

patch-quartz-lp64.diff (891 bytes) - added by jmroot (Joshua Root) 16 years ago.
patch from #17040

Download all attachments as: .zip

Change History (17)

comment:1 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

Are you able to build cairo universal? What about #15451?

comment:2 Changed 16 years ago by jmroot (Joshua Root)

Building cairo universal works in trunk with universal_archs set to {i386 x86_64}. I didn't try with universal_archs set to {i386 ppc}, nor with 1.6.0 where that would always be the case.

comment:3 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

Status: newassigned

Now using ${universal_archs} as of r38946.

comment:4 Changed 16 years ago by jmroot (Joshua Root)

Cc: pguyot@… added
Port: cairo added

Has duplicate #17040 which refers to upstream bug http://bugs.freedesktop.org/show_bug.cgi?id=15702.

comment:5 Changed 16 years ago by pguyot (Paul Guyot)

Sorry for the dup #17040. Interestingly, the patches and the approaches differ. Patch in #17040 does not disable quartz font building, just atsui support, which is AFAIK the only thing that doesn't work on 64 bits.

comment:6 Changed 16 years ago by jmroot (Joshua Root)

The new patch does look a lot better. I think it should always be applied though, not just in the universal variant. Some systems will build 64-bit by default.

comment:7 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: arcata@… added
Port: cairo-devel added

Has duplicate #17176.

Changed 16 years ago by jmroot (Joshua Root)

Attachment: patch-quartz-lp64.diff added

patch from #17040

comment:8 Changed 16 years ago by jmroot (Joshua Root)

Ryan, are you going to commit this, or shall I time out and commit it myself? ;-)

comment:9 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

That's just Glen's patch from the upstream cairo ticket, yes? I'll try it out shortly, then ping the cairo developers about getting it properly included in the source.

comment:10 Changed 16 years ago by jmroot (Joshua Root)

Yes, it's the upstream patch.

comment:11 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

Works for me on Leopard on Intel so I committed it to the cairo port in r45305. Thanks everyone.

comment:12 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

Committed to the cairo-devel port in r45971.

comment:13 Changed 16 years ago by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez)

Cc: mcalhoun@… added

Cc Me!

comment:14 Changed 16 years ago by (none)

Milestone: Port Enhancements

Milestone Port Enhancements deleted

comment:15 Changed 16 years ago by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez)

Can this ticket now be closed?

comment:16 in reply to:  15 Changed 16 years ago by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez)

Resolution: fixed
Status: assignedclosed

Replying to mcalhoun@…:

Can this ticket now be closed?

Closing since there were no objections.

Note: See TracTickets for help on using tickets.