diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2007-03-06 00:04:35 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2007-03-06 00:04:35 +0000 |
| commit | 68308ae4c3af26e77b24b808d50212d7fc4e3f07 (patch) | |
| tree | 3fc42912fbe8b35a19ec4b1d5532baf7766e9c3d /media-libs/libflash/files | |
| parent | Fix digest/manifest. Bug #169556 (diff) | |
| download | historical-68308ae4c3af26e77b24b808d50212d7fc4e3f07.tar.gz historical-68308ae4c3af26e77b24b808d50212d7fc4e3f07.tar.bz2 historical-68308ae4c3af26e77b24b808d50212d7fc4e3f07.zip | |
External variables defined with both C and C++ linkage are regected in GCC
4.1.2. Update GCC patch to cover this. Walter Meinl, bug #169517.
Package-Manager: portage-2.1.2.1
Diffstat (limited to 'media-libs/libflash/files')
| -rw-r--r-- | media-libs/libflash/files/libflash-0.4.10-gcc41.patch | 65 |
1 files changed, 41 insertions, 24 deletions
diff --git a/media-libs/libflash/files/libflash-0.4.10-gcc41.patch b/media-libs/libflash/files/libflash-0.4.10-gcc41.patch index c4b5df1725c9..363846c43ab5 100644 --- a/media-libs/libflash/files/libflash-0.4.10-gcc41.patch +++ b/media-libs/libflash/files/libflash-0.4.10-gcc41.patch @@ -1,23 +1,6 @@ ---- libflash-0.4.10/lib/matrix.h.old 2006-01-11 21:23:55.000000000 +0100 -+++ libflash-0.4.10/lib/matrix.h 2006-01-11 21:24:19.000000000 +0100 -@@ -33,13 +33,13 @@ - #endif - - inline -- long Matrix::getX(long x, long y) -+ long getX(long x, long y) - { - return (long) (x*a+y*b+tx); - }; - - inline -- long Matrix::getY(long x, long y) -+ long getY(long x, long y) - { - return (long) (x*c+y*d+ty); - }; ---- libflash-0.4.10/lib/graphic16.h.old 2006-01-11 21:24:39.000000000 +0100 -+++ libflash-0.4.10/lib/graphic16.h 2006-01-11 21:24:52.000000000 +0100 +diff -Naur libflash-0.4.10-orig/lib/graphic16.h libflash-0.4.10/lib/graphic16.h +--- libflash-0.4.10-orig/lib/graphic16.h 2001-04-22 22:18:55.000000000 -0600 ++++ libflash-0.4.10/lib/graphic16.h 2007-03-05 17:53:38.000000000 -0600 @@ -24,7 +24,7 @@ class GraphicDevice16: public GraphicDevice { @@ -27,8 +10,9 @@ public: GraphicDevice16(FlashDisplay *fd); ---- libflash-0.4.10/lib/graphic24.h.old 2006-01-11 21:25:06.000000000 +0100 -+++ libflash-0.4.10/lib/graphic24.h 2006-01-11 21:25:39.000000000 +0100 +diff -Naur libflash-0.4.10-orig/lib/graphic24.h libflash-0.4.10/lib/graphic24.h +--- libflash-0.4.10-orig/lib/graphic24.h 2001-04-22 22:18:55.000000000 -0600 ++++ libflash-0.4.10/lib/graphic24.h 2007-03-05 17:53:38.000000000 -0600 @@ -24,7 +24,7 @@ class GraphicDevice24: public GraphicDevice { @@ -38,8 +22,9 @@ public: GraphicDevice24(FlashDisplay *fd); ---- libflash-0.4.10/lib/graphic32.h.old 2006-01-11 21:26:01.000000000 +0100 -+++ libflash-0.4.10/lib/graphic32.h 2006-01-11 21:26:40.000000000 +0100 +diff -Naur libflash-0.4.10-orig/lib/graphic32.h libflash-0.4.10/lib/graphic32.h +--- libflash-0.4.10-orig/lib/graphic32.h 2001-04-22 22:18:55.000000000 -0600 ++++ libflash-0.4.10/lib/graphic32.h 2007-03-05 17:53:38.000000000 -0600 @@ -24,7 +24,7 @@ class GraphicDevice32: public GraphicDevice { @@ -49,3 +34,35 @@ public: GraphicDevice32(FlashDisplay *fd); +diff -Naur libflash-0.4.10-orig/lib/matrix.h libflash-0.4.10/lib/matrix.h +--- libflash-0.4.10-orig/lib/matrix.h 2001-04-22 22:18:54.000000000 -0600 ++++ libflash-0.4.10/lib/matrix.h 2007-03-05 17:53:38.000000000 -0600 +@@ -33,13 +33,13 @@ + #endif + + inline +- long Matrix::getX(long x, long y) ++ long getX(long x, long y) + { + return (long) (x*a+y*b+tx); + }; + + inline +- long Matrix::getY(long x, long y) ++ long getY(long x, long y) + { + return (long) (x*c+y*d+ty); + }; +diff -Naur libflash-0.4.10-orig/lib/swf.h libflash-0.4.10/lib/swf.h +--- libflash-0.4.10-orig/lib/swf.h 2001-04-22 22:18:54.000000000 -0600 ++++ libflash-0.4.10/lib/swf.h 2007-03-05 17:54:57.000000000 -0600 +@@ -196,7 +196,9 @@ + #define true 1 + #endif + ++extern "C" { + extern int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb; ++}; + + typedef void (*ScanLineFunc)(void *id, long y, long start, long end); + |