From cb28872b1fdfde2318846b803ab38d3bfd426aa288d051c0b745692c1e42d2be Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 13 Nov 2007 20:23:19 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=26 --- MozillaFirefox.changes | 5 +++ MozillaFirefox.spec | 8 +++- firefox-gcc4.3-fixes.patch | 84 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 firefox-gcc4.3-fixes.patch diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 75c32048..7f2e2d67 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 13 17:49:01 CET 2007 - maw@suse.de + +- Add firefox-gcc4.3-fixes.patch. + ------------------------------------------------------------------- Fri Oct 19 02:04:45 CEST 2007 - maw@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index f5243744..f71a6662 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -20,7 +20,7 @@ BuildRequires: dbus-1-glib-devel %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GPL v2 or later; LGPL v2 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) +License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Provides: web_browser Provides: firefox Provides: MozillaFirebird @@ -29,7 +29,7 @@ Obsoletes: MozillaFirebird <= 1.0.7 Obsoletes: mozilla %endif Version: 2.0.0.8 -Release: 1 +Release: 16 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -93,6 +93,7 @@ Patch34: skin-selection.patch Patch36: greasemonkey.patch Patch38: tango-maxversion.patch Patch39: x11-session.patch +Patch40: firefox-gcc4.3-fixes.patch # gconf.patch dbus.patch startup.patch Patch100: configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -219,6 +220,7 @@ pushd $RPM_BUILD_DIR %patch38 popd %patch39 -p1 +%patch40 -p1 %patch100 %if %has_system_nss #%patch101 @@ -554,6 +556,8 @@ exit 0 %defattr(-,root,root) %endif %changelog +* Tue Nov 13 2007 - maw@suse.de +- Add firefox-gcc4.3-fixes.patch. * Fri Oct 19 2007 - maw@suse.de - Security update to version 2.0.0.8 (#332512) (thanks, Wolfgang) * MFSA 2007-29 Crashes with evidence of memory corruption diff --git a/firefox-gcc4.3-fixes.patch b/firefox-gcc4.3-fixes.patch new file mode 100644 index 00000000..58a4bab7 --- /dev/null +++ b/firefox-gcc4.3-fixes.patch @@ -0,0 +1,84 @@ +diff --git a/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h b/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h +index 8a63354..655c8da 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 +@@ -69,6 +71,13 @@ 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 + +@@ -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 + #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); */ + }; +