OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=18

MozillaThunderbird.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov 13 17:50:35 CET 2007 - maw@suse.de
+
+- Add thunderbird-gcc4.3-fixes.patch
+- Add visibility.patch.
+
 -------------------------------------------------------------------
 Thu Sep 13 17:00:36 CEST 2007 - cthiel@suse.de
 

MozillaThunderbird.spec

@@ -12,11 +12,11 @@
 
 Name:           MozillaThunderbird
 BuildRequires:  fdupes gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel unzip update-desktop-files zip
-License:        GPL v2 or later, LGPL v2 or later
+License:        GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
 Version:        2.0.0.6
-Release:        16
+Release:        45
 Summary:        The Stand-Alone Mozilla Mail Component
-URL:            http://www.mozilla.org/products/thunderbird/
+Url:            http://www.mozilla.org/products/thunderbird/
 Group:          Productivity/Networking/Email/Clients
 Source:         thunderbird-%{version}-source.tar.bz2
 Source1:        MozillaThunderbird.desktop
@@ -45,6 +45,8 @@ Patch22:        cjk-postscript-fonts.dif
 Patch25:        postscript.patch
 Patch26:        cups-paper.patch
 Patch27:        thunderbird-1.5.0.8-uninitalized-vars-232305.patch
+Patch28:        thunderbird-gcc4.3-fixes.patch
+Patch29:        visibility.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         libstdc++ fileutils textutils /bin/sh
 %if %suse_version > 1000
@@ -148,6 +150,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch25
 %patch26
 %patch27 -p0
+%patch28 -p1
 
 %build
 export MOZ_BUILD_DATE=%{releasedate}
@@ -328,9 +331,7 @@ chmod 755 %{my_requires}
 %if %suse_version > 1020
 # Some sites use different partitions for /usr/(lib|lib64) and /usr/share.  Since you
 # can't create hardlinks across partitions, we'll do this more than once.
-
 %fdupes $RPM_BUILD_ROOT/%progdir
-
 %fdupes $RPM_BUILD_ROOT/%{_datadir}
 %endif
 
@@ -342,17 +343,14 @@ rm -f %{my_requires}
 %endif
 
 %triggerin -- myspell-dictionary
-
 %progdir/add-plugins.sh > /dev/null 2>&1
 exit 0
 
 %triggerpostun -- myspell-dictionary
-
 %progdir/add-plugins.sh > /dev/null 2>&1
 exit 0
 
 %post
-
 %progdir/add-plugins.sh > /dev/null 2>&1
 exit 0
 
@@ -605,8 +603,10 @@ exit 0
 %files translations -f %{_tmppath}/translations.list
 %defattr(-,root,root)
 %endif
-
 %changelog
+* Tue Nov 13 2007 - maw@suse.de
+- Add thunderbird-gcc4.3-fixes.patch
+- Add visibility.patch.
 * Thu Sep 13 2007 - cthiel@suse.de
 - recommend gpg instead of requireing a fixed path
 * Wed Sep 12 2007 - maw@suse.de

thunderbird-gcc4.3-fixes.patch

