diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 19:13:25 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-08-09 19:13:25 +0000 |
| commit | fad45bdff5f73c52a3b05304ec93dcc40ad2cf81 (patch) | |
| tree | a20feae05914644976e88b3fb4c9fa194d431dc4 /games-util | |
| parent | Masking app-text/omegat for QA removal. (diff) | |
| download | gentoo-2-fad45bdff5f73c52a3b05304ec93dcc40ad2cf81.tar.gz gentoo-2-fad45bdff5f73c52a3b05304ec93dcc40ad2cf81.tar.bz2 gentoo-2-fad45bdff5f73c52a3b05304ec93dcc40ad2cf81.zip | |
Fix building with GLIBC 2.10+ wrt #273367.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'games-util')
| -rw-r--r-- | games-util/agistudio/ChangeLog | 8 | ||||
| -rw-r--r-- | games-util/agistudio/agistudio-1.2.2.ebuild | 7 | ||||
| -rw-r--r-- | games-util/agistudio/files/agistudio-1.2.2-glibc-2.10.patch | 48 |
3 files changed, 58 insertions, 5 deletions
diff --git a/games-util/agistudio/ChangeLog b/games-util/agistudio/ChangeLog index 541031b433b2..df7c10069db9 100644 --- a/games-util/agistudio/ChangeLog +++ b/games-util/agistudio/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-util/agistudio -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/agistudio/ChangeLog,v 1.10 2008/07/27 21:41:55 carlo Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-util/agistudio/ChangeLog,v 1.11 2009/08/09 19:13:24 ssuominen Exp $ + + 09 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> + agistudio-1.2.2.ebuild, +files/agistudio-1.2.2-glibc-2.10.patch: + Fix building with GLIBC 2.10+ wrt #273367. 27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> agistudio-1.2.2.ebuild: QA: Get rid of deprecated qt_min_version(). diff --git a/games-util/agistudio/agistudio-1.2.2.ebuild b/games-util/agistudio/agistudio-1.2.2.ebuild index 39b32b92e386..c1918791a3e6 100644 --- a/games-util/agistudio/agistudio-1.2.2.ebuild +++ b/games-util/agistudio/agistudio-1.2.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-util/agistudio/agistudio-1.2.2.ebuild,v 1.6 2008/07/27 21:41:55 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-util/agistudio/agistudio-1.2.2.ebuild,v 1.7 2009/08/09 19:13:24 ssuominen Exp $ EAPI=1 @@ -22,7 +22,8 @@ S=${WORKDIR}/${P}/src src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${P}-gcc43.patch + epatch "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-glibc-2.10.patch sed -i \ -e "s#^QTDIR.*#QTDIR = ${QTDIR}#" \ -e "s#^INCPATH.*#INCPATH = -I\$(QTDIR)/include#" \ diff --git a/games-util/agistudio/files/agistudio-1.2.2-glibc-2.10.patch b/games-util/agistudio/files/agistudio-1.2.2-glibc-2.10.patch new file mode 100644 index 000000000000..b8563fd9b640 --- /dev/null +++ b/games-util/agistudio/files/agistudio-1.2.2-glibc-2.10.patch @@ -0,0 +1,48 @@ +diff -ur agistudio-1.2.2.orig/src/logedit.cpp agistudio-1.2.2/src/logedit.cpp +--- agistudio-1.2.2.orig/src/logedit.cpp 2003-05-17 14:47:13.000000000 +0300 ++++ agistudio-1.2.2/src/logedit.cpp 2009-08-09 22:14:15.000000000 +0300 +@@ -431,7 +431,7 @@ + editor->setText( filecont ); + fclose(fptr); + logic->OutputText=editor->text().latin1(); +- if((ptr=strrchr(filename.c_str(),'/')))ptr++; ++ if((ptr=const_cast<char*> (strrchr(filename.c_str(),'/'))))ptr++; + else ptr=(char *)filename.c_str(); + if(LogicNum!=-1) + sprintf(tmp,"logic.%d (file %s)",LogicNum,ptr); +@@ -526,7 +526,7 @@ + else if(filename != ""){ + save((char *)filename.c_str()); + char *ptr; +- if((ptr=strrchr(filename.c_str(),'/')))ptr++; ++ if((ptr=const_cast<char*> (strrchr(filename.c_str(),'/'))))ptr++; + else ptr=(char *)filename.c_str(); + sprintf(tmp,"File %s",ptr); + setCaption(tmp); +@@ -644,7 +644,7 @@ + if(winlist[i].type==TEXT){ + filename = winlist[i].w.t->filename; + char *ptr2; +- if((ptr2=strrchr(filename.c_str(),'/')))ptr2++; ++ if((ptr2=const_cast<char*> (strrchr(filename.c_str(),'/'))))ptr2++; + else ptr2=(char *)filename.c_str(); + if(!strcmp(ptr2,name)){ + int num=atoi(ptr+5); +@@ -665,7 +665,7 @@ + winlist[i].w.t = new TextEdit(NULL,NULL,i); + winlist[i].type=TEXT; + winlist[i].w.t->open(fullname); +- ptr=strstr(tmp1.c_str(),"Line "); ++ ptr=const_cast<char*> (strstr(tmp1.c_str(),"Line ")); + int num=atoi(ptr+5); + winlist[i].w.t->editor->setCursorPosition(num,0,false); + ptr1=strchr(ptr,'\n'); +@@ -1202,7 +1202,7 @@ + fclose(fptr); + changed=false; + char *ptr; +- if((ptr=strrchr(filename,'/')))ptr++; ++ if((ptr=const_cast<char*> (strrchr(filename,'/'))))ptr++; + else ptr=(char *)filename; + sprintf(tmp,"File %s",ptr); + setCaption(tmp); |