--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fix-SUNWsongbird-fix-type.patch	Mon Oct 04 14:26:59 2010 +0200
@@ -0,0 +1,46 @@
+diff --git a/patches/openindiana-songbird-1000-ss-fix-parameter-type.diff b/patches/openindiana-songbird-1000-ss-fix-parameter-type.diff
+new file mode 100644
+--- /dev/null
++++ b/patches/openindiana-songbird-1000-ss-fix-parameter-type.diff
+@@ -0,0 +1,21 @@
++diff -ru Songbird1.4.3.orig/components/devices/device/src/sbDeviceEnsureSpaceForWrite.cpp Songbird1.4.3/components/devices/device/src/sbDeviceEnsureSpaceForWrite.cpp
++--- Songbird1.4.3.orig/components/devices/device/src/sbDeviceEnsureSpaceForWrite.cpp	2009-10-10 11:05:05.000000000 +0200
+++++ Songbird1.4.3/components/devices/device/src/sbDeviceEnsureSpaceForWrite.cpp	2010-07-28 20:17:56.118433800 +0200
++@@ -129,7 +129,7 @@
++         NS_ENSURE_STATE(SameCOMIdentity(mOwnerLibrary, newLibrary));
++       #endif /* DEBUG */
++     }
++-    ItemsToWrite::iterator const itemToWriteIter = mItemsToWrite.find(request->item);
+++    ItemsToWrite::iterator const itemToWriteIter = mItemsToWrite.find(&(*request->item));
++     if (itemToWriteIter != mItemsToWrite.end()) {
++       itemToWriteIter->second.mBatchIters.push_back(iter);
++       // this item is already in the set, don't worry about it
++@@ -147,7 +147,7 @@
++     LOG(("r(%p) i(%p) sbBaseDevice::EnsureSpaceForWrite - size %lld\n",
++          (void*)request, (void*)(request->item), contentLength));
++ 
++-    mItemsToWrite[request->item] = BatchLink(++order, contentLength, iter);
+++    mItemsToWrite[&(*request->item)] = BatchLink(++order, contentLength, iter);
++   }
++   return NS_OK;
++ }
+diff --git a/specs/SUNWsongbird.spec b/specs/SUNWsongbird.spec
+--- a/specs/SUNWsongbird.spec
++++ b/specs/SUNWsongbird.spec
+@@ -76,6 +76,8 @@
+ # owner:jouby date:2010-04-28 type:bug:bug d.o.o 15069
+ Patch14: songbird-14-check-readable-core.diff
+ 
++Patch1000: openindiana-songbird-1000-ss-fix-parameter-type.diff
++
+ URL:           http://www.songbirdnest.com/
+ SUNW_BaseDir:  %{_basedir}
+ SUNW_Copyright: %{name}.copyright
+@@ -140,6 +142,7 @@
+ %patch12 -p1
+ %patch13 -p1
+ %patch14 -p1
++%patch1000 -p1
+ 
+ gzcat %SOURCE2 | tar xf -
+ cd dependencies/vendor/xulrunner/mozilla

--- a/fix-SUNWthunderbird-ss12u1-build.patch	Thu Sep 30 12:57:42 2010 +0200
+++ b/fix-SUNWthunderbird-ss12u1-build.patch	Mon Oct 04 14:26:59 2010 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 2a24a8a34365ec49cbb289b737bcf728063aeb65
+# Parent a8914741df9ff8db9ebe880fecbfb87d4ded31a7
 workaround for a compiler bug in SS12u1
 
 diff --git a/base-specs/thunderbird.spec b/base-specs/thunderbird.spec
@@ -30,3 +30,12 @@
  #####################################
  ##      Package Build Section      ##
  #####################################
+@@ -217,7 +219,7 @@
+ %endif
+ ac_add_options --disable-shared
+ ac_add_options --disable-crashreporter
+-ac_add_options --with-rpath="\\\$\$ORIGIN"
++ac_add_options '--with-rpath=\$ORIGIN'
+ %if %option_without_moz_nss_nspr
+ ac_add_options --with-system-nspr
+ ac_add_options --with-system-nss

--- a/series	Thu Sep 30 12:57:42 2010 +0200
+++ b/series	Mon Oct 04 14:26:59 2010 +0200
@@ -25,3 +25,4 @@
 fix-SUNWevolution-libs-remove-gcc-cflags.patch
 fix-SUNWnwam-manager-ifa_addr.patch
 fix-SUNWspeex-remove-gcc-cflags.patch
+fix-SUNWsongbird-fix-type.patch