diff options
author | Ladislav Hagara | 2007-04-12 12:19:02 +0200 |
---|---|---|
committer | Eric Sandall | 2007-04-12 07:49:25 -0700 |
commit | 9cecdffac3ebc87bed7301806e3bc81125f70ac0 (patch) | |
tree | f6280964893a17b963d7cf00a889b4ca11b3e492 | |
parent | 85b786c07232f774bf10c4e69b21ece24bb9a904 (diff) |
guilib: BUILD, guilib-1.1.0-gcc-4.1.x-fix.diff: added patch from gentoo
(cherry picked from commit 575efaa2a0f252014a8022b91aea8ff4de80aee5)
-rwxr-xr-x | libs/guilib/BUILD | 1 | ||||
-rw-r--r-- | libs/guilib/HISTORY | 1 | ||||
-rw-r--r-- | libs/guilib/guilib-1.1.0-gcc-4.1.x-fix.diff | 20 |
3 files changed, 22 insertions, 0 deletions
diff --git a/libs/guilib/BUILD b/libs/guilib/BUILD index 7115715a13..2ffc93830a 100755 --- a/libs/guilib/BUILD +++ b/libs/guilib/BUILD @@ -1,3 +1,4 @@ export LDFLAGS="$LDFLAGS -lstdc++" patch -p0 <$SCRIPT_DIRECTORY/config.sub.patch && +patch -p1 <$SCRIPT_DIRECTORY/guilib-1.1.0-gcc-4.1.x-fix.diff && default_build diff --git a/libs/guilib/HISTORY b/libs/guilib/HISTORY index aca78276cf..0d45ef3954 100644 --- a/libs/guilib/HISTORY +++ b/libs/guilib/HISTORY @@ -1,5 +1,6 @@ 2007-04-12 Ladislav Hagara <hgr@vabo.cz> * DETAILS: added SOURCE_HASH, sig was missing + * BUILD, guilib-1.1.0-gcc-4.1.x-fix.diff: added patch from gentoo 2007-03-20 Arjan Bouter <abouter@sourcemage.org> * DETAILS: update to 1.1.2 diff --git a/libs/guilib/guilib-1.1.0-gcc-4.1.x-fix.diff b/libs/guilib/guilib-1.1.0-gcc-4.1.x-fix.diff new file mode 100644 index 0000000000..450a4401b2 --- /dev/null +++ b/libs/guilib/guilib-1.1.0-gcc-4.1.x-fix.diff @@ -0,0 +1,20 @@ +will fix some compile Problems on gcc-4.1 + +Joerg Bornkessel <hd_brummy@gentoo.org> 29 Sep 2006 + +diff -Naur GUIlib-1.1.0.orig/GUI_menu.h GUIlib-1.1.0/GUI_menu.h +--- GUIlib-1.1.0.orig/GUI_menu.h 2006-09-29 19:38:54.767324511 +0200 ++++ GUIlib-1.1.0/GUI_menu.h 2006-09-29 19:40:13.464242760 +0200 +@@ -39,9 +39,9 @@ + virtual void AddSubitem(GUI_Menuitem *newitem); + virtual GUI_Menuitem* GetSubItem(int Aid); + +- GUI_status GUI_Submenu:: MouseDown(int x, int y, int button); +- GUI_status GUI_Submenu::MouseUp(int x,int y,int button); +- GUI_status GUI_Submenu::MouseMotion(int x,int y,Uint8 state); ++ GUI_status MouseDown(int x, int y, int button); ++ GUI_status MouseUp(int x,int y,int button); ++ GUI_status MouseMotion(int x,int y,Uint8 state); + + inline virtual int GetSubmenuId() + {return submenuid;} |