head	1.2;
access;
symbols;
locks; strict;
comment	@// @;


1.2
date	2014.05.30.10.22.05;	author pho;	state dead;
branches;
next	1.1;
commitid	pujOAy5YvcBW3yCx;

1.1
date	2014.05.28.15.11.29;	author pho;	state Exp;
branches;
next	;
commitid	TaefekdY7BfKJjCx;


desc
@@


1.2
log
@PR pkg/48840: Remove most patches that I have recently added

The preprocessor macro XP_MACOSX is misused everywhere. They tend to
say "#if defined(XP_MACOSX)" to actually mean
"#if defined(MOZ_WIDGET_COCOA)". It's okay to equate XP_MACOSX with
XP_DARWIN but equating it with MOZ_WIDGET_COCOA is just wrong. As a
result, cairo-gtk2 build on Darwin is completely broken and needs
heavy patching. Ideally they should be fixed individually but that
will be an extremely hard work, so don't define XP_MACOSX for now.
@
text
@$NetBSD: patch-gfx_thebes_gfxFont.cpp,v 1.1 2014/05/28 15:11:29 pho Exp $

Don't assume cocoa toolkit just because OS_ARCH is Darwin.

--- gfx/thebes/gfxFont.cpp.orig	2014-05-06 22:55:35.000000000 +0000
+++ gfx/thebes/gfxFont.cpp
@@@@ -40,7 +40,7 @@@@
 #include "gfxSVGGlyphs.h"
 #include "gfx2DGlue.h"
 
-#if defined(XP_MACOSX)
+#if defined(MOZ_WIDGET_COCOA)
 #include "nsCocoaFeatures.h"
 #endif
 
@@@@ -1297,7 +1297,7 @@@@ gfxFontFamily::ReadFaceNames(gfxPlatform
 
     bool asyncFontLoaderDisabled = false;
 
-#if defined(XP_MACOSX)
+#if defined(MOZ_WIDGET_COCOA)
     // bug 975460 - async font loader crashes sometimes under 10.6, disable
     if (!nsCocoaFeatures::OnLionOrLater()) {
         asyncFontLoaderDisabled = true;
@@@@ -4177,7 +4177,7 @@@@ gfxFontGroup::BuildFontList()
 {
 // "#if" to be removed once all platforms are moved to gfxPlatformFontList interface
 // and subclasses of gfxFontGroup eliminated
-#if defined(XP_MACOSX) || defined(XP_WIN) || defined(ANDROID)
+#if defined(MOZ_WIDGET_COCOA) || defined(XP_WIN) || defined(ANDROID)
     ForEachFont(FindPlatformFont, this);
 
     if (mFonts.Length() == 0) {
@@@@ -5236,7 +5236,7 @@@@ gfxFontGroup::UpdateFontList()
         mSkipDrawing = false;
 
         // bug 548184 - need to clean up FT2, OS/2 platform code to use BuildFontList
-#if defined(XP_MACOSX) || defined(XP_WIN) || defined(ANDROID)
+#if defined(MOZ_WIDGET_COCOA) || defined(XP_WIN) || defined(ANDROID)
         BuildFontList();
 #else
         ForEachFont(FindPlatformFont, this);
@


1.1
log
@PR pkg/48840: Don't assume cocoa toolkit just because OS_ARCH is Darwin
@
text
@d1 1
a1 1
$NetBSD$
@