[spicebird] fix ftbfs

[Tom Callaway]

commit 233cb2e58e141376b6028a2b42ffa63847ada72a
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Mar 6 16:04:31 2012 -0500

    fix ftbfs

 spicebird-gcc47.patch |   96 +++++++++++++++++++++++++++++++++++++++++++++++++
 spicebird.spec        |    7 +++-
 2 files changed, 102 insertions(+), 1 deletions(-)
---
diff --git a/spicebird-gcc47.patch b/spicebird-gcc47.patch
new file mode 100644
index 0000000..7312fb0
--- /dev/null
+++ b/spicebird-gcc47.patch
@@ -0,0 +1,96 @@
+diff -up mozilla/xpcom/glue/nsBaseHashtable.h.gcc47 mozilla/xpcom/glue/nsBaseHashtable.h
+--- mozilla/xpcom/glue/nsBaseHashtable.h.gcc47	2007-10-19 19:26:52.000000000 -0400
++++ mozilla/xpcom/glue/nsBaseHashtable.h	2012-03-06 15:00:42.378617209 -0500
+@@ -123,7 +123,7 @@ public:
+    */
+   PRBool Get(KeyType aKey, UserDataType* pData) const
+   {
+-    EntryType* ent = GetEntry(aKey);
++    EntryType* ent = this->GetEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -142,7 +142,7 @@ public:
+    */
+   PRBool Put(KeyType aKey, UserDataType aData)
+   {
+-    EntryType* ent = PutEntry(aKey);
++    EntryType* ent = this->PutEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -156,7 +156,7 @@ public:
+    * remove the data for the associated key
+    * @param aKey the key to remove from the hashtable
+    */
+-  void Remove(KeyType aKey) { RemoveEntry(aKey); }
++  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
+ 
+   /**
+    * function type provided by the application for enumeration.
+diff -up mozilla/xpcom/glue/nsClassHashtable.h.gcc47 mozilla/xpcom/glue/nsClassHashtable.h
+--- mozilla/xpcom/glue/nsClassHashtable.h.gcc47	2005-08-11 15:42:37.000000000 -0400
++++ mozilla/xpcom/glue/nsClassHashtable.h	2012-03-06 15:00:42.380617188 -0500
+@@ -98,7 +98,7 @@ PRBool
+ nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
+ {
+   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+diff -up mozilla/xpcom/glue/nsInterfaceHashtable.h.gcc47 mozilla/xpcom/glue/nsInterfaceHashtable.h
+--- mozilla/xpcom/glue/nsInterfaceHashtable.h.gcc47	2005-08-11 15:42:48.000000000 -0400
++++ mozilla/xpcom/glue/nsInterfaceHashtable.h	2012-03-06 15:00:42.381617177 -0500
+@@ -111,7 +111,7 @@ nsInterfaceHashtable<KeyClass,Interface>
+   (KeyType aKey, UserDataType* pInterface) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -139,7 +139,7 @@ nsInterfaceHashtable<KeyClass,Interface>
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+diff -up mozilla/xpcom/glue/nsRefPtrHashtable.h.gcc47 mozilla/xpcom/glue/nsRefPtrHashtable.h
+--- mozilla/xpcom/glue/nsRefPtrHashtable.h.gcc47	2012-03-06 15:02:14.040765752 -0500
++++ mozilla/xpcom/glue/nsRefPtrHashtable.h	2012-03-06 15:12:31.997171168 -0500
+@@ -112,7 +112,7 @@ nsRefPtrHashtable<KeyClass,RefPtr>::Get
+   (KeyType aKey, UserDataType* pRefPtr) const
+ {
+   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -140,7 +140,7 @@ nsRefPtrHashtable<KeyClass,RefPtr>::GetW
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+diff -up mozilla/xpcom/glue/nsTPtrArray.h.gcc47 mozilla/xpcom/glue/nsTPtrArray.h
+--- mozilla/xpcom/glue/nsTPtrArray.h.gcc47	2012-03-06 15:19:40.235614834 -0500
++++ mozilla/xpcom/glue/nsTPtrArray.h	2012-03-06 15:19:49.312539417 -0500
+@@ -64,7 +64,7 @@ class nsTPtrArray : public nsTArray<E*>
+ 
+     // Initialize this array and pre-allocate some number of elements.
+     explicit nsTPtrArray(size_type capacity) {
+-      SetCapacity(capacity);
++      this->SetCapacity(capacity);
+     }
+     
+     // The array's copy-constructor performs a 'deep' copy of the given array.
diff --git a/spicebird.spec b/spicebird.spec
index a40ba00..df45535 100644
--- a/spicebird.spec
+++ b/spicebird.spec
@@ -10,7 +10,7 @@
 Summary:        Synovel Spicebird PIM client
 Name:           spicebird
 Version:        0.7.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 URL:            http://www.spicebird.org/
 License:        GPLv2+
 Group:          Applications/Internet
@@ -26,6 +26,7 @@ Source30:       spicebird-open-browser.sh
 Source100:      find-external-requires
 
 Patch1:         spicebird.gcc4.4.patch
+Patch2:		spicebird-gcc47.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       nspr >= %{nspr_version}
@@ -71,6 +72,7 @@ Synovel Spicebird provides email, calendaring and instant messaging with tight i
 cd mozilla
 
 %patch1 -p1 -b .gcc
+%patch2 -p1 -b .gcc47
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -265,6 +267,9 @@ fi
 #===============================================================================
 
 %changelog
+* Tue Mar  6 2012 Tom Callaway <spot at fedoraproject.org> - 0.7.1-5
+- fix gcc 47 issues
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild