Fix build

This commit is contained in:
Jan Horak 2009-07-31 15:12:45 +00:00
parent 0824475258
commit 5414a7c796
2 changed files with 40 additions and 0 deletions

38
thunderbird-setjmp.patch Normal file
View File

@ -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)

View File

@ -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