@@ -0,0 +1,137 @@
+diff --git a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
+index 8a63354..019d35d 100644
+--- a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
++++ b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h
+@@ -39,8 +39,10 @@
+ #include "imgIEncoder.h"
+ #ifdef MOZILLA_1_8_BRANCH
+ #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
++#ifndef NS_DECL_IMGIENCODER
+ #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
+ #endif
++#endif
+ 
+ // needed for JPEG library
+ #include <stdio.h>
+@@ -69,6 +71,14 @@ public:
+ 
+   nsJPEGEncoder();
+ 
++  NS_IMETHOD InitFromData(const PRUint8* aData,
++                          PRUint32 aLength, // (unused, req'd by JS)
++                          PRUint32 aWidth,
++                          PRUint32 aHeight,
++                          PRUint32 aStride,
++                          PRUint32 aInputFormat,
++                          const nsAString& aOutputOptions);
++
+ private:
+   ~nsJPEGEncoder();
+ 
+diff --git a/modules/libpr0n/encoders/png/nsPNGEncoder.h b/modules/libpr0n/encoders/png/nsPNGEncoder.h
+index ff85949..83766f1 100644
+--- a/modules/libpr0n/encoders/png/nsPNGEncoder.h
++++ b/modules/libpr0n/encoders/png/nsPNGEncoder.h
+@@ -38,8 +38,10 @@
+ #include "imgIEncoder.h"
+ #ifdef MOZILLA_1_8_BRANCH
+ #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH
++#ifndef NS_DECL_IMGIENCODER
+ #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH
+ #endif
++#endif
+ 
+ #include <png.h>
+ 
+@@ -63,6 +65,14 @@ public:
+ 
+   nsPNGEncoder();
+ 
++  NS_IMETHOD InitFromData(const PRUint8* aData,
++                          PRUint32 aLength, // (unused, req'd by JS)
++                          PRUint32 aWidth,
++                          PRUint32 aHeight,
++                          PRUint32 aStride,
++                          PRUint32 aInputFormat,
++                          const nsAString& aOutputOptions);
++
+ private:
+   ~nsPNGEncoder();
+ 
+diff --git a/modules/libpr0n/public/imgIContainer.idl b/modules/libpr0n/public/imgIContainer.idl
+index f975b16..4819158 100644
+--- a/modules/libpr0n/public/imgIContainer.idl
++++ b/modules/libpr0n/public/imgIContainer.idl
+@@ -38,7 +38,7 @@
+  * ***** END LICENSE BLOCK ***** */
+ 
+ #include "nsISupports.idl"
+-#include "gfxtypes.idl"
++#include <gfxtypes.idl>
+ #include "gfxIFormats.idl"
+ 
+ interface gfxIImageFrame;
+diff --git a/modules/libpr0n/public/imgIEncoder.idl b/modules/libpr0n/public/imgIEncoder.idl
+index 120b3bf..562bf42 100755
+--- a/modules/libpr0n/public/imgIEncoder.idl
++++ b/modules/libpr0n/public/imgIEncoder.idl
+@@ -96,6 +96,6 @@ interface nsIFile;
+ [scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)]
+ interface imgIEncoder : nsISupports
+ {
+-  void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile);
++  /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */
+ };
+ 
+diff --git a/xpcom/obsolete/component/nsFileSpecImpl.h b/xpcom/obsolete/component/nsFileSpecImpl.h
+index 502e254..0e51950 100644
+--- a/xpcom/obsolete/component/nsFileSpecImpl.h
++++ b/xpcom/obsolete/component/nsFileSpecImpl.h
+@@ -58,7 +58,7 @@ class nsFileSpecImpl
+ 	// COM Cruft
+ 	//----------------------
+ 
+-	static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec);
++	/* static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec); */
+ 
+ 	//----------------------
+ 	// Implementation
+@@ -104,7 +104,7 @@ public:
+ 	// COM Cruft
+ 	//----------------------
+ 
+-	static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec);
++	/* static NS_METHOD Create(nsISupports* outer, const nsIID& aIID, void* *aIFileSpec); */
+ 
+ private:
+ 	~nsDirectoryIteratorImpl();
+diff --git a/xpcom/obsolete/component/nsXPCOMObsolete.cpp b/xpcom/obsolete/component/nsXPCOMObsolete.cpp
+index 9a71a91..03ac666 100644
+--- a/xpcom/obsolete/component/nsXPCOMObsolete.cpp
++++ b/xpcom/obsolete/component/nsXPCOMObsolete.cpp
+@@ -48,8 +48,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsRegistry)
+ 
+ static const nsModuleComponentInfo components[] =
+ {
+-    COMPONENT(FILESPEC, nsFileSpecImpl::Create),
+-    COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create),
++/*    COMPONENT(FILESPEC, nsFileSpecImpl::Create),
++      COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create), */
+     COMPONENT(REGISTRY, nsRegistryConstructor),
+ };
+ 
+diff --git a/xpcom/obsolete/nsXPCOMObsolete.cpp b/xpcom/obsolete/nsXPCOMObsolete.cpp
+index 45391c0..10b2060 100644
+--- a/xpcom/obsolete/nsXPCOMObsolete.cpp
++++ b/xpcom/obsolete/nsXPCOMObsolete.cpp
+@@ -46,8 +46,8 @@
+ 
+ static const nsModuleComponentInfo components[] =
+ {
+-  COMPONENT(FILESPEC, nsFileSpecImpl::Create),
+-  COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create),
++    COMPONENT(FILESPEC, nsFileSpecImpl::Create),
++    COMPONENT(DIRECTORYITERATOR, nsDirectoryIteratorImpl::Create),
+ };
+ 
+ NS_IMPL_NSGETMODULE(xpcomObsoleteModule, components)

visibility.patch

@@ -0,0 +1,22 @@
+From: Wolfgang Rosenauer <stark@suse.de>
+Subject: disable visibility feature
+References:
+https://bugzilla.novell.com/show_bug.cgi?id=83908
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
+
+because of a gcc bug it's not possible to build with that
+feature at the moment
+
+Index: configure
+===================================================================
+--- configure.orig
++++ configure
+@@ -7949,7 +7949,7 @@ EOF
+                       if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then
+                         if egrep '\.(hidden|extern_private).*foo_hidden' conftest.s >/dev/null; then
+                           if ! egrep '\.(hidden|extern_private).*foo_default' conftest.s > /dev/null; then
+-                            ac_cv_visibility_pragma=yes
++                            ac_cv_visibility_pragma=no
+                           fi
+                         fi
+                       fi