Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/xulrunner: ChangeLog xulrunner-1.9.2.12.ebuild xulrunner-1.9.2.18.ebuild xulrunner-2.0.1-r1.ebuild xulrunner-1.9.2.17.ebuild
Date: Tue, 26 Jul 2011 17:02:39
Message-Id: 20110726170229.BCF622004B@flycatcher.gentoo.org
1 polynomial-c 11/07/26 17:02:29
2
3 Modified: ChangeLog xulrunner-1.9.2.12.ebuild
4 xulrunner-1.9.2.18.ebuild xulrunner-2.0.1-r1.ebuild
5 xulrunner-1.9.2.17.ebuild
6 Log:
7 Fixed compilation with >=curl-7.21.7 (bug #375899)
8
9 (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.426 net-libs/xulrunner/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.426&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/ChangeLog?rev=1.426&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/ChangeLog?r1=1.425&r2=1.426
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v
21 retrieving revision 1.425
22 retrieving revision 1.426
23 diff -u -r1.425 -r1.426
24 --- ChangeLog 6 Jul 2011 05:14:14 -0000 1.425
25 +++ ChangeLog 26 Jul 2011 17:02:29 -0000 1.426
26 @@ -1,6 +1,11 @@
27 # ChangeLog for net-libs/xulrunner
28 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.425 2011/07/06 05:14:14 nirbheek Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.426 2011/07/26 17:02:29 polynomial-c Exp $
31 +
32 + 26 Jul 2011; Lars Wendler <polynomial-c@g.o>
33 + xulrunner-1.9.2.12.ebuild, xulrunner-1.9.2.17.ebuild,
34 + xulrunner-1.9.2.18.ebuild, xulrunner-2.0.1-r1.ebuild:
35 + Fixed compilation with >=curl-7.21.7 (bug #375899).
36
37 06 Jul 2011; Nirbheek Chauhan <nirbheek@g.o>
38 xulrunner-1.9.2.12.ebuild:
39
40
41
42 1.12 net-libs/xulrunner/xulrunner-1.9.2.12.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild?rev=1.12&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild?rev=1.12&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild?r1=1.11&r2=1.12
47
48 Index: xulrunner-1.9.2.12.ebuild
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild,v
51 retrieving revision 1.11
52 retrieving revision 1.12
53 diff -u -r1.11 -r1.12
54 --- xulrunner-1.9.2.12.ebuild 6 Jul 2011 05:14:14 -0000 1.11
55 +++ xulrunner-1.9.2.12.ebuild 26 Jul 2011 17:02:29 -0000 1.12
56 @@ -1,6 +1,6 @@
57 # Copyright 1999-2011 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild,v 1.11 2011/07/06 05:14:14 nirbheek Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.12.ebuild,v 1.12 2011/07/26 17:02:29 polynomial-c Exp $
61
62 EAPI="3"
63 WANT_AUTOCONF="2.1"
64 @@ -82,6 +82,16 @@
65 sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
66 xulrunner/stub/Makefile.in || die
67
68 + #Fix compilation with curl-7.21.7 bug 376027
69 + sed -e '/#include <curl\/types\.h>/d' \
70 + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
71 + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
72 + || die
73 + sed -e '/curl\/types\.h/d' \
74 + -i "${S}"/config/system-headers \
75 + -i "${S}"/js/src/config/system-headers \
76 + || die
77 +
78 # Allow user to apply additional patches without modifing ebuild
79 epatch_user
80
81
82
83
84 1.2 net-libs/xulrunner/xulrunner-1.9.2.18.ebuild
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild?rev=1.2&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild?rev=1.2&content-type=text/plain
88 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild?r1=1.1&r2=1.2
89
90 Index: xulrunner-1.9.2.18.ebuild
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild,v
93 retrieving revision 1.1
94 retrieving revision 1.2
95 diff -u -r1.1 -r1.2
96 --- xulrunner-1.9.2.18.ebuild 23 Jun 2011 11:07:25 -0000 1.1
97 +++ xulrunner-1.9.2.18.ebuild 26 Jul 2011 17:02:29 -0000 1.2
98 @@ -1,6 +1,6 @@
99 # Copyright 1999-2011 Gentoo Foundation
100 # Distributed under the terms of the GNU General Public License v2
101 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild,v 1.1 2011/06/23 11:07:25 polynomial-c Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.18.ebuild,v 1.2 2011/07/26 17:02:29 polynomial-c Exp $
103
104 EAPI="3"
105 WANT_AUTOCONF="2.1"
106 @@ -80,6 +80,16 @@
107 sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
108 xulrunner/stub/Makefile.in || die
109
110 + #Fix compilation with curl-7.21.7 bug 376027
111 + sed -e '/#include <curl\/types\.h>/d' \
112 + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
113 + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
114 + || die
115 + sed -e '/curl\/types\.h/d' \
116 + -i "${S}"/config/system-headers \
117 + -i "${S}"/js/src/config/system-headers \
118 + || die
119 +
120 # Allow user to apply additional patches without modifing ebuild
121 epatch_user
122
123
124
125
126 1.6 net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild
127
128 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild?rev=1.6&view=markup
129 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild?rev=1.6&content-type=text/plain
130 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild?r1=1.5&r2=1.6
131
132 Index: xulrunner-2.0.1-r1.ebuild
133 ===================================================================
134 RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v
135 retrieving revision 1.5
136 retrieving revision 1.6
137 diff -u -r1.5 -r1.6
138 --- xulrunner-2.0.1-r1.ebuild 21 Jun 2011 12:30:43 -0000 1.5
139 +++ xulrunner-2.0.1-r1.ebuild 26 Jul 2011 17:02:29 -0000 1.6
140 @@ -1,6 +1,6 @@
141 # Copyright 1999-2011 Gentoo Foundation
142 # Distributed under the terms of the GNU General Public License v2
143 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.5 2011/06/21 12:30:43 nirbheek Exp $
144 +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-2.0.1-r1.ebuild,v 1.6 2011/07/26 17:02:29 polynomial-c Exp $
145
146 EAPI="3"
147 WANT_AUTOCONF="2.1"
148 @@ -86,6 +86,16 @@
149 sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
150 xulrunner/stub/Makefile.in || die
151
152 + #Fix compilation with curl-7.21.7 bug 376027
153 + sed -e '/#include <curl\/types\.h>/d' \
154 + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
155 + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
156 + || die
157 + sed -e '/curl\/types\.h/d' \
158 + -i "${S}"/config/system-headers \
159 + -i "${S}"/js/src/config/system-headers \
160 + || die
161 +
162 # Same as in config/autoconf.mk.in
163 MOZLIBDIR="/usr/$(get_libdir)/${PN}-${MAJ_XUL_PV}"
164 SDKDIR="/usr/$(get_libdir)/${PN}-devel-${MAJ_XUL_PV}/sdk"
165
166
167
168 1.8 net-libs/xulrunner/xulrunner-1.9.2.17.ebuild
169
170 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild?rev=1.8&view=markup
171 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild?rev=1.8&content-type=text/plain
172 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild?r1=1.7&r2=1.8
173
174 Index: xulrunner-1.9.2.17.ebuild
175 ===================================================================
176 RCS file: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild,v
177 retrieving revision 1.7
178 retrieving revision 1.8
179 diff -u -r1.7 -r1.8
180 --- xulrunner-1.9.2.17.ebuild 21 Jun 2011 12:30:43 -0000 1.7
181 +++ xulrunner-1.9.2.17.ebuild 26 Jul 2011 17:02:29 -0000 1.8
182 @@ -1,6 +1,6 @@
183 # Copyright 1999-2011 Gentoo Foundation
184 # Distributed under the terms of the GNU General Public License v2
185 -# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild,v 1.7 2011/06/21 12:30:43 nirbheek Exp $
186 +# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.17.ebuild,v 1.8 2011/07/26 17:02:29 polynomial-c Exp $
187
188 EAPI="3"
189 WANT_AUTOCONF="2.1"
190 @@ -80,6 +80,16 @@
191 sed -i -e '/^LIBS += $(JEMALLOC_LIBS)/s/^/#/' \
192 xulrunner/stub/Makefile.in || die
193
194 + #Fix compilation with curl-7.21.7 bug 376027
195 + sed -e '/#include <curl\/types\.h>/d' \
196 + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/libcurl_wrapper.cc \
197 + -i "${S}"/toolkit/crashreporter/google-breakpad/src/common/linux/http_upload.cc \
198 + || die
199 + sed -e '/curl\/types\.h/d' \
200 + -i "${S}"/config/system-headers \
201 + -i "${S}"/js/src/config/system-headers \
202 + || die
203 +
204 # Allow user to apply additional patches without modifing ebuild
205 epatch_user