[Scribus] Success: compile Mac/Aqua from CVS without patches

[Craig Ringer]

On Wed, 2005-03-23 at 09:42 +0100, Martin Costabel wrote:

> We could discuss them one by one, once I have found out which ones I am 
> still needing for 1.3cvs. Unfortunately, I don't have much time, so I 
> was just able to run a quick compilation; it convinced me that a few of 
> these patches are still needed, at least for me.

... and here's a description of the merge status of the various bits of
the patch you use:

QT_MAC defines:
	Added before I saw your patch, though most use 
	#if !defined(QT_WS_X11) . In particular, scfonts
	and scpainter have all their X11-dependent bits
	#ifdef'd out.
	
	Rather than #ifdef'ing the gdk-pixbuf stuff out, it's now in 
	a subdir that is only compiled and linked when not building
	against Qt/Mac .

-psn* arg support:
	Merged from Andreas's patch.

Andreas's alternate ScPainter::end():
	Merged, fixed relative drawing position bug.

There was also LOTS more that went in - misc fixes, tweaks, setting the
ground work for the portable .app bundle, etc.

--
Craig Ringer