diff options
| author |   George Shapovalov <george@gentoo.org> | 2002-10-15 03:45:07 +0000 |
|---|---|---|
| committer | George Shapovalov <george@gentoo.org> | 2002-10-15 03:45:07 +0000 |
| commit | c2b30bcd4e83a0d05d9298a3c845a0c8d7d87eea (patch) | |
| tree | 01e4fd5eb87936b5e96045de971e56d499c5c032 /app-sci | |
| parent | new version (diff) | |
| download | gentoo-2-c2b30bcd4e83a0d05d9298a3c845a0c8d7d87eea.tar.gz gentoo-2-c2b30bcd4e83a0d05d9298a3c845a0c8d7d87eea.tar.bz2 gentoo-2-c2b30bcd4e83a0d05d9298a3c845a0c8d7d87eea.zip | |
gcc-3.2 related fix
Diffstat (limited to 'app-sci')
| -rw-r--r-- | app-sci/xcircuit/ChangeLog | 7 | ||||
| -rw-r--r-- | app-sci/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch | 10 | ||||
| -rw-r--r-- | app-sci/xcircuit/files/xcircuit-2.5.4-sigsegv.patch | 11 | ||||
| -rw-r--r-- | app-sci/xcircuit/xcircuit-2.5.4.ebuild | 18 |
4 files changed, 43 insertions, 3 deletions
diff --git a/app-sci/xcircuit/ChangeLog b/app-sci/xcircuit/ChangeLog index e7fd416a270a..fb4a83b104b8 100644 --- a/app-sci/xcircuit/ChangeLog +++ b/app-sci/xcircuit/ChangeLog @@ -1,9 +1,14 @@ # ChangeLog for <CATEGORY>/<PACKAGE_NAME> # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/ChangeLog,v 1.3 2002/08/16 19:25:30 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/ChangeLog,v 1.4 2002/10/15 03:45:07 george Exp $ *xcircuit-2.5.4 (5 Apr 2003) + 14 Oct 2002; George Shapovalov <george@gentoo.org> xcircuit-2.5.4.ebuild, files/xcircuit-2.5.4-*.patch : + + Thanks to Jonathan Nall <nall@themountaingoats.net> for tracing few gcc related problems. + One patch is conditional on gcc-3.2 presence. See #8957 and #8960 for details. + 16 Aug 2002; George Shapovalov <george@gentoo.org> xcircuit-2.5.4.ebuild : due to report by Marius Bernklev <mariube@sex.ifi.uio.no> added code diff --git a/app-sci/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch b/app-sci/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch new file mode 100644 index 000000000000..001c50692ed7 --- /dev/null +++ b/app-sci/xcircuit/files/xcircuit-2.5.4-XQueryColor.patch @@ -0,0 +1,10 @@ +--- xcircuit.c.orig 2002-03-20 14:00:50.000000000 -0800 ++++ xcircuit.c 2002-10-11 12:24:24.000000000 -0700 +@@ -1845,6 +1845,7 @@ + XQueryColor(dpy, cmap, &loccolor); + + locidx = rgb_alloccolor(loccolor.red, loccolor.green, loccolor.blue); ++ return locidx; + } + + /*-------------------------------------------------------------------------*/ diff --git a/app-sci/xcircuit/files/xcircuit-2.5.4-sigsegv.patch b/app-sci/xcircuit/files/xcircuit-2.5.4-sigsegv.patch new file mode 100644 index 000000000000..171931300bf4 --- /dev/null +++ b/app-sci/xcircuit/files/xcircuit-2.5.4-sigsegv.patch @@ -0,0 +1,11 @@ +--- files.c.orig 2002-03-26 13:12:18.000000000 -0800 ++++ files.c 2002-10-11 12:23:38.000000000 -0700 +@@ -1970,6 +1970,8 @@ + int curcolor = ccolor; + int i, j, k; + objinstptr *newinst; ++ objinstptr tmpobjinstptr; ++ newinst = &tmpobjinstptr; + + /* path-handling variables */ + pathptr *newpath; diff --git a/app-sci/xcircuit/xcircuit-2.5.4.ebuild b/app-sci/xcircuit/xcircuit-2.5.4.ebuild index 7858da87487f..e24ad322cefd 100644 --- a/app-sci/xcircuit/xcircuit-2.5.4.ebuild +++ b/app-sci/xcircuit/xcircuit-2.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-2.5.4.ebuild,v 1.5 2002/10/04 05:01:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/xcircuit/xcircuit-2.5.4.ebuild,v 1.6 2002/10/15 03:45:07 george Exp $ inherit flag-o-matic @@ -10,7 +10,7 @@ DESCRIPTION="Circuit drawing and schematic capture program." SRC_URI="http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/${P}.tar.bz2" HOMEPAGE="http://bach.ece.jhu.edu/~tim/programs/xcircuit/xcircuit.html" -KEYWORDS="x86" +KEYWORDS="~x86" SLOT="0" LICENSE="GPL-2" @@ -22,6 +22,20 @@ RDEPEND="${DEPEND}" #looks like -O3 causes problems at times replace-flags -O3 -O2 +src_unpack() { + + unpack ${A} + cd ${S} + patch xcircuit.c < ${FILESDIR}/${PN}-${PV}-XQueryColor.patch || die "patch failed" + + #only apply this patch if under gcc-3.2 + if [ "`gcc -dumpversion | cut -d. -f1,2`" == "3.2" ]; then + patch files.c <${FILESDIR}/${PN}-${PV}-sigsegv.patch || die "patch failed" + fi + +} + + src_compile() { ./configure \ |