From 0f9d7359a99efe6abbd0868639aecd99210214f6 Mon Sep 17 00:00:00 2001
From: "mark%moxienet.com" <mark%moxienet.com>
Date: Tue, 28 Mar 2006 20:06:17 +0000
Subject: [PATCH] 331827 Provisional build patch to make gtk2/darwin builds
 functional out of the box.  There may be additional changes needed for static
 builds.  r=bsmedberg

---
 browser/components/build/Makefile.in | 5 +++--
 gfx/cairo/cairo/src/Makefile.in      | 2 +-
 toolkit/library/Makefile.in          | 2 +-
 xpcom/base/Makefile.in               | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index aa49f8e467d..ca01a050b51 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -103,8 +103,9 @@ ifdef MOZ_PLACES
 EXTRA_DSO_LDOPTS += $(DEPTH)/db/morkreader/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX)
 endif
 
-# Need to link to CoreFoundation for Mac Migrators (PList reading code)
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+# Mac: Need to link with CoreFoundation for Mac Migrators (PList reading code)
+# GTK2: Need to link with glib for GNOME shell service
+ifneq (,$(filter mac cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += \
   $(TK_LIBS) \
   $(NULL)
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index 2863122191d..3209dbc15f1 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -146,7 +146,7 @@ endif
 ifdef MOZ_ENABLE_CAIRO_FT
 CSRCS   += cairo-ft-font.c
 EXPORTS += cairo-ft.h
-LOCAL_INCLUDES += $(CAIRO_FT_CFLAGS)
+OS_INCLUDES += $(CAIRO_FT_CFLAGS)
 endif
 
 
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index b01b48cd738..ccdee9929e9 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -48,7 +48,7 @@ FORCE_USE_PIC = 1
 FORCE_SHARED_LIB = 1
 MOZILLA_INTERNAL_API = 1
 
-ifeq ($(OS_ARCH),Darwin)
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 # This is going to be a framework named "XUL", not an ordinary library named
 # "libxul.dylib"
 LIBRARY_NAME=XUL
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
index 75cb359614f..c6dab929f77 100644
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -71,7 +71,7 @@ CPPSRCS += nsLeakDetector.cpp
 REQUIRES	+= boehm
 endif
 
-ifeq ($(OS_ARCH),Darwin)
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS		+= nsMacUtilsImpl.cpp
 endif
 
@@ -130,7 +130,7 @@ ifdef GC_LEAK_DETECTOR
 XPIDLSRCS       += nsILeakDetector.idl
 endif
 
-ifeq ($(OS_ARCH),Darwin)
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 XPIDLSRCS	+= nsIMacUtils.idl
 endif