From:
[email protected]
Package: clanlib
Severity: normal
Tags: patch
When building 'clanlib' with gcc-3.4 I get the following error:
Compiling Sources/Core/System/Unix/init_linux.cpp
In file included from Sources/Core/System/Unix/init_linux.cpp:27: Sources/Core/System/Unix/appconf.h:621: error: class FileConfig::ConfigGroup redeclared with different access
make[1]: *** [Libs/Intermediate/init_linux.o] Error 1
make[1]: Leaving directory `/clanlib-0.6.5-1/build-tree/ClanLib-0.6.5'
With the attached patch 'clanlib' can be compiled using gcc-3.4.
Regards
Andreas Jochens
diff -urN ../tmp-orig/clanlib-0.6.5-1/debian/patches/015_gcc-3.4-fix ./debian/patches/015_gcc-3.4-fix
--- ../tmp-orig/clanlib-0.6.5-1/debian/patches/015_gcc-3.4-fix 1970-01-01 01:00:00.000000000 +0100
+++ ./debian/patches/015_gcc-3.4-fix 2004-08-18 16:42:44.818713161 +0200
@@ -0,0 +1,55 @@
+diff -urN tmp/Sources/Core/System/Unix/appconf.h ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h
+--- tmp/Sources/Core/System/Unix/appconf.h 2000-05-03 20:29:00.000000000 +0200
++++ ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h 2004-08-18 16:30:09.442547793 +0200
+@@ -564,7 +564,6 @@
+ void SetNext(ConfigEntry *pNext) { m_pNext = pNext; }
+ };
+
+-protected:
+ class ConfigGroup
+ {
+ private:
+diff -urN tmp/Sources/Display/Display/Generic/blit_alphamask_rle.h ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h
+--- tmp/Sources/Display/Display/Generic/blit_alphamask_rle.h 2001-09-02 19:33:37.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h 2004-08-18 16:32:18.089990409 +0200
+@@ -107,14 +107,14 @@
+ {
+ T a = alpha_data[x];
+ T