| 1 |
armin76 08/01/28 19:39:55 |
| 2 |
|
| 3 |
Added: 090_xul-gcc4.3.patch |
| 4 |
Log: |
| 5 |
Add patch to make it build with gcc-4.3, bug #204703 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1 src/patchsets/mozilla-sunbird/0.7/090_xul-gcc4.3.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-sunbird/0.7/090_xul-gcc4.3.patch?rev=1.1&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-sunbird/0.7/090_xul-gcc4.3.patch?rev=1.1&content-type=text/plain |
| 12 |
|
| 13 |
Index: 090_xul-gcc4.3.patch |
| 14 |
=================================================================== |
| 15 |
http://lists.opensuse.org/opensuse-commit/2007-11/msg00823.html |
| 16 |
|
| 17 |
diff -Naur mozilla-orig/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h |
| 18 |
--- mozilla-orig/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h 2006-05-20 11:20:48.000000000 -0600 |
| 19 |
+++ mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h 2008-01-06 22:13:39.000000000 -0600 |
| 20 |
@@ -39,8 +39,10 @@ |
| 21 |
#include "imgIEncoder.h" |
| 22 |
#ifdef MOZILLA_1_8_BRANCH |
| 23 |
#define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH |
| 24 |
+#ifndef NS_DECL_IMGIENCODER |
| 25 |
#define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH |
| 26 |
#endif |
| 27 |
+#endif |
| 28 |
|
| 29 |
// needed for JPEG library |
| 30 |
#include <stdio.h> |
| 31 |
@@ -69,6 +71,14 @@ |
| 32 |
|
| 33 |
nsJPEGEncoder(); |
| 34 |
|
| 35 |
+ NS_IMETHOD InitFromData(const PRUint8* aData, |
| 36 |
+ PRUint32 aLength, // (unused, req'd by JS) |
| 37 |
+ PRUint32 aWidth, |
| 38 |
+ PRUint32 aHeight, |
| 39 |
+ PRUint32 aStride, |
| 40 |
+ PRUint32 aInputFormat, |
| 41 |
+ const nsAString& aOutputOptions); |
| 42 |
+ |
| 43 |
private: |
| 44 |
~nsJPEGEncoder(); |
| 45 |
|
| 46 |
diff -Naur mozilla-orig/modules/libpr0n/encoders/png/nsPNGEncoder.h mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.h |
| 47 |
--- mozilla-orig/modules/libpr0n/encoders/png/nsPNGEncoder.h 2006-05-20 11:20:49.000000000 -0600 |
| 48 |
+++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.h 2008-01-06 22:11:36.000000000 -0600 |
| 49 |
@@ -38,8 +38,10 @@ |
| 50 |
#include "imgIEncoder.h" |
| 51 |
#ifdef MOZILLA_1_8_BRANCH |
| 52 |
#define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH |
| 53 |
+#ifndef NS_DECL_IMGIENCODER |
| 54 |
#define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH |
| 55 |
#endif |
| 56 |
+#endif |
| 57 |
|
| 58 |
#include <png.h> |
| 59 |
|
| 60 |
@@ -63,6 +65,14 @@ |
| 61 |
|
| 62 |
nsPNGEncoder(); |
| 63 |
|
| 64 |
+ NS_IMETHOD InitFromData(const PRUint8* aData, |
| 65 |
+ PRUint32 aLength, // (unused, req'd by JS) |
| 66 |
+ PRUint32 aWidth, |
| 67 |
+ PRUint32 aHeight, |
| 68 |
+ PRUint32 aStride, |
| 69 |
+ PRUint32 aInputFormat, |
| 70 |
+ const nsAString& aOutputOptions); |
| 71 |
+ |
| 72 |
private: |
| 73 |
~nsPNGEncoder(); |
| 74 |
|
| 75 |
diff -Naur mozilla-orig/modules/libpr0n/public/imgIEncoder.idl mozilla/modules/libpr0n/public/imgIEncoder.idl |
| 76 |
--- mozilla-orig/modules/libpr0n/public/imgIEncoder.idl 2006-05-20 11:20:49.000000000 -0600 |
| 77 |
+++ mozilla/modules/libpr0n/public/imgIEncoder.idl 2008-01-06 22:15:40.000000000 -0600 |
| 78 |
@@ -96,6 +96,6 @@ |
| 79 |
[scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)] |
| 80 |
interface imgIEncoder : nsISupports |
| 81 |
{ |
| 82 |
- void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); |
| 83 |
+ /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */ |
| 84 |
}; |
| 85 |
|
| 86 |
diff -Naur mozilla-orig/xpcom/obsolete/component/nsFileSpecImpl.h mozilla/xpcom/obsolete/component/nsFileSpecImpl.h |
| 87 |
--- mozilla-orig/xpcom/obsolete/component/nsFileSpecImpl.h 2004-04-18 08:18:15.000000000 -0600 |
| 88 |
+++ mozilla/xpcom/obsolete/component/nsFileSpecImpl.h 2008-01-06 22:17:40.000000000 -0600 |
| 89 |
@@ -43,7 +43,7 @@ |
| 90 |
#include "nsFileSpec.h" |
| 91 |
|
| 92 |
//======================================================================================== |
| 93 |
-class nsFileSpecImpl |
| 94 |
+class NS_COM nsFileSpecImpl |
| 95 |
//======================================================================================== |
| 96 |
: public nsIFileSpec |
| 97 |
{ |
| 98 |
@@ -81,7 +81,7 @@ |
| 99 |
}; // class nsFileSpecImpl |
| 100 |
|
| 101 |
//======================================================================================== |
| 102 |
-class nsDirectoryIteratorImpl |
| 103 |
+class NS_COM nsDirectoryIteratorImpl |
| 104 |
//======================================================================================== |
| 105 |
: public nsIDirectoryIterator |
| 106 |
{ |
| 107 |
|
| 108 |
|
| 109 |
|
| 110 |
-- |
| 111 |
gentoo-commits@l.g.o mailing list |
Archives