From 5414a7c79693e125623956b5a1981381c61479a2 Mon Sep 17 00:00:00 2001
From: Jan Horak <xhorak@fedoraproject.org>
Date: Fri, 31 Jul 2009 15:12:45 +0000
Subject: [PATCH] Fix build

---
 thunderbird-setjmp.patch | 38 ++++++++++++++++++++++++++++++++++++++
 thunderbird.spec         |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 thunderbird-setjmp.patch

diff --git a/thunderbird-setjmp.patch b/thunderbird-setjmp.patch
new file mode 100644
index 0000000..d9fbe82
--- /dev/null
+++ b/thunderbird-setjmp.patch
@@ -0,0 +1,38 @@
+diff -up thunderbird-3.0/mozilla/modules/libpr0n/build/nsImageModule.cpp.setjmp thunderbird-3.0/mozilla/modules/libpr0n/build/nsImageModule.cpp
+--- thunderbird-3.0/mozilla/modules/libpr0n/build/nsImageModule.cpp.setjmp	2009-07-31 13:22:44.000000000 +0200
++++ thunderbird-3.0/mozilla/modules/libpr0n/build/nsImageModule.cpp	2009-07-31 13:34:42.000000000 +0200
+@@ -59,6 +59,16 @@
+ #include "imgRequestProxy.h"
+ #include "imgTools.h"
+ 
++#ifdef IMG_BUILD_ENCODER_png
++// png
++#include "nsPNGEncoder.h"
++#endif
++#ifdef IMG_BUILD_ENCODER_jpeg
++// jpeg
++#include "nsJPEGEncoder.h"
++#endif
++
++
+ #ifdef IMG_BUILD_DECODER_gif
+ // gif
+ #include "nsGIFDecoder2.h"
+@@ -85,17 +95,6 @@
+ #include "nsXBMDecoder.h"
+ #endif
+ 
+-
+-#ifdef IMG_BUILD_ENCODER_png
+-// png
+-#include "nsPNGEncoder.h"
+-#endif
+-#ifdef IMG_BUILD_ENCODER_jpeg
+-// jpeg
+-#include "nsJPEGEncoder.h"
+-#endif
+-
+-
+ // objects that just require generic constructors
+ 
+ NS_GENERIC_FACTORY_CONSTRUCTOR(imgContainer)
diff --git a/thunderbird.spec b/thunderbird.spec
index cf6a818..b090918 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -38,6 +38,7 @@ Patch2:         thunderbird-shared-error.patch
 Patch3:         xulrunner-elif.patch
 Patch4:         thunderbird-pango.patch
 Patch5:         thunderbird-makebug.patch
+Patch6:         thunderbird-setjmp.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -95,6 +96,7 @@ Mozilla Thunderbird is a standalone mail and newsgroup client.
 #%patch3 -p0 -b .xulrunner-elif
 #%patch4 -p1 -b .pango-fix
 %patch5 -p1 -b .makebug
+%patch6 -p1 -b .setjmp
 
 %if %{official_branding}
 # Required by Mozilla Corporation