advance firefox
more/packages/gnuzilla.scm
79 | 79 | ((#:configure-flags flags) | |
80 | 80 | `(cons* "--enable-skia" ,flags)))))) | |
81 | 81 | ||
82 | - | (define-public icu4c-for-firefox | |
83 | - | (package | |
84 | - | (inherit icu4c) | |
85 | - | (name "icu4c") | |
86 | - | (version "59.1") | |
87 | - | (source (origin | |
88 | - | (method url-fetch) | |
89 | - | (uri (string-append | |
90 | - | "http://download.icu-project.org/files/icu4c/" | |
91 | - | version | |
92 | - | "/icu4c-" | |
93 | - | (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) | |
94 | - | "-src.tgz")) | |
95 | - | (sha256 | |
96 | - | (base32 "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki")))))) | |
82 | + | ;(define-public icu4c-for-firefox | |
83 | + | ; (package | |
84 | + | ; (inherit icu4c) | |
85 | + | ; (name "icu4c") | |
86 | + | ; (version "59.1") | |
87 | + | ; (source (origin | |
88 | + | ; (method url-fetch) | |
89 | + | ; (uri (string-append | |
90 | + | ; "http://download.icu-project.org/files/icu4c/" | |
91 | + | ; version | |
92 | + | ; "/icu4c-" | |
93 | + | ; (string-map (lambda (x) (if (char=? x #\.) #\_ x)) version) | |
94 | + | ; "-src.tgz")) | |
95 | + | ; (sha256 | |
96 | + | ; (base32 "1zkmbg2932ggvpgjp8pys0cj6z8bw087y8858009shkrjfpzscki")))))) | |
97 | 97 | ||
98 | 98 | (define nss-for-firefox | |
99 | 99 | (package | |
… | |||
168 | 168 | (define-public firefox | |
169 | 169 | (package | |
170 | 170 | (name "firefox") | |
171 | - | (version "58.0") | |
171 | + | (version "59.0.2") | |
172 | 172 | (source (origin | |
173 | 173 | (method url-fetch) | |
174 | - | (uri (string-append "https://archive.mozilla.org/pub/firefox/" | |
175 | - | "releases/" version "/source/firefox-" | |
176 | - | version ".source.tar.xz")) | |
174 | + | (uri (string-append "https://hg.mozilla.org/releases/mozilla-release/" | |
175 | + | "archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2")) | |
176 | + | ;(uri (string-append "https://archive.mozilla.org/pub/firefox/" | |
177 | + | ; "releases/" version "/source/firefox-" | |
178 | + | ; version ".source.tar.xz")) | |
177 | 179 | (sha256 | |
178 | 180 | (base32 | |
179 | - | "1zxapyir31zr1k7qrixqayzafh3kkvx0hh5vv1kp8kgrmg53j2hf")) | |
181 | + | "0cr8b6hrhr8ql31w9vjy79gzyzx4d608fwr8bv7apqlp0sn84wsv")) | |
182 | + | (file-name (string-append name "-" version ".tar.bz2")) | |
180 | 183 | (modules '((guix build utils))) | |
181 | 184 | (snippet | |
182 | 185 | '(begin | |
… | |||
231 | 234 | (arguments | |
232 | 235 | `(#:out-of-source? #t | |
233 | 236 | #:tests? #f | |
234 | - | #:configure-flags (list "--disable-necko-wifi" | |
235 | - | "--disable-stylo" | |
236 | - | "--disable-crashreporter" | |
237 | - | "--disable-updater" | |
238 | - | "--disable-tests"; Remove if we want to test | |
239 | - | "--enable-application=browser" | |
240 | - | "--enable-optimize=-O2" | |
241 | - | "--with-pthreads" | |
242 | - | ;; use system libraries | |
243 | - | "--enable-system-hunspell" | |
244 | - | "--enable-startup-notification" | |
245 | - | "--enable-alsa" "--enable-pulseaudio" | |
246 | - | "--enable-system-sqlite" | |
247 | - | "--with-system-libevent" | |
248 | - | "--with-system-libvpx" | |
249 | - | "--with-system-nspr" | |
250 | - | "--with-system-nss" | |
251 | - | "--with-system-icu" | |
252 | - | "--enable-system-cairo" | |
253 | - | "--enable-system-ffi" | |
254 | - | "--enable-system-pixman" | |
255 | - | "--with-system-bz2" | |
256 | - | "--with-system-jpeg" | |
257 | - | "--with-system-png" | |
258 | - | "--with-system-zlib") | |
259 | - | ;; clang is not found because it is assumed to be in | |
260 | - | ;; the same location as llvm. | |
261 | - | ;(string-append "--with-clang-path=" | |
262 | - | ; (assoc-ref %build-inputs "clang-3.9.1") | |
263 | - | ; "/bin/clang")) | |
264 | - | ;(string-append "--with-libclang-path=" | |
265 | - | ; (assoc-ref %build-inputs "clang-3.9.1") | |
266 | - | ; "/lib")) | |
237 | + | ;#:configure-flags (list "--disable-necko-wifi" | |
238 | + | ; "--disable-stylo" | |
239 | + | ; "--disable-crashreporter" | |
240 | + | ; "--disable-updater" | |
241 | + | ; "--disable-tests"; Remove if we want to test | |
242 | + | ; "--enable-application=browser" | |
243 | + | ; "--enable-optimize=-O2" | |
244 | + | ; "--with-pthreads" | |
245 | + | ; ;; use system libraries | |
246 | + | ; "--enable-system-hunspell" | |
247 | + | ; "--enable-startup-notification" | |
248 | + | ; "--enable-alsa" "--enable-pulseaudio" | |
249 | + | ; "--enable-system-sqlite" | |
250 | + | ; "--with-system-libevent" | |
251 | + | ; "--with-system-libvpx" | |
252 | + | ; "--with-system-nspr" | |
253 | + | ; "--with-system-nss" | |
254 | + | ; "--with-system-icu" | |
255 | + | ; "--enable-system-cairo" | |
256 | + | ; "--enable-system-ffi" | |
257 | + | ; "--enable-system-pixman" | |
258 | + | ; "--with-system-bz2" | |
259 | + | ; "--with-system-jpeg" | |
260 | + | ; "--with-system-png" | |
261 | + | ; "--with-system-zlib") | |
262 | + | ; ;; clang is not found because it is assumed to be in | |
263 | + | ; ;; the same location as llvm. | |
264 | + | ; ;(string-append "--with-clang-path=" | |
265 | + | ; ; (assoc-ref %build-inputs "clang-3.9.1") | |
266 | + | ; ; "/bin/clang")) | |
267 | + | ; ;(string-append "--with-libclang-path=" | |
268 | + | ; ; (assoc-ref %build-inputs "clang-3.9.1") | |
269 | + | ; ; "/lib")) | |
267 | 270 | ;; Race condition in python? | |
268 | 271 | ;; EOFError: EOF read where object expected | |
269 | - | #:parallel-build? #f | |
272 | + | ;#:parallel-build? #f | |
270 | 273 | #:phases | |
271 | 274 | (modify-phases %standard-phases | |
272 | - | (replace | |
273 | - | 'configure | |
274 | - | ;; configure does not work followed by both "SHELL=..." and | |
275 | - | ;; "CONFIG_SHELL=..."; set environment variables instead | |
275 | + | (replace 'build | |
276 | + | (lambda _ | |
277 | + | (invoke (which "sh") "mach" "build" "--verbose") | |
278 | + | #t)) | |
279 | + | (replace 'install | |
280 | + | (lambda _ | |
281 | + | (invoke (which "sh") "mach" "install") | |
282 | + | #t)) | |
283 | + | (replace 'configure | |
276 | 284 | (lambda* (#:key outputs configure-flags #:allow-other-keys) | |
277 | - | (let* ((out (assoc-ref outputs "out")) | |
278 | - | (bash (which "bash")) | |
279 | - | (abs-srcdir (getcwd)) | |
280 | - | (srcdir (string-append "../" (basename abs-srcdir))) | |
281 | - | (flags `(,(string-append "--prefix=" out) | |
282 | - | ,(string-append "--with-l10n-base=" | |
283 | - | abs-srcdir "/intl/l10n") | |
284 | - | ,@configure-flags))) | |
285 | - | ;; We removed the embedded sqlite, so don't reference it. | |
286 | - | (substitute* '("storage/moz.build" "dom/indexedDB/moz.build") | |
287 | - | (("'/db/sqlite3/src',") "")) | |
288 | - | (setenv "SHELL" bash) | |
289 | - | (setenv "CONFIG_SHELL" bash) | |
290 | - | (setenv "AUTOCONF" (which "autoconf")) ; must be autoconf-2.13 | |
291 | - | (mkdir "../build") | |
292 | - | (chdir "../build") | |
293 | - | (format #t "build directory: ~s~%" (getcwd)) | |
294 | - | (format #t "configure flags: ~s~%" flags) | |
295 | - | (zero? (apply system* bash | |
296 | - | (string-append srcdir "/configure") | |
297 | - | flags)))))))) | |
285 | + | (setenv "SHELL" (which "bash")) | |
286 | + | (with-output-to-file "mozconfig" | |
287 | + | (lambda _ | |
288 | + | (display (string-append | |
289 | + | "ac_add_options --disable-necko-wifi | |
290 | + | ac_add_options --enable-system-hunspell | |
291 | + | ac_add_options --enable-startup-notification | |
292 | + | ac_add_options --enable-system-sqlite | |
293 | + | ac_add_options --with-system-libevent | |
294 | + | ac_add_options --with-system-libvpx | |
295 | + | ac_add_options --with-system-nspr | |
296 | + | ac_add_options --with-system-nss | |
297 | + | ac_add_options --with-system-icu | |
298 | + | ac_add_options --prefix=" (assoc-ref outputs "out") " | |
299 | + | ac_add_options --enable-application=browser | |
300 | + | ||
301 | + | # For now, disable stylo: it requires clang which is not found by llvm-config | |
302 | + | ac_add_options --disable-stylo | |
303 | + | ||
304 | + | ac_add_options --disable-crashreporter | |
305 | + | ac_add_options --disable-updater | |
306 | + | # enabling the tests will use a lot more space and significantly | |
307 | + | # increase the build time, for no obvious benefit. | |
308 | + | ac_add_options --disable-tests | |
309 | + | ||
310 | + | # Optimization for size is broken with gcc7 | |
311 | + | ac_add_options --enable-optimize=\"-O2\" | |
312 | + | ||
313 | + | ac_add_options --enable-official-branding | |
314 | + | ||
315 | + | # In firefox-59.0 system cairo breaks the build, so comment it. | |
316 | + | #ac_add_options --enable-system-cairo | |
317 | + | ac_add_options --enable-system-ffi | |
318 | + | ac_add_options --enable-system-pixman | |
319 | + | ||
320 | + | ac_add_options --with-pthreads | |
321 | + | ||
322 | + | ac_add_options --with-system-bz2 | |
323 | + | ac_add_options --with-system-jpeg | |
324 | + | ac_add_options --with-system-png | |
325 | + | ac_add_options --with-system-zlib | |
326 | + | ||
327 | + | mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir | |
328 | + | "))))))))) | |
329 | + | ;(let* ((out (assoc-ref outputs "out")) | |
330 | + | ; (bash (which "bash")) | |
331 | + | ; (abs-srcdir (getcwd)) | |
332 | + | ; (srcdir (string-append "../" (basename abs-srcdir))) | |
333 | + | ; (flags `(,(string-append "--prefix=" out) | |
334 | + | ; ,(string-append "--with-l10n-base=" | |
335 | + | ; abs-srcdir "/intl/l10n") | |
336 | + | ; ,@configure-flags))) | |
337 | + | ; ;; We removed the embedded sqlite, so don't reference it. | |
338 | + | ; (substitute* '("storage/moz.build" "dom/indexedDB/moz.build") | |
339 | + | ; (("'/db/sqlite3/src',") "")) | |
340 | + | ; (setenv "SHELL" bash) | |
341 | + | ; (setenv "CONFIG_SHELL" bash) | |
342 | + | ; (setenv "AUTOCONF" (which "autoconf")) ; must be autoconf-2.13 | |
343 | + | ; (mkdir "../build") | |
344 | + | ; (chdir "../build") | |
345 | + | ; (format #t "build directory: ~s~%" (getcwd)) | |
346 | + | ; (format #t "configure flags: ~s~%" flags) | |
347 | + | ; (zero? (apply system* bash | |
348 | + | ; (string-append srcdir "/configure") | |
349 | + | ; flags)))))))) | |
298 | 350 | (inputs | |
299 | 351 | `(("alsa-lib" ,alsa-lib) | |
300 | 352 | ("bzip2" ,bzip2) | |
… | |||
321 | 373 | ("ffmpeg" ,ffmpeg) | |
322 | 374 | ("libpng-apng" ,libpng-apng-for-firefox) | |
323 | 375 | ("libvpx" ,libvpx) | |
324 | - | ("icu4c" ,icu4c-for-firefox) | |
376 | + | ("icu4c" ,icu4c) | |
325 | 377 | ("pixman" ,pixman) | |
326 | 378 | ("pulseaudio" ,pulseaudio) | |
327 | 379 | ("mesa" ,mesa) | |
… | |||
341 | 393 | ("autoconf" ,autoconf-2.13) | |
342 | 394 | ("which" ,which) | |
343 | 395 | ("rust" ,rust) | |
344 | - | ("cargo" ,cargo) | |
396 | + | ("cargo" ,rust "cargo") | |
397 | + | ("libtool" ,libtool) | |
345 | 398 | ("clang-3.9.1" ,clang-3.9.1) | |
346 | 399 | ("llvm-3.9.1" ,llvm-3.9.1))) | |
347 | 400 | (home-page "https://mozilla.org") |