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.30.03.03.36;	author pho;	state Exp;
branches;
next	;
commitid	SyhQGFZ06rmWDvCx;


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-profile_dirserviceprovider_src_nsProfileLock.cpp,v 1.1 2014/05/30 03:03:36 pho Exp $

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

--- profile/dirserviceprovider/src/nsProfileLock.cpp.orig	2014-05-06 22:56:22.000000000 +0000
+++ profile/dirserviceprovider/src/nsProfileLock.cpp
@@@@ -7,7 +7,7 @@@@
 #include "nsProfileLock.h"
 #include "nsCOMPtr.h"
 
-#if defined(XP_MACOSX)
+#if defined(MOZ_WIDGET_COCOA)
 #include <Carbon/Carbon.h>
 #include <CoreFoundation/CoreFoundation.h>
 #endif
@@@@ -432,7 +432,7 @@@@ nsresult nsProfileLock::GetReplacedLockT
 nsresult nsProfileLock::Lock(nsIFile* aProfileDir,
                              nsIProfileUnlocker* *aUnlocker)
 {
-#if defined (XP_MACOSX)
+#if defined (MOZ_WIDGET_COCOA)
     NS_NAMED_LITERAL_STRING(LOCKFILE_NAME, ".parentlock");
     NS_NAMED_LITERAL_STRING(OLD_LOCKFILE_NAME, "parent.lock");
 #elif defined (XP_UNIX)
@@@@ -464,7 +464,7 @@@@ nsresult nsProfileLock::Lock(nsIFile* aP
     if (NS_FAILED(rv))
         return rv;
         
-#if defined(XP_MACOSX)
+#if defined(MOZ_WIDGET_COCOA)
     // First, try locking using fcntl. It is more reliable on
     // a local machine, but may not be supported by an NFS server.
 
@


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