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

Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/darcs/files: darcs-2.5.2-ghc-7.4.patch darcs-2.5.2-relax-http-libs-deps.patch
Date: Sun, 04 Mar 2012 07:20:39
Message-Id: 20120304072026.1AFF420032@flycatcher.gentoo.org
1 gienah 12/03/04 07:20:26
2
3 Added: darcs-2.5.2-ghc-7.4.patch
4 darcs-2.5.2-relax-http-libs-deps.patch
5 Log:
6 Patch darcs 2.5.2 for ghc 7.4.1, patches sent upstream and applied to darcs repo.
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch?rev=1.1&content-type=text/plain
15
16 Index: darcs-2.5.2-ghc-7.4.patch
17 ===================================================================
18 --- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:44:08.644140399 +1100
19 +++ darcs-2.5.2/darcs.cabal 2011-12-24 10:03:14.325396692 +1100
20 @@ -124,7 +124,7 @@
21 else
22 buildable: True
23
24 - build-tools: ghc >= 6.10 && < 7.4
25 + build-tools: ghc >= 6.10 && < 7.6
26
27 hs-source-dirs: src
28 include-dirs: src
29 @@ -174,17 +174,17 @@
30 mtl >= 1.0 && < 2.1,
31 parsec >= 2.0 && < 3.2,
32 html == 1.0.*,
33 - filepath >= 1.1.0.0 && < 1.3.0.0,
34 + filepath >= 1.1.0.0 && < 1.5.0.0,
35 haskeline >= 0.6.2.2 && < 0.7,
36 hashed-storage >= 0.5.2 && < 0.6,
37 base >= 3,
38 bytestring >= 0.9.0 && < 0.10,
39 text == 0.11.*,
40 - old-time == 1.0.*,
41 + old-time >= 1.0 && < 1.2,
42 directory >= 1.0.0.0 && < 1.2.0.0,
43 process >= 1.0 && < 1.2,
44 containers >= 0.1 && < 0.5,
45 - array >= 0.1 && < 0.4,
46 + array >= 0.1 && < 0.5,
47 random == 1.0.*,
48 tar == 0.3.*,
49 zlib >= 0.5.1.0 && < 0.6.0.0,
50 @@ -208,7 +208,7 @@
51 else
52 buildable: True
53
54 - build-tools: ghc >= 6.10 && < 7.4
55 + build-tools: ghc >= 6.10 && < 7.6
56
57 hs-source-dirs: src
58 include-dirs: src
59 @@ -379,7 +379,7 @@
60 mtl >= 1.0 && < 2.1,
61 parsec >= 2.0 && < 3.2,
62 html == 1.0.*,
63 - filepath >= 1.1.0.0 && < 1.3.0.0,
64 + filepath >= 1.1.0.0 && < 1.5.0.0,
65 haskeline >= 0.6.2.2 && < 0.7,
66 hashed-storage >= 0.5.2 && < 0.6,
67 tar == 0.3.*
68 @@ -390,11 +390,11 @@
69 build-depends: base >= 3,
70 bytestring >= 0.9.0 && < 0.10,
71 text == 0.11.*,
72 - old-time == 1.0.*,
73 + old-time >= 1.0 && < 1.2,
74 directory >= 1.0.0.0 && < 1.2.0.0,
75 process >= 1.0 && < 1.2,
76 containers >= 0.1 && < 0.5,
77 - array >= 0.1 && < 0.4,
78 + array >= 0.1 && < 0.5,
79 random == 1.0.*
80
81
82 @@ -483,7 +483,7 @@
83 src/umask.c
84 src/Crypt/sha2.c
85
86 - build-tools: ghc >= 6.10 && < 7.4
87 + build-tools: ghc >= 6.10 && < 7.6
88
89 -- We need optimizations, regardless of what Hackage says
90 -- Note: "if true" works around a cabal bug with order of flag composition
91 @@ -527,7 +527,7 @@
92 mtl >= 1.0 && < 2.1,
93 parsec >= 2.0 && < 3.2,
94 html == 1.0.*,
95 - filepath >= 1.1.0.0 && < 1.3.0.0,
96 + filepath >= 1.1.0.0 && < 1.5.0.0,
97 haskeline >= 0.6.2.2 && < 0.7,
98 hashed-storage >= 0.5.2 && < 0.6,
99 tar == 0.3.*
100 @@ -538,11 +538,11 @@
101 build-depends: base >= 3,
102 bytestring >= 0.9.0 && < 0.10,
103 text == 0.11.*,
104 - old-time == 1.0.*,
105 + old-time >= 1.0 && < 1.2,
106 directory >= 1.0.0.0 && < 1.2.0.0,
107 process >= 1.0 && < 1.2,
108 containers >= 0.1 && < 0.5,
109 - array >= 0.1 && < 0.4,
110 + array >= 0.1 && < 0.5,
111 random == 1.0.*
112
113 if flag(curl)
114 @@ -615,7 +615,7 @@
115 else
116 buildable: True
117
118 - build-tools: ghc >= 6.10 && < 7.4
119 + build-tools: ghc >= 6.10 && < 7.6
120
121 build-depends: base < 5,
122 extensible-exceptions >= 0.1 && < 0.2,
123 @@ -623,7 +623,7 @@
124 mtl >= 1.0 && < 2.1,
125 parsec >= 2.0 && < 3.2,
126 html == 1.0.*,
127 - filepath >= 1.1.0.0 && < 1.3.0.0,
128 + filepath >= 1.1.0.0 && < 1.5.0.0,
129 QuickCheck >= 2.1.0.0,
130 HUnit >= 1.0,
131 test-framework >= 0.2.2,
132 @@ -684,11 +684,11 @@
133 bytestring >= 0.9.0 && < 0.10,
134 haskeline >= 0.6.2.2 && < 0.7,
135 text == 0.11.*,
136 - old-time == 1.0.*,
137 + old-time >= 1.0 && < 1.2,
138 directory >= 1.0.0.0 && < 1.2.0.0,
139 process >= 1.0 && < 1.2,
140 containers >= 0.1 && < 0.5,
141 - array >= 0.1 && < 0.4,
142 + array >= 0.1 && < 0.5,
143 hashed-storage >= 0.5.2 && < 0.6,
144 random == 1.0.*
145
146 --- darcs-2.5.2-orig/src/Darcs/Utils.hs 2011-03-14 09:40:46.000000000 +1100
147 +++ darcs-2.5.2/src/Darcs/Utils.hs 2011-12-24 10:07:16.125342597 +1100
148 @@ -62,7 +62,7 @@
149 , TreeMonad, tree )
150 import Storage.Hashed.Tree( Tree, listImmediate, findTree )
151
152 -showHexLen :: (Integral a) => Int -> a -> String
153 +showHexLen :: (Integral a, Show a) => Int -> a -> String
154 showHexLen n x = let s = showHex x ""
155 in replicate (n - length s) ' ' ++ s
156
157
158
159
160 1.1 dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch
161
162 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch?rev=1.1&view=markup
163 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch?rev=1.1&content-type=text/plain
164
165 Index: darcs-2.5.2-relax-http-libs-deps.patch
166 ===================================================================
167 --- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:43:28.551322710 +1100
168 +++ darcs-2.5.2/darcs.cabal 2011-12-19 20:44:08.644140399 +1100
169 @@ -195,7 +195,7 @@
170 build-depends: unix >= 1.0 && < 2.6
171 if flag(http)
172 build-depends: network >= 2.2 && < 2.4,
173 - HTTP >= 3000.0 && < 4000.2
174 + HTTP >= 3000.0 && < 4000.3
175
176
177 -- ----------------------------------------------------------------------
178 @@ -420,7 +420,7 @@
179
180 if flag(http)
181 build-depends: network >= 2.2 && < 2.4,
182 - HTTP >= 3000.0 && < 4000.2
183 + HTTP >= 3000.0 && < 4000.3
184 cpp-options: -DHAVE_HTTP
185 x-have-http:
186
187 @@ -554,7 +554,7 @@
188
189 if flag(http)
190 build-depends: network >= 2.2 && < 2.4,
191 - HTTP >= 3000.0 && < 4000.2
192 + HTTP >= 3000.0 && < 4000.3
193 cpp-options: -DHAVE_HTTP
194 x-have-http:
195
196 @@ -705,7 +705,7 @@
197
198 if flag(http)
199 build-depends: network >= 2.2 && < 2.4,
200 - HTTP >= 3000.0 && < 4000.2
201 + HTTP >= 3000.0 && < 4000.3
202
203 if flag(color)
204 x-use-color:
Report Message
Find on MARC Find on Google Groups