rpms/thunderbird/devel thunderbird-setjmp.patch, NONE, 1.1 thunderbird.spec, 1.140, 1.141

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9588

Modified Files:
	thunderbird.spec 
Added Files:
	thunderbird-setjmp.patch 
Log Message:
Fix build

thunderbird-setjmp.patch:
 nsImageModule.cpp |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE thunderbird-setjmp.patch ---
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)


Index: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -p -r1.140 -r1.141
--- thunderbird.spec	30 Jul 2009 16:14:43 -0000	1.140
+++ thunderbird.spec	31 Jul 2009 15:12:45 -0000	1.141
@@ -38,6 +38,7 @@ Patch2:         thunderbird-shared-error
 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
 #%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