From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JmAGm-0007cf-9p for garchives@archives.gentoo.org; Wed, 16 Apr 2008 16:14:00 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13377E08A7; Wed, 16 Apr 2008 16:13:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BFB86E08A7 for ; Wed, 16 Apr 2008 16:13:57 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 5910164BF4 for ; Wed, 16 Apr 2008 16:13:57 +0000 (UTC) Received: from bicatali by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JmAGi-0005L1-6e for gentoo-commits@lists.gentoo.org; Wed, 16 Apr 2008 16:13:56 +0000 From: "Sebastien Fabbro (bicatali)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, bicatali@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sci-astronomy/ds9/files: ds9-5.1-gcc4.2-x86.patch ds9-5.2-gcc43.patch ds9-5.2-Makefile.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: ds9-5.1-gcc4.2-x86.patch ds9-5.2-gcc43.patch ds9-5.2-Makefile.patch X-VCS-Directories: sci-astronomy/ds9/files X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro Content-Type: text/plain; charset=utf8 Message-Id: Sender: Sebastien Fabbro Date: Wed, 16 Apr 2008 16:13:56 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f3e76a81-793b-4af5-8226-69599114abc8 X-Archives-Hash: cf340ddf266424813d4cefabff8f474a bicatali 08/04/16 16:13:56 Modified: ds9-5.1-gcc4.2-x86.patch Added: ds9-5.2-gcc43.patch ds9-5.2-Makefile.patch Log: Version bump, with gcc-4.3 patch and adapted bug #189118 patch to avoid= emacs dependency (Portage version: 2.1.5_rc2) Revision Changes Path 1.2 sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/= files/ds9-5.1-gcc4.2-x86.patch?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/= files/ds9-5.1-gcc4.2-x86.patch?rev=3D1.2&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/= files/ds9-5.1-gcc4.2-x86.patch?r1=3D1.1&r2=3D1.2 Index: ds9-5.1-gcc4.2-x86.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-= x86.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ds9-5.1-gcc4.2-x86.patch 23 Jan 2008 14:29:16 -0000 1.1 +++ ds9-5.1-gcc4.2-x86.patch 16 Apr 2008 16:13:55 -0000 1.2 @@ -1,13 +1,11 @@ diff -Naur saods9/make.linux saods9.new/make.linux --- saods9/make.linux 2007-12-18 17:54:57.000000000 -0500 +++ saods9.new/make.linux 2008-01-23 08:58:46.000000000 -0500 -@@ -9,15 +9,15 @@ +@@ -9,15 +9,13 @@ =20 # note: bug with gcc 4.1 and 4.2 # can't use -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=3D64 -+CXX =3D g++ +CXXOPT =3D ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -+CC =3D gcc +CCOPT =3D ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H + #CXX =3D g++ 1.1 sci-astronomy/ds9/files/ds9-5.2-gcc43.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/= files/ds9-5.2-gcc43.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/= files/ds9-5.2-gcc43.patch?rev=3D1.1&content-type=3Dtext/plain Index: ds9-5.2-gcc43.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- iis/iistcl.C.orig 2008-04-16 13:53:34.315972056 +0000 +++ iis/iistcl.C 2008-04-16 13:54:57.634895375 +0000 @@ -4,7 +4,7 @@ =20 #include #include - +#include #include #include using namespace std; --- saotk/widget/ps.C.orig 2008-04-16 14:09:20.865993878 +0000 +++ saotk/widget/ps.C 2008-04-16 14:10:04.020453111 +0000 @@ -4,6 +4,7 @@ =20 #include "ps.h" #include "util.h" +#include =20 Filter::Filter() { --- saotk/frame/callback.C.orig 2008-04-16 14:23:03.661659706 +0000 +++ saotk/frame/callback.C 2008-04-16 14:36:52.264879112 +0000 @@ -2,8 +2,8 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copy= right" =20 -#include -#include +#include +#include =20 #include "callback.h" =20 --- saotk/frame/ciaoparser.C.orig 2008-04-16 15:12:42.535454290 +0000 +++ saotk/frame/ciaoparser.C 2008-04-16 15:13:18.023725663 +0000 @@ -128,9 +128,9 @@ =20 #define FITSPTR (fr->findFits(1)) =20 -#include -#include -#include +#include +#include +#include =20 #include "framebase.h" #include "fitsimage.h" --- saotk/frame/ds9parser.C.orig 2008-04-16 15:12:42.535454290 +0000 +++ saotk/frame/ds9parser.C 2008-04-16 15:13:40.601718953 +0000 @@ -333,9 +333,9 @@ #define FITSPTR (fr->findFits(globalTile)) #define DISCARD_(x) {yyclearin; mkDiscard(x);} =20 -#include -#include -#include +#include +#include +#include =20 #include "framebase.h" #include "fitsimage.h" --- saotk/frame/fitsdata.C.orig 2008-04-16 15:09:33.746979438 +0000 +++ saotk/frame/fitsdata.C 2008-04-16 15:11:28.432297279 +0000 @@ -2,11 +2,11 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copy= right" =20 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include =20 #include "fitsdata.h" #include "colorscale.h" --- saotk/frame/inversescale.C.orig 2008-04-16 15:12:42.539452518 +0000 +++ saotk/frame/inversescale.C 2008-04-16 15:13:56.113594982 +0000 @@ -2,8 +2,8 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copy= right" =20 -#include -#include +#include +#include =20 #include "inversescale.h" #include "framebase.h" --- saotk/frame/parser.C.orig 2008-04-16 15:12:42.539452518 +0000 +++ saotk/frame/parser.C 2008-04-16 15:14:20.254970721 +0000 @@ -708,9 +708,9 @@ =20 #define FITSPTR (fr->findFits(1)) =20 -#include -#include -#include +#include +#include +#include =20 #include "framebase.h" #include "frame.h" --- saotk/frame/prosparser.C.orig 2008-04-16 15:12:42.543450746 +0000 +++ saotk/frame/prosparser.C 2008-04-16 15:14:40.360116448 +0000 @@ -155,9 +155,9 @@ #define FITSPTR (fr->findFits(1)) #define DISCARD_(x) {yyclearin; prosDiscard(x);} =20 -#include -#include -#include +#include +#include +#include =20 #include "framebase.h" #include "fitsimage.h" --- saotk/frame/saoparser.C.orig 2008-04-16 15:12:42.547448974 +0000 +++ saotk/frame/saoparser.C 2008-04-16 15:14:56.133015294 +0000 @@ -121,9 +121,9 @@ #define FITSPTR (fr->findFits(1)) #define DISCARD_(x) {yyclearin; saoDiscard(x);} =20 -#include -#include -#include +#include +#include +#include =20 #include "framebase.h" #include "fitsimage.h" --- saotk/frame/tngparser.C.orig 2008-04-16 15:12:42.547448974 +0000 +++ saotk/frame/tngparser.C 2008-04-16 15:15:11.549893852 +0000 @@ -167,9 +167,9 @@ #define FITSPTR (fr->findFits(1)) #define DISCARD_(x) {yyclearin; tngDiscard(x);} =20 -#include -#include -#include +#include +#include +#include =20 #include "framebase.h" #include "fitsimage.h" --- saotk/frame/xyparser.C.orig 2008-04-16 15:12:42.551447202 +0000 +++ saotk/frame/xyparser.C 2008-04-16 15:15:28.970886617 +0000 @@ -200,9 +200,9 @@ =20 #define FITSPTR (fr->findFits(1)) =20 -#include -#include -#include +#include +#include +#include =20 #include "framebase.h" #include "fitsimage.h" --- saotk/colorbar/colorbarbase.C.orig 2008-04-16 15:41:10.236325709 +000= 0 +++ saotk/colorbar/colorbarbase.C 2008-04-16 15:33:33.482296780 +0000 @@ -11,6 +11,7 @@ #include =20 #include "parser.H" +#include =20 // Parser Stuff #undef yyFlexLexer --- saotk/colorbar/colorbar.C.orig 2008-04-16 15:27:48.890467306 +0000 +++ saotk/colorbar/colorbar.C 2008-04-16 15:28:09.291629902 +0000 @@ -2,8 +2,8 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copy= right" =20 -#include -#include +#include +#include =20 #include "colorbar.h" #include "util.h" --- saotk/util/conputs.C.orig 2008-04-16 15:41:48.354497940 +0000 +++ saotk/util/conputs.C 2008-04-16 15:42:01.775262745 +0000 @@ -1,3 +1,4 @@ +#include #include using namespace std; =20 --- ds9/ds9.C.orig 2008-04-16 15:45:04.281663192 +0000 +++ ds9/ds9.C 2008-04-16 15:45:17.622423439 +0000 @@ -1,3 +1,4 @@ +#include #include using namespace std; =20 1.1 sci-astronomy/ds9/files/ds9-5.2-Makefile.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/= files/ds9-5.2-Makefile.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/= files/ds9-5.2-Makefile.patch?rev=3D1.1&content-type=3Dtext/plain Index: ds9-5.2-Makefile.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Makefile.orig 2008-04-16 13:43:29.417500857 +0000 +++ Makefile 2008-04-16 14:03:38.346474803 +0000 @@ -237,23 +237,23 @@ tcl : FORCE @echo "Installing Tcl..." cd $(TCLDIRDIR); CC=3D'$(CC)' CFLAGS=3D'$(OPTS) $(TCLOPTS)' LDFLAGS=3D'= $(LIBS)' ./configure $(TCLFLAGS) --disable-shared - cd $(TCLDIRDIR); $(MAKE) install + cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries =20 tk : FORCE @echo "Installing Tk..." cd $(TKDIRDIR); CC=3D'$(CC)' CFLAGS=3D'$(OPTS) $(TCLOPTS)' LDFLAGS=3D'$= (LIBS)' ./configure $(TCLFLAGS) --disable-shared - cd $(TKDIRDIR); $(MAKE) install + cd $(TKDIRDIR); $(MAKE) install-binaries install-libraries $(RM) -r lib/$(TKVER)/demos =20 tktable : FORCE @echo "Installing TkTable..." cd $(TKTABLEDIR); CC=3D'$(CC)' CFLAGS=3D'$(OPTS)' LDFLAGS=3D'$(LIBS)' .= /configure $(TKTABLEFLAGS) --disable-shared - cd $(TKTABLEDIR); $(MAKE); $(MAKE) install + cd $(TKTABLEDIR); $(MAKE); $(MAKE) install-binaries install-libraries =20 tcllib : FORCE @echo "Installing TclLib..." cd $(TCLLIBDIR); ./configure $(TCLLIBFLAGS) - cd $(TCLLIBDIR); $(MAKE) install + cd $(TCLLIBDIR); $(MAKE) install-libraries =20 tkcon : FORCE @echo "Installing TkCon..." @@ -295,7 +295,7 @@ @echo "Installing XPA..." cd $(XPADIR); CC=3D'$(CC)' CFLAGS=3D'$(OPTS)' LDFLAGS=3D'$(OPTS) $(LIBS= )' ./configure $(XPAFLAGS) --disable-shared cd $(XPADIR); $(MAKE); $(MAKE) install - cd bin; $(STRIP) xpa* + =20 iis : FORCE @echo "Installing IIS..." --=20 gentoo-commits@lists.gentoo.org mailing list