1 |
commit: 504c843b24adf2a08f56582539efefacc2378c11 |
2 |
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 5 14:14:18 2017 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 5 14:14:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=504c843b |
7 |
|
8 |
dev-libs/nspr: sync with main tree |
9 |
|
10 |
dev-libs/nspr/Manifest | 2 +- |
11 |
dev-libs/nspr/files/nspr-4.10.6-solaris.patch | 4 +- |
12 |
dev-libs/nspr/files/nspr-4.6.1-lang.patch | 41 -------------- |
13 |
dev-libs/nspr/files/nspr-4.7.0-prtime.patch | 4 +- |
14 |
dev-libs/nspr/files/nspr-4.7.1-solaris.patch | 4 +- |
15 |
dev-libs/nspr/files/nspr-4.7.4-solaris.patch | 62 ---------------------- |
16 |
.../files/nspr-4.8.4-darwin-install_name.patch | 8 +-- |
17 |
dev-libs/nspr/files/nspr-4.8.9-link-flags.patch | 8 +-- |
18 |
dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch | 5 +- |
19 |
dev-libs/nspr/metadata.xml | 8 +++ |
20 |
.../nspr/{nspr-4.12.ebuild => nspr-4.14.ebuild} | 25 +++++---- |
21 |
11 files changed, 39 insertions(+), 132 deletions(-) |
22 |
|
23 |
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest |
24 |
index 505d199..bf5aca1 100644 |
25 |
--- a/dev-libs/nspr/Manifest |
26 |
+++ b/dev-libs/nspr/Manifest |
27 |
@@ -1 +1 @@ |
28 |
-DIST nspr-4.12.tar.gz 1135458 SHA256 e0b10a1e569153668ff8bdea6c7e491b389fab69c2f18285a1ebf7c2ea4269de SHA512 138072be98dea6e97ea38f3e562c8ee383626c2136ec1adb854a81315468cd484c4b994c3ccaf6a39327b3fe121f77d698bf85c2764ec4b6231828b8a9ec5460 WHIRLPOOL d85d74e6287ed9578bc565c5e699f7201fbf38cb55e6dfa487f1c8b4684c161b6c6a5c8cb06627575d7a417bf35b15c64d231878dab32b5bbcc8223b7356c32d |
29 |
+DIST nspr-4.14.tar.gz 1136626 SHA256 64fc18826257403a9132240aa3c45193d577a84b08e96f7e7770a97c074d17d5 SHA512 cb0c82d7bb3dfebdfc167f88bc0dde1c0eb4340eb7c53342a57591b120b42248da9f3ee604bec60c80c4af24fb8e46c5cacf859d66e3253e7f35d2c47cf4e676 WHIRLPOOL e9fbcfebb672d8385c9e0c503a534367709bf440cb6b8e238e2d1d5aab773792880f5f18729cbb697e7924e40934b59dff2e9c8847455f2dc79763fe0e8ef6ce |
30 |
|
31 |
diff --git a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch |
32 |
index 3ae8052..6ae04f4 100644 |
33 |
--- a/dev-libs/nspr/files/nspr-4.10.6-solaris.patch |
34 |
+++ b/dev-libs/nspr/files/nspr-4.10.6-solaris.patch |
35 |
@@ -1,7 +1,7 @@ |
36 |
* drop Solaris linker stuff |
37 |
|
38 |
---- nspr-4.7.4/mozilla/nsprpub/configure.in |
39 |
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in |
40 |
+--- a/configure.in |
41 |
++++ b/configure.in |
42 |
@@ -1988,26 +1988,14 @@ |
43 |
CPU_ARCH=`uname -p` |
44 |
MDCPUCFG_H=_solaris.cfg |
45 |
|
46 |
diff --git a/dev-libs/nspr/files/nspr-4.6.1-lang.patch b/dev-libs/nspr/files/nspr-4.6.1-lang.patch |
47 |
deleted file mode 100644 |
48 |
index 46fe15b..0000000 |
49 |
--- a/dev-libs/nspr/files/nspr-4.6.1-lang.patch |
50 |
+++ /dev/null |
51 |
@@ -1,41 +0,0 @@ |
52 |
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in |
53 |
-option parsing, it may break. |
54 |
- |
55 |
-http://bugs.gentoo.org/103483 |
56 |
- |
57 |
---- mozilla/nsprpub/configure |
58 |
-+++ mozilla/nsprpub/configure |
59 |
-@@ -54,6 +54,16 @@ |
60 |
- infodir='${prefix}/info' |
61 |
- mandir='${prefix}/man' |
62 |
- |
63 |
-+# NLS nuisances. |
64 |
-+# Only set these to C if already set. These must not be set unconditionally |
65 |
-+# because not all systems understand e.g. LANG=C (notably SCO). |
66 |
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! |
67 |
-+# Non-C LC_CTYPE values break the ctype check. |
68 |
-+if test "${LANG+set}" = set; then LANG=C; export LANG; fi |
69 |
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi |
70 |
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi |
71 |
-+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi |
72 |
-+ |
73 |
- # Initialize some other variables. |
74 |
- subdirs= |
75 |
- MFLAGS= MAKEFLAGS= |
76 |
-@@ -452,16 +463,6 @@ |
77 |
- esac |
78 |
- done |
79 |
- |
80 |
--# NLS nuisances. |
81 |
--# Only set these to C if already set. These must not be set unconditionally |
82 |
--# because not all systems understand e.g. LANG=C (notably SCO). |
83 |
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! |
84 |
--# Non-C LC_CTYPE values break the ctype check. |
85 |
--if test "${LANG+set}" = set; then LANG=C; export LANG; fi |
86 |
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi |
87 |
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi |
88 |
--if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi |
89 |
-- |
90 |
- # confdefs.h avoids OS command line length limits that DEFS can exceed. |
91 |
- rm -rf conftest* confdefs.h |
92 |
- # AIX cpp loses on an empty file, so make sure it contains at least a newline. |
93 |
|
94 |
diff --git a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch |
95 |
index ac509ef..2de3ba3 100644 |
96 |
--- a/dev-libs/nspr/files/nspr-4.7.0-prtime.patch |
97 |
+++ b/dev-libs/nspr/files/nspr-4.7.0-prtime.patch |
98 |
@@ -1,5 +1,5 @@ |
99 |
---- mozilla/nsprpub/pr/src/misc/prtime.c.orig 2007-09-14 19:41:08.000000000 +0200 |
100 |
-+++ mozilla/nsprpub/pr/src/misc/prtime.c 2007-09-14 19:42:17.000000000 +0200 |
101 |
+--- a/pr/src/misc/prtime.c |
102 |
++++ b/pr/src/misc/prtime.c |
103 |
@@ -1536,7 +1536,7 @@ |
104 |
case TT_EET: zone_offset = 2 * 60; break; |
105 |
case TT_JST: zone_offset = 9 * 60; break; |
106 |
|
107 |
diff --git a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch |
108 |
index 5d9e810..1afab1d 100644 |
109 |
--- a/dev-libs/nspr/files/nspr-4.7.1-solaris.patch |
110 |
+++ b/dev-libs/nspr/files/nspr-4.7.1-solaris.patch |
111 |
@@ -1,8 +1,8 @@ |
112 |
Same magic as haubi did for glib compilation, which works again here |
113 |
resolving a linker problem on Solaris with GNU ld. Bug #222625 |
114 |
|
115 |
---- mozilla/nsprpub/pr/src/Makefile.in.orig 2008-06-22 22:24:56.671065000 +0200 |
116 |
-+++ mozilla/nsprpub/pr/src/Makefile.in 2008-06-23 14:38:52.320417000 +0200 |
117 |
+--- a/pr/src/Makefile.in |
118 |
++++ b/pr/src/Makefile.in |
119 |
@@ -95,7 +95,7 @@ |
120 |
endif |
121 |
|
122 |
|
123 |
diff --git a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch b/dev-libs/nspr/files/nspr-4.7.4-solaris.patch |
124 |
deleted file mode 100644 |
125 |
index a0f14d5..0000000 |
126 |
--- a/dev-libs/nspr/files/nspr-4.7.4-solaris.patch |
127 |
+++ /dev/null |
128 |
@@ -1,62 +0,0 @@ |
129 |
-* drop Solaris linker stuff |
130 |
- |
131 |
---- nspr-4.7.4/mozilla/nsprpub/configure.in |
132 |
-+++ nspr-4.7.4/mozilla/nsprpub/configure.in |
133 |
-@@ -1988,26 +1988,14 @@ |
134 |
- CPU_ARCH=`uname -p` |
135 |
- MDCPUCFG_H=_solaris.cfg |
136 |
- PR_MD_CSRCS=solaris.c |
137 |
-- LD=/usr/ccs/bin/ld |
138 |
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' |
139 |
- RESOLVE_LINK_SYMBOLS=1 |
140 |
-- case "${OS_RELEASE}" in |
141 |
-- 5.8|5.9) |
142 |
-- ;; |
143 |
-- *) |
144 |
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later. |
145 |
-- USE_B_DIRECT=1 |
146 |
-- ;; |
147 |
-- esac |
148 |
- if test -n "$GNU_CC"; then |
149 |
- DSO_CFLAGS=-fPIC |
150 |
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then |
151 |
- GCC_USE_GNU_LD=1 |
152 |
- fi |
153 |
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' |
154 |
-- if test -n "$USE_B_DIRECT"; then |
155 |
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect" |
156 |
-- fi |
157 |
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' |
158 |
- else |
159 |
- DSO_CFLAGS=-KPIC |
160 |
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore' |
161 |
---- nspr-4.7.4/mozilla/nsprpub/configure |
162 |
-+++ nspr-4.7.4/mozilla/nsprpub/configure |
163 |
-@@ -4765,26 +4765,14 @@ |
164 |
- CPU_ARCH=`uname -p` |
165 |
- MDCPUCFG_H=_solaris.cfg |
166 |
- PR_MD_CSRCS=solaris.c |
167 |
-- LD=/usr/ccs/bin/ld |
168 |
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' |
169 |
- RESOLVE_LINK_SYMBOLS=1 |
170 |
-- case "${OS_RELEASE}" in |
171 |
-- 5.8|5.9) |
172 |
-- ;; |
173 |
-- *) |
174 |
-- # It is safe to use the -Bdirect linker flag on Solaris 10 or later. |
175 |
-- USE_B_DIRECT=1 |
176 |
-- ;; |
177 |
-- esac |
178 |
- if test -n "$GNU_CC"; then |
179 |
- DSO_CFLAGS=-fPIC |
180 |
- if `$CC -print-prog-name=ld` -v 2>&1 | grep -c GNU >/dev/null; then |
181 |
- GCC_USE_GNU_LD=1 |
182 |
- fi |
183 |
-- DSO_LDOPTS='-shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs,-z,ignore' |
184 |
-- if test -n "$USE_B_DIRECT"; then |
185 |
-- DSO_LDOPTS="$DSO_LDOPTS,-Bdirect" |
186 |
-- fi |
187 |
-+ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' |
188 |
- else |
189 |
- DSO_CFLAGS=-KPIC |
190 |
- DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs -z ignore' |
191 |
|
192 |
diff --git a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch |
193 |
index 1258b60..4045e90 100644 |
194 |
--- a/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch |
195 |
+++ b/dev-libs/nspr/files/nspr-4.8.4-darwin-install_name.patch |
196 |
@@ -1,8 +1,8 @@ |
197 |
Don't use @executable_path, it messed up linking against nspr from e.g. |
198 |
nss. |
199 |
|
200 |
---- mozilla/nsprpub/configure.in |
201 |
-+++ mozilla/nsprpub/configure.in |
202 |
+--- a/configure.in |
203 |
++++ b/configure.in |
204 |
@@ -1007,7 +1007,7 @@ |
205 |
;; |
206 |
esac |
207 |
@@ -12,8 +12,8 @@ nss. |
208 |
_OPTIMIZE_FLAGS=-O2 |
209 |
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' |
210 |
STRIP="$STRIP -x -S" |
211 |
---- mozilla/nsprpub/configure |
212 |
-+++ mozilla/nsprpub/configure |
213 |
+--- a/configure |
214 |
++++ b/configure |
215 |
@@ -1007,7 +1007,7 @@ |
216 |
;; |
217 |
esac |
218 |
|
219 |
diff --git a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch |
220 |
index dd3b132..5d37018 100644 |
221 |
--- a/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch |
222 |
+++ b/dev-libs/nspr/files/nspr-4.8.9-link-flags.patch |
223 |
@@ -5,8 +5,8 @@ autoparallelization). Other flags are required when building and linking |
224 |
|
225 |
https://bugs.gentoo.org/365975 |
226 |
|
227 |
---- a/mozilla/nsprpub/config/autoconf.mk.in |
228 |
-+++ b/mozilla/nsprpub/config/autoconf.mk.in |
229 |
+--- a/config/autoconf.mk.in |
230 |
++++ b/config/autoconf.mk.in |
231 |
@@ -81,6 +81,7 @@ OS_DLLFLAGS = @OS_DLLFLAGS@ |
232 |
DLLFLAGS = @DLLFLAGS@ |
233 |
EXEFLAGS = @EXEFLAGS@ |
234 |
@@ -15,8 +15,8 @@ https://bugs.gentoo.org/365975 |
235 |
|
236 |
PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@ |
237 |
PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@ |
238 |
---- a/mozilla/nsprpub/config/config.mk |
239 |
-+++ b/mozilla/nsprpub/config/config.mk |
240 |
+--- a/config/config.mk |
241 |
++++ b/config/config.mk |
242 |
@@ -72,7 +72,7 @@ NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ |
243 |
NOMD_CCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ |
244 |
$(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) |
245 |
|
246 |
diff --git a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch |
247 |
index d4f9a7e..a22b0b9 100644 |
248 |
--- a/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch |
249 |
+++ b/dev-libs/nspr/files/nspr-4.9.5_nspr_config.patch |
250 |
@@ -1,6 +1,5 @@ |
251 |
-diff -urN a/mozilla/nsprpub/config/nspr-config.in b/mozilla/nsprpub/config/nspr-config.in |
252 |
---- a/mozilla/nsprpub/config/nspr-config.in 2012-03-06 07:13:39.000000000 -0600 |
253 |
-+++ b/mozilla/nsprpub/config/nspr-config.in 2013-02-16 20:53:53.893489345 -0600 |
254 |
+--- a/config/nspr-config.in |
255 |
++++ b/config/nspr-config.in |
256 |
@@ -126,7 +126,7 @@ |
257 |
fi |
258 |
|
259 |
|
260 |
diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml |
261 |
new file mode 100644 |
262 |
index 0000000..d9b367e |
263 |
--- /dev/null |
264 |
+++ b/dev-libs/nspr/metadata.xml |
265 |
@@ -0,0 +1,8 @@ |
266 |
+<?xml version="1.0" encoding="UTF-8"?> |
267 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
268 |
+<pkgmetadata> |
269 |
+<maintainer type="project"> |
270 |
+ <email>mozilla@g.o</email> |
271 |
+ <name>Gentoo Mozilla Team</name> |
272 |
+</maintainer> |
273 |
+</pkgmetadata> |
274 |
|
275 |
diff --git a/dev-libs/nspr/nspr-4.12.ebuild b/dev-libs/nspr/nspr-4.14.ebuild |
276 |
similarity index 83% |
277 |
rename from dev-libs/nspr/nspr-4.12.ebuild |
278 |
rename to dev-libs/nspr/nspr-4.14.ebuild |
279 |
index a99d0b5..7b372af 100644 |
280 |
--- a/dev-libs/nspr/nspr-4.12.ebuild |
281 |
+++ b/dev-libs/nspr/nspr-4.14.ebuild |
282 |
@@ -1,10 +1,10 @@ |
283 |
-# Copyright 1999-2016 Gentoo Foundation |
284 |
+# Copyright 1999-2017 Gentoo Foundation |
285 |
# Distributed under the terms of the GNU General Public License v2 |
286 |
|
287 |
EAPI=6 |
288 |
WANT_AUTOCONF="2.5" |
289 |
|
290 |
-inherit autotools toolchain-funcs versionator multilib-minimal |
291 |
+inherit autotools eutils multilib toolchain-funcs versionator multilib-minimal |
292 |
|
293 |
MIN_PV="$(get_version_component_range 2)" |
294 |
|
295 |
@@ -14,7 +14,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" |
296 |
|
297 |
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" |
298 |
SLOT="0" |
299 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
300 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" |
301 |
IUSE="debug" |
302 |
|
303 |
RDEPEND=" |
304 |
@@ -27,17 +27,20 @@ MULTILIB_CHOST_TOOLS=( |
305 |
/usr/bin/nspr-config |
306 |
) |
307 |
|
308 |
+PATCHES=( |
309 |
+ "${FILESDIR}"/${PN}-4.7.0-prtime.patch |
310 |
+ "${FILESDIR}"/${PN}-4.7.1-solaris.patch |
311 |
+ "${FILESDIR}"/${PN}-4.10.6-solaris.patch |
312 |
+ "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch |
313 |
+ "${FILESDIR}"/${PN}-4.8.9-link-flags.patch |
314 |
+ # We do not need to pass -L$libdir via nspr-config --libs |
315 |
+ "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch |
316 |
+) |
317 |
+ |
318 |
src_prepare() { |
319 |
cd "${S}"/nspr || die |
320 |
- eapply -p2 "${FILESDIR}"/${PN}-4.7.0-prtime.patch |
321 |
- eapply -p2 "${FILESDIR}"/${PN}-4.7.1-solaris.patch |
322 |
- eapply -p3 "${FILESDIR}"/${PN}-4.10.6-solaris.patch |
323 |
- eapply -p2 "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch |
324 |
- eapply -p3 "${FILESDIR}"/${PN}-4.8.9-link-flags.patch |
325 |
- # We do not need to pass -L$libdir via nspr-config --libs |
326 |
- eapply -p3 "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch |
327 |
|
328 |
- eapply_user |
329 |
+ default |
330 |
|
331 |
# rename configure.in to configure.ac for new autotools compatibility |
332 |
if [[ -e "${S}"/nspr/configure.in ]] ; then |