From 4c7d231fd54bb99095c8f5114103d3226e29e681 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Sun, 9 Aug 2009 19:13:25 +0000 Subject: Fix building with GLIBC 2.10+ wrt #273367. Package-Manager: portage-2.2_rc36/cvs/Linux x86_64 --- games-util/agistudio/ChangeLog | 8 +++- games-util/agistudio/Manifest | 5 ++- games-util/agistudio/agistudio-1.2.2.ebuild | 7 ++-- .../files/agistudio-1.2.2-glibc-2.10.patch | 48 ++++++++++++++++++++++ 4 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 games-util/agistudio/files/agistudio-1.2.2-glibc-2.10.patch (limited to 'games-util') 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 + 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 agistudio-1.2.2.ebuild: QA: Get rid of deprecated qt_min_version(). diff --git a/games-util/agistudio/Manifest b/games-util/agistudio/Manifest index d3f8909ee3ff..cd43811a9993 100644 --- a/games-util/agistudio/Manifest +++ b/games-util/agistudio/Manifest @@ -1,5 +1,6 @@ AUX agistudio-1.2.2-gcc43.patch 876 RMD160 d1059e0cff1a89ca93398fdf828e55b3cc62358e SHA1 eb7eb6dd14262231c81b09d2eeda2d4a4ff10a3c SHA256 a92972578cff5088eabab0e37dfc01067b56fc2cb9458a79f4b0f341ef3a549d +AUX agistudio-1.2.2-glibc-2.10.patch 1994 RMD160 1c7b9d2ba75bb2734f5c6d7d0bcb57273f985b53 SHA1 331f38e74f47c7d64320764af10a3482bf325d4e SHA256 0a1175d18f4068dd240ba701c407e37748efdf05df015b8a21479ef138c357bf DIST agistudio-1.2.2.tar.gz 364846 RMD160 43575cecb66716fe681ed5e5ccdca54641840c21 SHA1 cab01d9ea60814254c93000377b034e7027f768a SHA256 2c14c82fc3e4355acb22c04d3cf44671699010f8679b8c0e4cd9515ddd11bea8 -EBUILD agistudio-1.2.2.ebuild 1041 RMD160 123827922fc97f1d2598a2f3b479df3771d603fb SHA1 9a4a5f6c6806c7624c5c987074ad7d9958eb382b SHA256 6f3f8d349326d6395d21df33f675dd9e0365bcef1b14d4e55f7dc987f1adaae1 -MISC ChangeLog 1395 RMD160 087f555b50a6fa04c504eec2796c961c9e4b77c5 SHA1 d891b88016a68a578d1d9d9ffaa5a870c4e37f35 SHA256 1387bd54fed72555a48c0034d2c23abb94eb350037be5dbbeeeb95c35f25e60c +EBUILD agistudio-1.2.2.ebuild 1085 RMD160 e23e0f2fb2889169dcd0387660ce66fa84134e79 SHA1 c93de8c3d4cf81c6f28b556683d311320ce1fb0e SHA256 c758dc660013ccbb157ebf016a21679ff63bd7cb7614e0f1adb4bcbc6cff0da7 +MISC ChangeLog 1566 RMD160 e75d7a04ba8f941e52019bf668bfae599d8ef901 SHA1 5e4a47b31d1a88981ef92b4d4be8ec6337348e0b SHA256 bbd36d1f8e1bf4bc4371380ff3f5d9f07f14aaf5ba47d2e2a22d90c771200cb5 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 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 (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 (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 (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 (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 (strrchr(filename,'/'))))ptr++; + else ptr=(char *)filename; + sprintf(tmp,"File %s",ptr); + setCaption(tmp); -- cgit v1.2.3-65-gdbad