From 39ec7832d165d81385b340bc6c0ca9cf5f194eb5 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 5 Jun 2012 23:22:48 +0200
Subject: Adapt to --with-macosx-version-min-required=10.6 and Xcode 4

...signature of TransitionWindowWithOptions apparently changed slightly in 10.6,
and /Developer/Tools/Rez can more reliably be found in /usr/bin.

Change-Id: Iba55478f3b6de1b4695b686095f4aa0bc0af8e7b
---
 moz/makefile.mk                                    |  1 +
 .../seamonkey-1.1.14.source-macosx10.6and7.patch   | 33 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch

(limited to 'moz')

diff --git a/moz/makefile.mk b/moz/makefile.mk
index 13db91fc0517..76296ad5e5cf 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -88,6 +88,7 @@ PATCH_FILES = \
     patches/nss-linux3.patch \
     patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
     patches/clang_missing_this_pointers.patch \
+    patches/seamonkey-1.1.14.source-macosx10.6and7.patch
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git a/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch b/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch
new file mode 100644
index 000000000000..e74c4e46c381
--- /dev/null
+++ b/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch
@@ -0,0 +1,33 @@
+--- misc/mozilla/widget/src/mac/Makefile.in	2006-08-04 20:52:25.000000000 +0200
++++ misc/build/mozilla/widget/src/mac/Makefile.in	2012-06-04 23:26:18.000000000 +0200
+@@ -130,7 +130,7 @@
+ RES_SRC = $(srcdir)/nsMacWidget.r
+ 
+ $(RES_DEST): $(RES_SRC)
+-	/Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $(RES_SRC) -o $(RES_DEST)
++	Rez -i $(MACOS_SDK_DIR)/Developer/Headers/FlatCarbon -useDF $(RES_SRC) -o $(RES_DEST)
+ 
+ libs:: $(RES_DEST)
+ 
+--- misc/mozilla/widget/src/mac/nsMacWindow.cpp	2007-11-19 21:40:08.000000000 +0100
++++ misc/build/mozilla/widget/src/mac/nsMacWindow.cpp	2012-06-04 22:26:29.000000000 +0200
+@@ -1209,7 +1209,7 @@
+           if (!sChecked) {
+             sChecked = PR_TRUE;
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_3
+-            transitionFunc = ::TransitionWindowWithOptions;
++            transitionFunc = (TransitionWindowWithOptions_type) ::TransitionWindowWithOptions; // last TransitionWindowOptions* param is const* in 10.6
+ #else
+             CFBundleRef carbonBundle =
+              ::CFBundleGetBundleWithIdentifier(CFSTR("com.apple.Carbon"));
+--- misc/mozilla/xpfe/bootstrap/appleevents/Makefile.in	2006-01-05 17:41:23.000000000 +0100
++++ misc/build/mozilla/xpfe/bootstrap/appleevents/Makefile.in	2012-06-04 23:35:22.000000000 +0200
+@@ -112,7 +112,7 @@
+ 
+ # convert AppleScript dictionary .sdef file into .r format, and thence to .rsrc
+ SDP_TOOL = $(SDP)
+-REZ_TOOL = /Developer/Tools/Rez
++REZ_TOOL = Rez
+ SDEF_SRC = $(srcdir)/mozilla.sdef
+ RES_DEST = mozillaSuite.r
+ RSRC_DEST = mozillaSuite.rsrc
-- 
cgit