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_layers_basic_BasicImages.cpp,v 1.1 2014/05/28 15:11:29 pho Exp $

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

--- gfx/layers/basic/BasicImages.cpp.orig	2014-05-06 22:55:33.000000000 +0000
+++ gfx/layers/basic/BasicImages.cpp
@@@@ -22,7 +22,7 @@@@
 #include "mozilla/gfx/Point.h"          // for IntSize
 #include "gfx2DGlue.h"
 #include "YCbCrUtils.h"                 // for YCbCr conversions
-#ifdef XP_MACOSX
+#ifdef MOZ_WIDGET_COCOA
 #include "gfxQuartzImageSurface.h"
 #endif
 
@@@@ -154,7 +154,7 @@@@ BasicPlanarYCbCrImage::DeprecatedGetAsSu
   imgSurface->SetData(&imageSurfaceDataKey, mDecodedBuffer.forget(), DestroyBuffer);
 
   nsRefPtr<gfxASurface> result = imgSurface.get();
-#if defined(XP_MACOSX)
+#if defined(MOZ_WIDGET_COCOA)
   nsRefPtr<gfxQuartzImageSurface> quartzSurface =
     new gfxQuartzImageSurface(imgSurface);
   if (quartzSurface) {
@


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