Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Markus Dittrich (markusle)" <markusle@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/raster3d/files: raster3d-gcc-4.1-gentoo.patch digest-raster3d-2.7d raster3d-2.7d-gcc4-gentoo.patch
Date: Mon, 10 Sep 2007 13:03:00
Message-Id: E1IUio4-0007Um-7T@stork.gentoo.org
1 markusle 07/09/10 12:56:00
2
3 Modified: raster3d-gcc-4.1-gentoo.patch
4 Added: digest-raster3d-2.7d
5 raster3d-2.7d-gcc4-gentoo.patch
6 Log:
7 Fixed gcc patch to work with gcc-4.2 and bumped raster3d to new version (see bug #190511).
8 (Portage version: 2.1.3.7)
9
10 Revision Changes Path
11 1.2 sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch?r1=1.1&r2=1.2
16
17 Index: raster3d-gcc-4.1-gentoo.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/raster3d/files/raster3d-gcc-4.1-gentoo.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- raster3d-gcc-4.1-gentoo.patch 12 Apr 2006 14:02:23 -0000 1.1
24 +++ raster3d-gcc-4.1-gentoo.patch 10 Sep 2007 12:55:59 -0000 1.2
25 @@ -1,6 +1,6 @@
26 -diff -Naur Raster3D_2.7c/normal3d.f Raster3D_2.7c-patched/normal3d.f
27 ---- Raster3D_2.7c/normal3d.f 2003-10-20 17:50:11.000000000 -0500
28 -+++ Raster3D_2.7c-patched/normal3d.f 2006-04-11 01:04:15.000000000 -0500
29 +diff -Naur Raster3D_2.7c/normal3d.f Raster3D_2.7c.new/normal3d.f
30 +--- Raster3D_2.7c/normal3d.f 2003-10-20 18:50:11.000000000 -0400
31 ++++ Raster3D_2.7c.new/normal3d.f 2007-09-08 10:23:08.000000000 -0400
32 @@ -443,7 +443,8 @@
33 READ (INPUT,'(A)',ERR=101) TITLE
34 IF (TITLE(1:1).EQ.'#') GOTO 100
35 @@ -11,9 +11,22 @@
36 CALL EXIT(-1)
37 102 CONTINUE
38 ENDIF
39 -diff -Naur Raster3D_2.7c/rastep.f Raster3D_2.7c-patched/rastep.f
40 ---- Raster3D_2.7c/rastep.f 2004-02-12 11:01:31.000000000 -0600
41 -+++ Raster3D_2.7c-patched/rastep.f 2006-04-11 00:55:05.000000000 -0500
42 +diff -Naur Raster3D_2.7c/parse.f Raster3D_2.7c.new/parse.f
43 +--- Raster3D_2.7c/parse.f 2003-10-20 18:50:11.000000000 -0400
44 ++++ Raster3D_2.7c.new/parse.f 2007-09-08 10:23:48.000000000 -0400
45 +@@ -4,7 +4,8 @@
46 + COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG,
47 + & NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG
48 + REAL FONTSCALE, GAMMA, ZOOM
49 +- INTEGER NSCHEME, SHADOWFLAG, XBG
50 ++ INTEGER NSCHEME, SHADOWFLAG
51 ++ INTEGER*8 XBG
52 + INTEGER*2 NAX, NAY, OTMODE, QUALITY
53 + LOGICAL*2 INVERT, LFLAG
54 + c
55 +diff -Naur Raster3D_2.7c/rastep.f Raster3D_2.7c.new/rastep.f
56 +--- Raster3D_2.7c/rastep.f 2004-02-12 12:01:31.000000000 -0500
57 ++++ Raster3D_2.7c.new/rastep.f 2007-09-08 10:23:08.000000000 -0400
58 @@ -133,7 +133,7 @@
59 c
60 c Support for validation of similarity of bonded atoms
61 @@ -23,9 +36,9 @@
62 real anisov(6)
63 c
64 c Default to CPK colors and VDW radii
65 -diff -Naur Raster3D_2.7c/render.f Raster3D_2.7c-patched/render.f
66 ---- Raster3D_2.7c/render.f 2003-10-20 17:50:11.000000000 -0500
67 -+++ Raster3D_2.7c-patched/render.f 2006-04-11 00:56:26.000000000 -0500
68 +diff -Naur Raster3D_2.7c/render.f Raster3D_2.7c.new/render.f
69 +--- Raster3D_2.7c/render.f 2003-10-20 18:50:11.000000000 -0400
70 ++++ Raster3D_2.7c.new/render.f 2007-09-08 10:23:08.000000000 -0400
71 @@ -792,9 +792,9 @@
72 * Get background colour
73 READ (INPUT,*,ERR=104) BKGND
74 @@ -48,9 +61,9 @@
75 K = LIST(INEXT)
76 CLRITY = FRAC*DETAIL(K+1) + (1.-FRAC)*DETAIL(K+2)
77 ELSE IF (TYPE(INDTOP).EQ.TRIANG) THEN
78 -diff -Naur Raster3D_2.7c/rings3d.f Raster3D_2.7c-patched/rings3d.f
79 ---- Raster3D_2.7c/rings3d.f 2003-10-20 17:50:11.000000000 -0500
80 -+++ Raster3D_2.7c-patched/rings3d.f 2006-04-11 01:03:13.000000000 -0500
81 +diff -Naur Raster3D_2.7c/rings3d.f Raster3D_2.7c.new/rings3d.f
82 +--- Raster3D_2.7c/rings3d.f 2003-10-20 18:50:11.000000000 -0400
83 ++++ Raster3D_2.7c.new/rings3d.f 2007-09-08 10:23:08.000000000 -0400
84 @@ -16,7 +16,6 @@
85 integer input, output, noise
86 parameter (input=5, output=6, noise=0)
87
88
89
90 1.1 sci-chemistry/raster3d/files/digest-raster3d-2.7d
91
92 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/raster3d/files/digest-raster3d-2.7d?rev=1.1&view=markup
93 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/raster3d/files/digest-raster3d-2.7d?rev=1.1&content-type=text/plain
94
95 Index: digest-raster3d-2.7d
96 ===================================================================
97 MD5 30b284037b0138d328ab1b43328549e6 Raster3D_2.7d.tar.gz 1724473
98 RMD160 646db1421f3222d75ba4f1a0c2339d603629877e Raster3D_2.7d.tar.gz 1724473
99 SHA256 b784e0a96679791adc7db2b1767a1011ef742380ee4fc783ecae9971a251eca1 Raster3D_2.7d.tar.gz 1724473
100
101
102
103 1.1 sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch
104
105 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch?rev=1.1&view=markup
106 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/raster3d/files/raster3d-2.7d-gcc4-gentoo.patch?rev=1.1&content-type=text/plain
107
108 Index: raster3d-2.7d-gcc4-gentoo.patch
109 ===================================================================
110 diff -Naur Raster3D_2.7d/normal3d.f Raster3D_2.7d.new/normal3d.f
111 --- Raster3D_2.7d/normal3d.f 2003-10-20 18:50:11.000000000 -0400
112 +++ Raster3D_2.7d.new/normal3d.f 2007-09-08 10:12:49.000000000 -0400
113 @@ -443,7 +443,8 @@
114 READ (INPUT,'(A)',ERR=101) TITLE
115 IF (TITLE(1:1).EQ.'#') GOTO 100
116 GOTO 102
117 - 101 WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ',TITLE(2:132)
118 + 101 WRITE (NOISE,'(A,A)') ' >> Cannot open or read file ',
119 + *TITLE(2:132)
120 CALL EXIT(-1)
121 102 CONTINUE
122 ENDIF
123 diff -Naur Raster3D_2.7d/parse.f Raster3D_2.7d.new/parse.f
124 --- Raster3D_2.7d/parse.f 2006-04-11 14:33:48.000000000 -0400
125 +++ Raster3D_2.7d.new/parse.f 2007-09-08 10:25:24.000000000 -0400
126 @@ -4,7 +4,8 @@
127 COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG,
128 & NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG
129 REAL FONTSCALE, GAMMA, ZOOM
130 - INTEGER NSCHEME, SHADOWFLAG, XBG
131 + INTEGER NSCHEME, SHADOWFLAG
132 + INTEGER*8 XBG
133 INTEGER*2 NAX, NAY, OTMODE, QUALITY
134 LOGICAL*2 INVERT, LFLAG
135 c
136 diff -Naur Raster3D_2.7d/render.f Raster3D_2.7d.new/render.f
137 --- Raster3D_2.7d/render.f 2006-04-11 17:13:04.000000000 -0400
138 +++ Raster3D_2.7d.new/render.f 2007-09-08 10:15:17.000000000 -0400
139 @@ -3685,7 +3685,7 @@
140 FRAC = DETAIL(K+8)
141 INEXT = INDTOP + 1
142 IF (TYPE(INEXT).EQ.VERTEXRGB) INEXT = INEXT + 1
143 - CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp')
144 + CALL ASSERT(TYPE(INEXT).EQ.VERTRANSP,'lost vertex transp')
145 K = LIST(INEXT)
146 CLRITY = FRAC*DETAIL(K+1) + (1.-FRAC)*DETAIL(K+2)
147 ELSE IF (TYPE(INDTOP).EQ.TRIANG) THEN
148
149
150
151 --
152 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups