From 29475267664274ae5083eb42eee8ad833e02b308 Mon Sep 17 00:00:00 2001 From: Adrien 'neox' Bourmault Date: Tue, 16 Jul 2024 15:04:31 +0200 Subject: [PATCH] correction des configurations du home --- .bashrc | 8 +- .profile | 6 + packages/defs/icecat-.zip | Bin 25916 -> 0 bytes .../defs/icecat-avoid-bundled-libraries.patch | 49 - packages/defs/icecat-custom.scm | 1098 ----------------- packages/defs/icecat-makeicecat.patch | 51 - ...icecat-use-system-graphite2+harfbuzz.patch | 226 ---- .../defs/icecat-use-system-media-libs.patch | 380 ------ shell-authorized-directories | 1 + 9 files changed, 12 insertions(+), 1807 deletions(-) create mode 100644 .profile delete mode 100644 packages/defs/icecat-.zip delete mode 100644 packages/defs/icecat-avoid-bundled-libraries.patch delete mode 100644 packages/defs/icecat-custom.scm delete mode 100644 packages/defs/icecat-makeicecat.patch delete mode 100644 packages/defs/icecat-use-system-graphite2+harfbuzz.patch delete mode 100644 packages/defs/icecat-use-system-media-libs.patch diff --git a/.bashrc b/.bashrc index 2558cd5..246bb42 100755 --- a/.bashrc +++ b/.bashrc @@ -36,7 +36,9 @@ export GUIX_PACKAGE_PATH=~/.config/guix/packages/defs source ~/.bash_secrets -unset SSH_AGENT_PID -if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then - export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" +if [[ ! -n "$SSH_CLIENT" ]]; then + unset SSH_AGENT_PID + if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" + fi fi diff --git a/.profile b/.profile new file mode 100644 index 0000000..a321677 --- /dev/null +++ b/.profile @@ -0,0 +1,6 @@ +if [[ ! -n "$SSH_CLIENT" ]]; then + unset SSH_AGENT_PID + if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" + fi +fi diff --git a/packages/defs/icecat-.zip b/packages/defs/icecat-.zip deleted file mode 100644 index 9bd9a4bc780249a4232be1286305c0584b587003..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25916 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 -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Mark H Weaver -;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner -;;; Copyright © 2016 Alex Griffin -;;; Copyright © 2017 Clément Lassieur -;;; Copyright © 2017, 2018 Nikita -;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2020 Ricardo Wurmus -;;; Copyright © 2019 Ivan Petkov -;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2019, 2020 Adrian Malacoda -;;; Copyright © 2020, 2021, 2022 Jonathan Brielmaier -;;; Copyright © 2020, 2022 Marius Bakke -;;; Copyright © 2021 Brice Waegeneire -;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2021, 2022 Maxim Cournoyer -;;; Copyright © 2021 Baptiste Strazzul -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (icecat-custom) - #:use-module ((srfi srfi-1) #:hide (zip)) - #:use-module (ice-9 match) - #:use-module (gnu packages) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix hg-download) - #:use-module (guix gexp) - #:use-module (guix store) - #:use-module (guix monads) - #:use-module (guix utils) - #:use-module (guix build-system gnu) - #:use-module (guix build-system cargo) - #:use-module (guix build-system trivial) - #:use-module (gnu packages admin) - #:use-module (gnu packages audio) - #:use-module (gnu packages autotools) - #:use-module (gnu packages m4) - #:use-module (gnu packages base) - #:use-module (gnu packages bash) - #:use-module (gnu packages databases) - #:use-module (gnu packages glib) - #:use-module (gnu packages gtk) - #:use-module (gnu packages gnome) - #:use-module (gnu packages libcanberra) - #:use-module (gnu packages cups) - #:use-module (gnu packages kerberos) - #:use-module (gnu packages linux) - #:use-module (gnu packages perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages compression) - #:use-module (gnu packages fontutils) - #:use-module (gnu packages fonts) - #:use-module (gnu packages hunspell) - #:use-module (gnu packages libevent) - #:use-module (gnu packages image) - #:use-module (gnu packages libffi) - #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages node) - #:use-module (gnu packages xorg) - #:use-module (gnu packages gl) - #:use-module (gnu packages pciutils) - #:use-module (gnu packages assembly) - #:use-module (gnu packages rust) - #:use-module (gnu packages rust-apps) - #:use-module (gnu packages llvm) - #:use-module (gnu packages nss) - #:use-module (gnu packages icu4c) - #:use-module (gnu packages video) - #:use-module (gnu packages xiph) - #:use-module (gnu packages xdisorg) - #:use-module (gnu packages readline) - #:use-module (gnu packages sqlite)) - -(define mozjs-custom - (package - (name "mozjs-custom") - (version "102.2.0") - (source (origin - (method url-fetch) - ;; TODO: Switch to IceCat source once available on ftp.gnu.org. - (uri (string-append "https://ftp.mozilla.org/pub/firefox" - "/releases/" version "esr/source/firefox-" - version "esr.source.tar.xz")) - (sha256 - (base32 - "1zwpgis7py1bf8p88pz3mpai6a02qrdb8ww2fa9kxxdl9b8r2k81")))) - (build-system gnu-build-system) - (arguments - (list - #:imported-modules %cargo-utils-modules ;for `generate-all-checksums' - #:modules `((guix build cargo-utils) - ,@%gnu-build-system-modules) - #:test-target "check-jstests" - #:configure-flags - #~(list - ;; Disable debugging symbols to save space. - "--disable-debug" - "--disable-debug-symbols" - ;; This is important because without it gjs will segfault during the - ;; configure phase. With jemalloc only the standalone mozjs console - ;; will work. - "--disable-jemalloc" - "--enable-tests" - "--enable-hardening" - "--enable-optimize" - "--enable-release" - "--enable-readline" - "--enable-shared-js" - "--with-system-icu" - "--with-system-nspr" - "--with-system-zlib" - "--with-intl-api") - #:phases - #~(modify-phases %standard-phases - (add-after 'patch-source-shebangs 'patch-cargo-checksums - (lambda _ - (let ((null-hash - "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) - (for-each (lambda (file) - (format #t "patching checksums in ~a~%" file) - (substitute* file - (("^checksum = \".*\"") - (string-append "checksum = \"" null-hash "\"")))) - (find-files "." "Cargo\\.lock$")) - (for-each generate-all-checksums - '("js" "third_party/rust"))))) - (replace 'configure - (lambda* (#:key configure-flags #:allow-other-keys) - ;; The configure script does not accept environment variables as - ;; arguments. It also must be run from a different directory, - ;; but not the root directory either. - (mkdir "run-configure-from-here") - (chdir "run-configure-from-here") - (setenv "SHELL" (which "sh")) - (setenv "CONFIG_SHELL" (which "sh")) - (setenv "AUTOCONF" (which "autoconf")) - (apply invoke "python" "../configure.py" - "--enable-project=js" - (string-append "--prefix=" #$output) - configure-flags))) - (add-before 'check 'adjust-tests - (lambda _ - (with-directory-excursion "../js/src/tests" - (substitute* "shell/os.js" - ;; FIXME: Why does the killed process have an exit status? - ((".*killed process should not have exitStatus.*") - "")) - - ;; The test suite expects a lightly patched ICU. Disable tests - ;; that do not work with the system version. See - ;; "intl/icu-patches" for clues. - - ;; See and - ;; and - ;; related patch for why this is failing. - (delete-file "non262/Intl/DateTimeFormat/\ -fractional-second-digits-append-item.js") - ;; FIXME: got "0 \u251CAM/PM: noon\u2524", expected "0 (AM/PM: noon)" - (delete-file "non262/Intl/DateTimeFormat/day-period-hour-cycle.js") - ;; FIXME: got "en-US-posix", expected "en-US-POSIX". - (delete-file "non262/Intl/available-locales-supported.js") - ;; FIXME: got "en-US", expected "en-US-POSIX" - (delete-file "non262/Intl/available-locales-resolved.js")))) - (add-before 'check 'pre-check - (lambda _ - (setenv "JSTESTS_EXTRA_ARGS" - (string-join - (list - ;; Do not run tests marked as "random". - "--exclude-random" - ;; Exclude web platform tests. - "--wpt=disabled" - ;; Respect the daemons configured number of jobs. - (string-append "--worker-count=" - (number->string (parallel-job-count))))))))))) - (native-inputs - (list autoconf - llvm ;for llvm-objdump - m4 - perl - pkg-config - python-wrapper - rust - `(,rust "cargo"))) - (inputs - (list icu4c readline zlib)) - (propagated-inputs - (list nspr)) ; in the Requires.private field of mozjs-*.pc - (home-page - "https://spidermonkey.dev/") - (synopsis "Mozilla JavaScript engine") - (description "SpiderMonkey is Mozilla's JavaScript engine written -in C/C++.") - (license license:mpl2.0))) ; and others for some files - -(define mozjs-custom-91 - (package - (inherit mozjs-custom) - (version "91.13.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ftp.mozilla.org/pub/firefox" - "/releases/" version "esr/source/firefox-" - version "esr.source.tar.xz")) - (sha256 - (base32 - "0qh7j960wdp5zcfqhkj8ki47spp9i9ms12xx0v0kxvmmw36jpgjk")))) - (arguments - (substitute-keyword-arguments (package-arguments mozjs-custom) - ((#:phases phases) - #~(modify-phases #$phases - (add-before 'check 'disable-timezone-tests - (lambda _ - (with-directory-excursion "../js/src/tests" - ;; FIXME: Assertion failed: got "2021a", expected "2021a3"? - (delete-file "non262/Intl/DateTimeFormat/timeZone_version.js") - ;; XXX: Delete all tests that test time zone functionality, - ;; because the test suite uses /etc/localtime to figure out - ;; the offset from the hardware clock, which does not work - ;; in the build container. See . - (delete-file-recursively "non262/Date") - (delete-file - "non262/Intl/DateTimeFormat/tz-environment-variable.js")))))))) - (inputs (modify-inputs (package-inputs mozjs-custom) - (replace "icu4c" icu4c-69))))) - -(define mozjs-custom-78 - (package - (inherit mozjs-custom) - (name "mozjs-custom") - (version "78.15.0") - (source (origin - (method url-fetch) - (uri (string-append "https://archive.mozilla.org/pub/firefox" - "/releases/" version "esr/source/firefox-" - version "esr.source.tar.xz")) - (sha256 - (base32 - "0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4")))) - (build-system gnu-build-system) - (arguments - (substitute-keyword-arguments (package-arguments mozjs-custom) - ((#:phases phases) - #~(modify-phases #$phases - (replace 'configure - (lambda* (#:key configure-flags #:allow-other-keys) - ;; The configure script does not accept environment variables as - ;; arguments. It also must be run from a different directory, - ;; but not the root directory either. - (mkdir "run-configure-from-here") - (chdir "run-configure-from-here") - (setenv "SHELL" (which "sh")) - (setenv "CONFIG_SHELL" (which "sh")) - (setenv "AUTOCONF" (which "autoconf")) - (apply invoke "../js/src/configure" - (cons (string-append "--prefix=" #$output) - configure-flags)))) - (replace 'adjust-tests - (lambda _ - (with-directory-excursion "../js/src/tests" - ;; The test suite expects a lightly patched ICU 67. Since - ;; Guix is about to switch to ICU 68, massage the tests to - ;; work with that instead of patching ICU. Try removing this - ;; phase for newer versions of mozjs. - - ;; These tests look up locale names and expects to get - ;; "GB" instead of "UK". - (substitute* "non262/Intl/DisplayNames/language.js" - (("Traditionell, GB") - "Traditionell, UK")) - (substitute* "non262/Intl/DisplayNames/region.js" - (("\"GB\": \"GB\"") - "\"GB\": \"UK\"")) - - ;; XXX: Some localized time formats have changed, and - ;; substitution fails for accented characters, even though - ;; it works in the REPL(?). Just delete these for now. - (delete-file "non262/Intl/Date/toLocaleString_timeZone.js") - (delete-file "non262/Intl/Date/toLocaleDateString_timeZone.js") - - ;; Similarly, these get an unexpected "A" suffix when looking - ;; up a time in the "ar-MA-u-ca-islamicc" locale, which is - ;; tricky to substitute. - (delete-file "non262/Intl/DateTimeFormat/format_timeZone.js") - (delete-file "non262/Intl/DateTimeFormat/format.js") - - ;; This file compares a generated list of ICU locale names - ;; with actual lookups. Some have changed slightly, i.e. - ;; daf-Latn-ZZ -> daf-Latn-CI, so drop it for simplicity. - (delete-file "non262/Intl/Locale/likely-subtags-generated.js")))) - (replace 'pre-check - (lambda _ - (with-directory-excursion "../js/src/tests" - (substitute* "shell/os.js" - ;; FIXME: Why does the killed process have an exit status? - ((".*killed process should not have exitStatus.*") - "")) - - ;; XXX: Delete all tests that test time zone functionality, - ;; because the test suite uses /etc/localtime to figure out - ;; the offset from the hardware clock, which does not work - ;; in the build container. See . - (delete-file-recursively "non262/Date") - (delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js") - - (setenv "JSTESTS_EXTRA_ARGS" - (string-join - (list - ;; Do not run tests marked as "random". - "--exclude-random" - ;; Exclude web platform tests. - "--wpt=disabled" - ;; Respect the daemons configured number of jobs. - (string-append "--worker-count=" - (number->string - (parallel-job-count))))))))))))) - (native-inputs - (list autoconf-2.13 - automake - llvm ;for llvm-objdump - perl - pkg-config - python-3 - rust - `(,rust "cargo"))) - (inputs - (list icu4c-69 readline zlib)))) - -(define mozilla-compare-locales-custom - (origin - (method hg-fetch) - (uri (hg-reference - (url "https://hg.mozilla.org/l10n/compare-locales/") - (changeset "RELEASE_8_1_0"))) - (file-name "mozilla-compare-locales-custom") - (sha256 (base32 "00bpkaqf2ng1nn9ajyb5mli0jq58q5fm2n3yy90jy0hp4q2gbs50")))) - -(define (mozilla-locale-custom locale changeset hash-string) - (origin - (method hg-fetch) - (uri (hg-reference - (url (string-append "https://hg.mozilla.org/l10n-central/" - locale)) - (changeset changeset))) - (file-name (string-append "mozilla-locale-custom-" locale)) - (sha256 (base32 hash-string)))) - -(define-syntax-rule (mozilla-locale-customs (hash-string changeset locale) ...) - (list (mozilla-locale-custom locale changeset hash-string) - ...)) - -(define all-mozilla-locale-customs - (mozilla-locale-customs - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("1y562h0dg33vhhhwfk6jl7xbr67gng21vcf3rpm96zzcgbnf8rjj" "503a7baec899" "ach") - ("1cqixlk9f8p63jz20wzsvnfb7xa82ba725gzdydlwz2axgp09c26" "4e2c7d1ddbed" "af") - ("19r1yhmfxqasyslc8gr9as5w1scscz1xr8iqy9zi4b90fdjzs0ac" "06897e40a7ea" "an") - ("0nfknb1p03j9fgmkwlm1mzdyh10g0l33x34ab39kc072apziyv0n" "9272819b09e2" "ar") - ("11qqblqfffbmkdr5b6mxzq02i8rj1hjq3iy6xv5i5xxy311b3vpb" "f706d22e6910" "ast") - ("0q2p1a437qr2nshdd4934qkv2sblmykiwzir149c8p9m5sjk0dyw" "f5c2a9800add" "az") - ("0gxxm3lv18kj0922bw0g897azc4nkrszm5irgwdkgmkbyr97li83" "98ba7d51484f" "be") - ("10vrbbaabjns824ndya6c09znm815pak2xpvqgjydl3r5qvacx65" "5c79c77311cd" "bg") - ("1il7yyifx5xzj0v2lna315mppl5pk1vi4m9r66hdz1lzc485m1wp" "c80c87ef7193" "bn") - ("1p1ig4v9pczzrnnxzr20r61g7xk85k5lgnxhzgn1rx518p85xrkm" "6a1bcb9851b2" "br") - ("08q33bk9kdvbyc4ib58bsn2b67ki3d2yzskkf5r2n5zlglblksa2" "939779cb58d6" "bs") - ("1bdkywrqah85fh8kfnz163qnc02ffx0a4vlnx5pq1wg9j4f1gznf" "9a45ccf144f1" "ca") - ("0hhmp5dzc0rssykl0b2n9h0vfy4svwhxmhpsr3rcfpbg2s0r5h6l" "4f60e18fc248" "ca-valencia") - ("18phbl9raqsbys9wa8z0gq0h0pw3b55v6ngn67r4373lfc0s9cxv" "b4ef404c7de8" "cak") - ("0147qyw1y97mgqhkb46wblxv61lq2mvvm5n5ihwf49l5cyizi0jg" "f56ef18f05df" "cs") - ("08sbhnsxndlsaijnxndc367qcbrzb29m7bpkcawinz9fg6mz3573" "4f9d92f04f5e" "cy") - ("09cm5kk1sh2a6ws1fj185jrknhfa6n4bhj7nfnr4lsk339n0kvv9" "902503567e30" "da") - ("0r630bki5d4ylicq6lzh6s2mvsq225933szswmm0sap507rj75cm" "6000baf7a412" "de") - ("0749qjsfv3rn94rnci3ydgndw27qlr3w3w97kfwma2gmsf3m3r0p" "4a948952d1f4" "dsb") - ("0yc64i7mpxhs4qlyyh59i2aiz0vpap0bn8slcsk8b71wd1d7cy5m" "153a16a13733" "el") - ("0d4m5ji6ii10yap8y24cxx3fr60ba1jqi10hy3j1cq6ni7hzavga" "7ce17ae529ac" "en-CA") - ("12jzqcfbgdhfm8f2gqp15bdnin62li07jwicjc8ynn4cl9a19xiz" "a25d9eea7c23" "en-GB") - ("0gbb8hfc5yvjah63mapjxm53wxrf98srbrbg43b9g734zfi4n8y5" "4ed3471dad5d" "eo") - ("19lw7zmqx2irjmv5y6r7nncp6nysn06abf10n3dzj5nzgays6sln" "853fe7acb415" "es-AR") - ("0rq4pa380b77rkv6dq7sqx8a8i33jk3vs5rgcl8fv7slqvsw23kd" "921b67bf27a5" "es-CL") - ("1dyxzab9hln5spch66wmfagfzmfdiaxgpq7qlzvdfg98wkqdj25n" "c9a210ea496c" "es-ES") - ("1gwpmfl37wxl7rynqswgj41liljflgxydvljd4zdhk3jzqn605fb" "ddd35183d81c" "es-MX") - ("0c3blniddklapifnjbz03f2frw24jjgwgwn6swl5mwm2z0y6wa9f" "82d23ffaa7d3" "et") - ("05mq2df6n6fr8m5m2xwl0f6n1q3zgjrnk465ldx1nfr9agrhd36c" "13975626d549" "eu") - ("1l1jyqqiy551903j6yzh9ayg1pf26q2hr9h3jj4l51xzp7x4ms2q" "039e1fdb7c71" "fa") - ("091l05y9sggxznv0y11b9zy5qf146p0hb5faw4ix7yn5p5kca2f5" "7bd3722d82de" "ff") - ("1lllwjvmbl5dx44fcvsqg08fbflkc8dx5as9n6nf4xlkzydx6izm" "39808e88c9d1" "fi") - ("10ha955vvyf5vbciricm72kplj9j0s00g2333lmg46jiwi7aviiv" "426d373db6a7" "fr") - ("11zdfk8jvdy1k9z1q162cwapplcbz35l3dq4mv45brdin3v0x8kr" "96cd93d18389" "fy-NL") - ("1l5xr25gmssyachwmfprlnp2v2xj4b0hp8gxrf7fi5bvv9c2fynb" "de3daf7d3f9d" "ga-IE") - ("06h9ijfsn1cgz5fvxxbisk7fvqhgsw99id92575hgyg1p8xb1n69" "f04aea656d9e" "gd") - ("19913i5n8yyfhz9j21krlk7wqsyy89vggxc1m1swv94y2ix8rpaj" "1b8cdb87bf69" "gl") - ("0k5x31bfl2l0r9b5dkn03frm1gd8n6igai7ch2f1kj0skflynwww" "82df570c4241" "gn") - ("03rygnj9xhfvykark7dls117kwhid13ghvrsqiial0vp8m7ymx79" "e2e41d7beaa5" "gu-IN") - ("0vyraplj1x7b5im15anhzdaq03k2gqfyybgklrd4f9ry6msh5jhx" "de724e943805" "he") - ("1zqps586jrgxpf7xx2l3qw3ch3fr31r9a25y861fpxrpvh7ygw7g" "898598e1a5c6" "hi-IN") - ("0czq68l3qdhdc0mgazlrh8x83a6d5qrjwgjv8xvsmmzi7h68ww0l" "2711d1515af0" "hr") - ("1wwvrnm38gk2rnw4vmcranh8hk61gjcj9292pck3ckiv6mq7kd4s" "03e02f3d0676" "hsb") - ("0yvgdxlbyhhg3lk43hxx9gx66rcm7gaj02zzzx5zni8dhvlk2v6m" "d423ada9dc00" "hu") - ("1kjm7bg4990jhfbxwc38r4lqm2fbcxc82nc2d4qkqwikr4aah4b9" "06836af0bd6e" "hy-AM") - ("1dla7r3snvagb7m985xxqyi7gl498cr5xsz8msw0zpg6xmi05rlx" "299bd950d538" "ia") - ("0w8w9xn93akir7nqcp5iwr3kqvba5gbirg7gmzlzg7mgrhw8pcsa" "dee087477b99" "id") - ("10iakv1c1d20ihxg1s7c3zc1zfw18vr2kspcw7bk5k02rmrffgcn" "320095d063ed" "is") - ("1xn5pa3rc7l6k2migm3c0dx71q1hk7mjls045xpv9cy8gvirnj94" "4722680fb5bf" "it") - ("0va9zfj3wqh1yvbgh3x808yvdyxkg780vazjg887wbxpfk1n6hxa" "cb3cfe294621" "ja") - ("0qvjc3fhk6jg2c3g6mymmnslg1rkkxmv9gi3whf2bc5mzfgyc5zw" "7efe92bd7780" "ja-JP-mac") - ("0zfiwwz0axbd219ar32c7a6b8h816sf04ajx6jl74s5kyij79y82" "4c1fe3a18da9" "ka") - ("1aiik4758r5df76q2a132y5fjdjrsxshjylk7irwsr7yy0c7f63g" "acdf76048aa0" "kab") - ("0icxh4sgv6m1yykycb9d9c43k3r6w02f9c6jr04wm8hvqq5icfl5" "9b418ff7936b" "kk") - ("1cqlhggf46lr7w399k7qb7a1hc56f32w1dy26i2racpppzza5plc" "9771ada0b5f8" "km") - ("0p04irnb7x7y37m6lz388x9dynn8rnk000avpp296barajnhs5i8" "645aa37a2112" "kn") - ("1lbc1fxr5i0ccymlsd8axz3633cqggg5k8ak5yqwi704g7kvv9g2" "1cd68952d119" "ko") - ("11b55bxg73zqfdn5gy9nn5imab2mv0hxr603whggp7vymllgb7kb" "26bb83959bfe" "lij") - ("15jsijm6d26i0105gz0f7sh2yh2v4pmw4j95cwkdrb1d8m935jlz" "b9829891f153" "lt") - ("0liwwv13fgyw97nizhsyy53xrbf8jks5ics7qkkxfccawjrg5rlb" "e5f09d03d959" "lv") - ("0w420yf3hdnl7dp9mn9ghc20cq79k24fn9adn3syk723ppl6mkb0" "7884845e94f3" "mk") - ("13wkr7rgqsv9w3d9w7k8lnxdzgfixsq4bmc27zsyc770l6062ml6" "030db7412202" "mr") - ("06nsadcnxx0ssdp67x47dj9crihn1ycgd5mwvn5m7lkb97r4ch9f" "40a7703e875c" "ms") - ("0mlnjdzck6dp9p59ajj3sr63r36fn0qi8r9scrqrqcisgfclw9sg" "daca40056531" "my") - ("0z1hgx9d5i9w20f9k9azzng1y3lmm5d6hdjkj7rf6r5710bhhzh5" "664bd049e105" "nb-NO") - ("1466qvrs13g2iix1k35cknb2pia9b66li2ncvdyqf0jsd92z9k8x" "eaa6ae781ba0" "ne-NP") - ("0jgmz2lkzj0aspd9mabygzic6li5s2b25y0r6vjg8mv3jm5pi86j" "5ef8f1c9739e" "nl") - ("1m46x0h20vdfbzjxlz0ac43dbaq40xnyldr2yzbf7pk5di9pzxa6" "f08e15466d5d" "nn-NO") - ("0r3zvihqh6iya3z1qm7if0m3zfgf81s9qp7x7qc701h2q357wkgf" "6712c0e12ec2" "oc") - ("102j89jm28c223yhhkrj76xxj4kmy58hcs2r0jn15xa1qkqv1fdk" "8f36cc819e00" "pa-IN") - ("1j9za6s0i46abn8dsrlkpck3qxxw35rhfcg1xs1vp8sc4ckg8qwi" "c3b0c1c02b94" "pl") - ("1k9lbsvckpwl4xax8kxp5yxsfkspq2mhqm77jh5nl9aw88dsn55b" "cc32bf9630fe" "pt-BR") - ("0f0jyvbn2sa5m66wqdzh4607g4gd0270xq37ipd9ls52b4764bd8" "5478d7242086" "pt-PT") - ("19znkkialh1d4np7qcp80xkagrf1j2xah2s1xxzsh854p3d30zs7" "dd934a76fb01" "rm") - ("1xn26r8g8zzkb5myfgmnjbk8k4i0brkvbrvnhp7k5nkrnsin25di" "d57ab3dee73d" "ro") - ("04rhkxlmpp5pyzw85ldbfkmiigqr2p9y5cbns5dqs6sz1633ccxp" "7aea98f33a20" "ru") - ("1zzkkxl7ayxh5gx9snyvp5czflsvi77hp48li613h3c2fii4n9qk" "7c986f4b5044" "sco") - ("1219i0ghhqj3s1i0rm68jjkvivh6y40938wav7z4ifck527sq6r1" "bc9e55d4e3ea" "si") - ("05i5p3n3a6hgl6rf10yjs4vag7y3rn2jwgxsddcdcqiv6405zn81" "8814afd7f67e" "sk") - ("1wcqdbm1py1ldq6cj2g201m715nql79r6szr71jvrxacb711c62a" "20013dc06e96" "sl") - ("0g2izkaa4ipwgwyhy77ciyrxxpf4pxzj9mjqvxriy5prmkhm3zjs" "d86d5d2b6eef" "son") - ("1cc99m6srjg8698dkc3il70crby0mdv43v3ijwy069k4w50hyjjg" "49bb5fae5d9b" "sq") - ("13kfssq4fhq9mb36as6sxiaffl17qyg1wdw8kpz3ilqm86bsjrgl" "d6a0ab79b06f" "sr") - ("1wx9snbm0431q97i0q0nv4wbsqcv9nhllwfr88crlp7bfj5w8czw" "4bab04993da3" "sv-SE") - ("0laglkfl8ml0ip5vmm3z2q790hgwax9gfqwq3wm68a2nnsyck8fw" "4b3316c4aa48" "szl") - ("15pnlic4q7m48y0mc5yh8w5yscjwzx0mmfrbj3f2b9jxxa44nx4h" "48c7aab86db8" "ta") - ("16qar5y0wns75ryi8bfv7yln3mjsyn7qi4345zcniz3ydgkczh46" "7bbb3dac8f47" "te") - ("112g7x8h0qz16r5faam386x4a0rgwd4zy02d5agmg9m0kbficdfx" "009fd0852454" "th") - ("1l80kh9byqxnz5vkz357rb39g4y9sgn9pr0v29ywp6d009img1qg" "dad9caecd7a9" "tl") - ("1nalvjlxxsa9wldhhdb93bgfc7dl084xayh7i7mgg93yjgrym93x" "0c48082d37cd" "tr") - ("0wkxqcfgsra2ljws28kiwajv73w9aa8drsc4fqlg9krbicnjl2n8" "f6d105faedcc" "trs") - ("18jf4ysrfv3635fyxc1vwr970dr2r05bl3h8v599pwp2g7jzyjpm" "e1011388a55e" "uk") - ("1ihmksjsz54yii23qda5iv8cxrj9144afy75hzhvfi6m182kj4h8" "c4e927eab511" "ur") - ("0d42dhfa2vcw24wsvwf95pw20np0pz8c0is6p4307n981n8s207y" "7063df917cb3" "uz") - ("04khnkrg8css55hyna01jqay9c2ppxk5znbx2zj9i25knhvvx1lq" "1753054e6ab8" "vi") - ("0fi5kxn78xp7s15svkqlf4748j4pzxh941nm52n6kbbrhyi3qcqn" "93bc595dc32e" "xh") - ("0jg676vd37wqgzjnm0yynj7xrvm6fsgdwg296h78wnyc33zc4ads" "edd4e468bc31" "zh-CN") - ("1y4wldm3z95mfjlficp994jyqg0lj07wi35b79dy1s8ljy3jilil" "0bad1f7d2b2d" "zh-TW"))) - -;; XXXX: Workaround 'snippet' limitations. -(define computed-origin-method (@@ (guix packages) computed-origin-method)) - -(define %icecat-custom-version "102.7.0-guix0-preview1") -(define %icecat-custom-build-id "20230117000000") ;must be of the form YYYYMMDDhhmmss - -;; 'icecat-source' is a "computed" origin that generates an IceCat tarball -;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' -;; script from the upstream IceCat project. -(define-public icecat-custom-source - (let* ((base-version (first (string-split %icecat-custom-version #\-))) - - (major-version (first (string-split base-version #\.))) - (minor-version (second (string-split base-version #\.))) - (sub-version (third (string-split base-version #\.))) - - (upstream-firefox-version (string-append base-version "esr")) - (upstream-firefox-source - (origin - (method url-fetch) - (uri (string-append - "https://ftp.mozilla.org/pub/firefox/releases/" - upstream-firefox-version "/source/" - "firefox-" upstream-firefox-version ".source.tar.xz")) - (sha256 - (base32 - "1ahl66x8chnsz80capqa5ivyrqhc50s91zrcgz1jxd7w2ws61957")))) - - (upstream-icecat-base-version "102.7.0") ; maybe older than base-version - ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "7f76da3cfd5d04fa38d894f6ea6ac5f2fd0ea837") - (gnuzilla-source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.savannah.gnu.org/gnuzilla.git") - (commit gnuzilla-commit))) - (file-name (git-file-name "gnuzilla" - ;;upstream-icecat-base-version - (string-take gnuzilla-commit 8))) - (sha256 - (base32 - "19i66qvwzgllgnlw270bxphymybjj1qb5hdznqi4i2dcgpcrq77l")))) - - ;; 'search-patch' returns either a valid file name or #f, so wrap it - ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. - (makeicecat-patch - (local-file (assume-valid-file-name - (search-patch "icecat-makeicecat.patch"))))) - - (origin - (method computed-origin-method) - (file-name (string-append "icecat-" %icecat-custom-version ".tar.xz")) - (sha256 #f) - (uri - (delay - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - (let ((firefox-dir - (string-append "firefox-" #$base-version)) - (icecat-dir - (string-append "icecat-" #$%icecat-custom-version))) - - (set-path-environment-variable - "PATH" '("bin") - (list #+rename - #+python - #+(canonical-package bash) - #+(canonical-package coreutils) - #+(canonical-package findutils) - #+(canonical-package patch) - #+(canonical-package xz) - #+(canonical-package sed) - #+(canonical-package grep) - #+(canonical-package bzip2) - #+(canonical-package gzip) - #+(canonical-package tar))) - - (set-path-environment-variable - "PYTHONPATH" - (list #+(format #f "lib/python~a/site-packages" - (version-major+minor - (package-version python)))) - '#+(cons python-jsonschema - (map second - (package-transitive-propagated-inputs - python-jsonschema)))) - - ;; Needed by the 'makeicecat' script. - (setenv "RENAME_CMD" "rename") - - ;; We copy the gnuzilla source directory because it is - ;; read-only in 'gnuzilla-source', and the makeicecat script - ;; uses "cp -a" to copy parts of it and assumes that the - ;; copies will be writable. - (copy-recursively #+gnuzilla-source "/tmp/gnuzilla" - #:log (%make-void-port "w")) - - (with-directory-excursion "/tmp/gnuzilla" - (make-file-writable "makeicecat") - (invoke "patch" "--force" "--no-backup-if-mismatch" - "-p1" "--input" #+makeicecat-patch) - (patch-shebang "makeicecat") - (substitute* "makeicecat" - (("^readonly FFMAJOR=(.*)" all ffmajor) - (unless (string=? #$major-version - (string-trim-both ffmajor)) - ;; The makeicecat script cannot be expected to work - ;; properly on a different version of Firefox, even if - ;; no errors occur during execution. - (error "makeicecat major version mismatch")) - (string-append "readonly FFMAJOR=" #$major-version "\n")) - (("^readonly FFMINOR=.*") - (string-append "readonly FFMINOR=" #$minor-version "\n")) - (("^readonly FFSUB=.*") - (string-append "readonly FFSUB=" #$sub-version "\n")) - (("^readonly DATADIR=.*") - "readonly DATADIR=/tmp/gnuzilla/data\n") - (("^readonly SOURCEDIR=.*") - (string-append "readonly SOURCEDIR=" icecat-dir "\n")) - (("/bin/sed") - #+(file-append (canonical-package sed) "/bin/sed")))) - - (format #t "Unpacking upstream firefox tarball...~%") - (force-output) - (invoke "tar" "xf" #+upstream-firefox-source) - (rename-file firefox-dir icecat-dir) - - (with-directory-excursion icecat-dir - (format #t "Populating l10n directory...~%") - (force-output) - (mkdir "l10n") - (with-directory-excursion "l10n" - (for-each - (lambda (locale-dir) - (let ((locale - (string-drop (basename locale-dir) - (+ 32 ; length of hash - (string-length "-mozilla-locale-custom-"))))) - (format #t " ~a~%" locale) - (force-output) - (copy-recursively locale-dir locale - #:log (%make-void-port "w")) - (for-each make-file-writable (find-files locale)) - (with-directory-excursion locale - (when (file-exists? ".hgtags") - (delete-file ".hgtags")) - (mkdir-p "browser/chrome/browser/preferences") - (call-with-output-file - "browser/chrome/browser/preferences/advanced-scripts.dtd" - (lambda (port) #f))))) - '#+all-mozilla-locale-customs) - (copy-recursively #+mozilla-compare-locales-custom - "compare-locales" - #:log (%make-void-port "w")) - (delete-file "compare-locales/.gitignore") - (delete-file "compare-locales/.hgignore") - (delete-file "compare-locales/.hgtags"))) - - (format #t "Running makeicecat script...~%") - (force-output) - (invoke "bash" "/tmp/gnuzilla/makeicecat") - - (format #t "Packing IceCat source tarball...~%") - (force-output) - (setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args))) - (invoke "tar" "cfa" #$output - ;; Avoid non-determinism in the archive. We set the - ;; mtime of files in the archive to early 1980 because - ;; the build process fails if the mtime of source - ;; files is pre-1980, due to the creation of zip - ;; archives. - "--mtime=@315619200" ; 1980-01-02 UTC - "--owner=root:0" - "--group=root:0" - "--sort=name" - icecat-dir))))))))) - -(define-public icecat-custom - (package - (name "icecat-custom") - (version %icecat-custom-version) - (source icecat-custom-source) - (build-system gnu-build-system) - (inputs - (list alsa-lib - bzip2 - cups - dbus-glib - gdk-pixbuf - glib - gtk+ - gtk+-2 - ;; UNBUNDLE-ME! graphite2 - cairo - pango - freetype - font-dejavu - ;; UNBUNDLE-ME! harfbuzz - libcanberra - libgnome - libjpeg-turbo - libpng-apng - ;; UNBUNDLE-ME! libogg - ;; UNBUNDLE-ME! libtheora ; wants theora-1.2, not yet released - ;; UNBUNDLE-ME! libvorbis - libxft - libevent - libxinerama - libxscrnsaver - libxcomposite - libxt - libffi - ffmpeg - libvpx - icu4c ; TODO: Change to 'icu4c' when its version is >= 71. - pixman - pulseaudio - mesa - pciutils - mit-krb5 - hunspell - libnotify - ;; See - ;; and related comments in the 'remove-bundled-libraries' phase. - ;; UNBUNDLE-ME! nspr - ;; UNBUNDLE-ME! nss - shared-mime-info - sqlite - eudev - unzip - zip - zlib)) - (native-inputs - ;; The following patches are specific to the Guix packaging of IceCat, - ;; and therefore we prefer to leave them out of 'source', which should be - ;; a tarball suitable for compilation on any system that IceCat supports. - ;; (Bug fixes and security fixes, however, should go in 'source'). - (list - ;; XXX TODO: Adapt these patches to IceCat 102. - ;; ("icecat-avoid-bundled-libraries.patch" - ;; ,(search-patch "icecat-avoid-bundled-libraries.patch")) - ;; ("icecat-use-system-graphite2+harfbuzz.patch" - ;; ,(search-patch "icecat-use-system-graphite2+harfbuzz.patch")) - ;; ("icecat-use-system-media-libs.patch" - ;; ,(search-patch "icecat-use-system-media-libs.patch")) - rust - `(,rust "cargo") - rust-cbindgen-0.23 - llvm - clang - perl - node - python-wrapper - yasm - nasm ; XXX FIXME: only needed on x86_64 and i686 - pkg-config - m4 - which)) - (arguments - (list - #:tests? #f ;not worth the cost - - ;; Some dynamic lib was determined at runtime, so rpath check may fail. - #:validate-runpath? #f - - #:configure-flags - #~(list - "--enable-application=browser" - "--with-distribution-id=org.gnu" - "--enable-geckodriver" - ;; Do not require addons in the global app or system directories to - ;; be signed by Mozilla. - "--with-unsigned-addon-scopes=app,system" - "--allow-addon-sideload" - - "--enable-pulseaudio" - - "--disable-tests" - "--disable-updater" - "--disable-crashreporter" - "--disable-eme" - - ;; Building with debugging symbols takes ~5GiB, so disable it. - "--disable-debug" - "--disable-debug-symbols" - - "--enable-rust-simd" - "--enable-release" - "--enable-optimize" - "--enable-strip" - "--disable-elf-hack" - - ;; Clang is needed to build Stylo, Mozilla's new CSS engine. We must - ;; specify the clang paths manually, because otherwise the Mozilla - ;; build system looks in the directories returned by llvm-config - ;; --bindir and llvm-config --libdir, which return paths in the llvm - ;; package where clang is not found. - (string-append "--with-clang-path=" - (search-input-file %build-inputs "bin/clang")) - (string-append "--with-libclang-path=" - (dirname (search-input-file %build-inputs - "lib/libclang.so"))) - - ;; Hack to work around missing "unofficial" branding in icecat. - "--enable-official-branding" - - ;; TODO: Add support for wasm sandboxed libraries. - "--without-wasm-sandboxed-libraries" - - ;; Avoid bundled libraries. - "--with-system-jpeg" ;must be libjpeg-turbo - "--with-system-png" ;must be libpng-apng - "--with-system-zlib" - ;; UNBUNDLE-ME! "--with-system-bz2" - ;; UNBUNDLE-ME! "--with-system-libevent" - ;; UNBUNDLE-ME! "--with-system-ogg" - ;; UNBUNDLE-ME! "--with-system-vorbis" - ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released - ;; UNBUNDLE-ME! "--with-system-libvpx" - "--with-system-icu" - - ;; See - ;; and related comments in the - ;; 'remove-bundled-libraries' phase below. - ;; UNBUNDLE-ME! "--with-system-nspr" - ;; UNBUNDLE-ME! "--with-system-nss" - - ;; UNBUNDLE-ME! "--with-system-harfbuzz" - ;; UNBUNDLE-ME! "--with-system-graphite2" - "--enable-system-pixman" - "--enable-system-ffi" - ;; UNBUNDLE-ME! "--enable-system-sqlite" - ) - - #:imported-modules %cargo-utils-modules ;for `generate-all-checksums' - - #:modules `((ice-9 ftw) - (ice-9 match) - (srfi srfi-1) - (srfi srfi-26) - (rnrs bytevectors) - (rnrs io ports) - (guix elf) - (guix build gremlin) - ,@%gnu-build-system-modules) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'apply-guix-specific-patches - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((patch (search-input-file inputs "bin/patch"))) - (for-each (match-lambda - ((label . file) - (when (and (string-prefix? "icecat-" label) - (string-suffix? ".patch" label)) - (format #t "applying '~a'...~%" file) - (invoke patch "--force" "--no-backup-if-mismatch" - "-p1" "--input" file)))) - (or native-inputs inputs))))) - (add-after 'apply-guix-specific-patches 'remove-bundled-libraries - (lambda _ - ;; Remove bundled libraries that we don't use, since they may - ;; contain unpatched security flaws, they waste disk space and - ;; memory, and may cause confusion. - (for-each (lambda (file) - (format #t "deleting '~a'...~%" file) - (delete-file-recursively file)) - '( ;; FIXME: Removing the bundled icu breaks configure. - ;; * The bundled icu headers are used in some places. - ;; * The version number is taken from the bundled copy. - ;;"intl/icu" - ;; - ;; FIXME: A script from the bundled nspr is used. - ;;"nsprpub" - ;; - ;; FIXME: With the update to IceCat 60, using system NSS - ;; broke certificate validation. See - ;; . For now, we use - ;; the bundled NSPR and NSS. TODO: Investigate, - ;; and try to unbundle these libraries again. - ;; UNBUNDLE-ME! "security/nss" - ;; - ;; TODO: Use more system media libraries. See: - ;; - ;; * libtheora: esr60 wants v1.2, not yet released. - ;; * soundtouch: avoiding the bundled library would - ;; result in some loss of functionality. There's - ;; also an issue with exception handling - ;; configuration. It seems that this is needed in - ;; some moz.build: - ;; DEFINES['ST_NO_EXCEPTION_HANDLING'] = 1 - ;; * libopus - ;; * speex - ;; - "modules/freetype2" - ;; "media/libjpeg" ; needed for now, because media/libjpeg/moz.build is referenced from config/external/moz.build - ;; UNBUNDLE-ME! "modules/zlib" - ;; UNBUNDLE-ME! "ipc/chromium/src/third_party/libevent" - ;; UNBUNDLE-ME! "media/libvpx" - ;; UNBUNDLE-ME! "media/libogg" - ;; UNBUNDLE-ME! "media/libvorbis" - ;; UNBUNDLE-ME! "media/libtheora" ; wants theora-1.2, not yet released - ;; UNBUNDLE-ME! "media/libtremor" - ;; UNBUNDLE-ME! "gfx/harfbuzz" - ;; UNBUNDLE-ME! "gfx/graphite2" - "js/src/ctypes/libffi" - ;; UNBUNDLE-ME! "db/sqlite3" - )))) - (add-after 'remove-bundled-libraries 'fix-ffmpeg-runtime-linker - (lambda* (#:key inputs #:allow-other-keys) - ;; Arrange to load libavcodec.so by its absolute file name. - (substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp" - (("libavcodec\\.so") - (search-input-file inputs "lib/libavcodec.so"))))) - (add-after 'fix-ffmpeg-runtime-linker 'build-sandbox-whitelist - (lambda* (#:key inputs #:allow-other-keys) - (define (runpath-of lib) - (call-with-input-file lib - (compose elf-dynamic-info-runpath - elf-dynamic-info - parse-elf - get-bytevector-all))) - (define (runpaths-of-input label) - (let* ((dir (string-append (assoc-ref inputs label) "/lib")) - (libs (find-files dir "\\.so$"))) - (append-map runpath-of libs))) - ;; Populate the sandbox read-path whitelist as needed by ffmpeg. - (let* ((whitelist - (map (cut string-append <> "/") - (delete-duplicates - `(,(string-append (assoc-ref inputs "shared-mime-info") - "/share/mime") - ,(string-append (assoc-ref inputs "font-dejavu") - "/share/fonts") - "/run/current-system/profile/share/fonts" - ,@(append-map runpaths-of-input - '("mesa" "ffmpeg")))))) - (whitelist-string (string-join whitelist ",")) - (port (open-file "browser/app/profile/icecat.js" "a"))) - (format #t "setting 'security.sandbox.content.read_path_whitelist' to '~a'~%" - whitelist-string) - (format port "~%pref(\"security.sandbox.content.read_path_whitelist\", ~S);~%" - whitelist-string) - (close-output-port port)))) - (add-after 'patch-source-shebangs 'patch-cargo-checksums - (lambda _ - (use-modules (guix build cargo-utils)) - (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) - (for-each (lambda (file) - (format #t "patching checksums in ~a~%" file) - (substitute* file - (("^checksum = \".*\"") - (string-append "checksum = \"" null-hash "\"")))) - (find-files "." "Cargo.lock$")) - (for-each generate-all-checksums - '("services" - "js" - "third_party/rust" - "dom/media" - "dom/webauthn" - "toolkit" - "gfx" - "storage" - "modules" - "xpcom/rust" - "media" - "mozglue/static/rust" - "netwerk" - "remote" - "intl" - "servo" - "security/manager/ssl" - "build"))))) - (add-after 'patch-cargo-checksums 'remove-cargo-frozen-flag - (lambda _ - ;; Remove --frozen flag from cargo invokation, otherwise it'll - ;; complain that it's not able to change Cargo.lock. - ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373 - (substitute* "build/RunCbindgen.py" - (("\"--frozen\",") "")))) - (delete 'bootstrap) - (replace 'configure - ;; configure does not work followed by both "SHELL=..." and - ;; "CONFIG_SHELL=..."; set environment variables instead - (lambda* (#:key outputs configure-flags #:allow-other-keys) - (let* ((bash (which "bash")) - (abs-srcdir (getcwd)) - (flags `(,(string-append "--prefix=" #$output) - ,(string-append "--with-l10n-base=" - abs-srcdir "/l10n") - ,@configure-flags))) - (setenv "SHELL" bash) - (setenv "CONFIG_SHELL" bash) - - (setenv "AR" "llvm-ar") - (setenv "NM" "llvm-nm") - (setenv "CC" "clang") - (setenv "CXX" "clang++") - (setenv "LDFLAGS" (string-append "-Wl,-rpath=" - #$output "/lib/icecat")) - - (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system") - (setenv "MOZ_BUILD_DATE" #$%icecat-custom-build-id) ; avoid timestamp - - ;; XXX TODO: Fix this to work on systems other than x86_64-linux. - (setenv "GUIX_PYTHONPATH" - (string-append (getcwd) - "/obj-x86_64-pc-linux-gnu/_virtualenvs/build")) - - (mkdir ".mozbuild") - (setenv "MOZBUILD_STATE_PATH" - (string-append (getcwd) "/.mozbuild")) - - (format #t "build directory: ~s~%" (getcwd)) - (format #t "configure flags: ~s~%" flags) - - (call-with-output-file "mozconfig" - (lambda (port) - (for-each (lambda (flag) - (format port "ac_add_options ~a\n" flag)) - flags))) - - (invoke "./mach" "configure")))) - (replace 'build - (lambda* (#:key (make-flags '()) (parallel-build? #t) - #:allow-other-keys) - (apply invoke "./mach" "build" - ;; mach will use parallel build if possible by default - `(,@(if parallel-build? - '() - '("-j1")) - ,@make-flags)))) - (add-after 'build 'neutralise-store-references - (lambda _ - ;; Mangle the store references to compilers & other build tools in - ;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64. - (let* ((obj-dir (match (scandir "." (cut string-prefix? "obj-" <>)) - ((dir) dir))) - (file (string-append - obj-dir - "/dist/bin/chrome/toolkit/content/global/buildconfig.html"))) - (substitute* file - (("[0-9a-df-np-sv-z]{32}" hash) - (string-append (string-take hash 8) - "" - (string-drop hash 8))))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "./mach" "install") - ;; The geckodriver binary is not installed by the above, for some - ;; reason. Use 'find-files' to avoid having to deal with the - ;; system/architecture-specific file name. - (install-file (first (find-files "." "geckodriver")) - (string-append #$output "/bin")))) - (add-after 'install 'wrap-program - (lambda* (#:key inputs #:allow-other-keys) - (let* ((lib (string-append #$output "/lib")) - (gtk #$(this-package-input "gtk+")) - (gtk-share (string-append gtk "/share")) - (ld-libs '#$(map (lambda (label) - (file-append (this-package-input label) "/lib")) - '("libpng-apng" - "libxscrnsaver" - "mesa" - "pciutils" - "mit-krb5" - "eudev" - "pulseaudio" - ;; For the integration of native notifications - "libnotify")))) - (wrap-program (car (find-files lib "^icecat$")) - `("XDG_DATA_DIRS" prefix (,gtk-share)) - ;; The following line is commented out because the icecat - ;; package on guix has been observed to be unstable when - ;; using wayland, and the bundled extensions stop working. - ;; `("MOZ_ENABLE_WAYLAND" = ("1")) - `("LD_LIBRARY_PATH" prefix ,ld-libs))))) - (add-after 'wrap-program 'install-desktop-entry - (lambda _ - ;; Install the '.desktop' file. - (let* ((desktop-file "taskcluster/docker/icecat-snap/icecat.desktop") - (applications (string-append #$output "/share/applications"))) - (substitute* desktop-file - (("^Exec=icecat") (string-append "Exec=" #$output "/bin/icecat")) - (("IceCat") "GNU IceCat") - (("Icon=.*") "Icon=icecat\n") - (("NewWindow") "new-window") - (("NewPrivateWindow") "new-private-window") - (("StartupNotify=true") - "StartupNotify=true\nStartupWMClass=Navigator")) - (install-file desktop-file applications)))) - (add-after 'install-desktop-entry 'install-icons - (lambda _ - (with-directory-excursion "browser/branding/official" - (for-each - (lambda (file) - (let* ((size (string-filter char-numeric? file)) - (icons (string-append #$output "/share/icons/hicolor/" - size "x" size "/apps"))) - (mkdir-p icons) - (copy-file file (string-append icons "/icecat.png")))) - '("default16.png" "default22.png" "default24.png" - "default32.png" "default48.png" "content/icon64.png" - "mozicon128.png" "default256.png")))))))) - (home-page "https://www.gnu.org/software/gnuzilla/") - (synopsis "Entirely free browser derived from Mozilla Firefox") - (description - "IceCat is the GNU version of the Firefox browser. It is entirely free -software, which does not recommend non-free plugins and addons. It also -features built-in privacy-protecting features. This package also includes the -@command{geckodriver} command, which can be useful for automated web -testing. - -WARNING: IceCat 102 has not yet been released by the upstream IceCat project. -This is a preview release, and does not currently meet the privacy-respecting -standards of the IceCat project.") - (license license:mpl2.0) ;and others, see toolkit/content/license.html - (properties - `((ftp-directory . "/gnu/gnuzilla") - (cpe-name . "firefox_esr") - (cpe-version . ,(first (string-split version #\-))))))) diff --git a/packages/defs/icecat-makeicecat.patch b/packages/defs/icecat-makeicecat.patch deleted file mode 100644 index c46cb27..0000000 --- a/packages/defs/icecat-makeicecat.patch +++ /dev/null @@ -1,51 +0,0 @@ -Make some of the changes needed to the 'makeicecat' script, to allow it to run -in a snippet without network access. After this patch is applied, some -additional changes will be made using 'substitute*'. - -diff --git a/makeicecat b/makeicecat -index bf2b7a6..bc3b19b 100755 ---- a/makeicecat -+++ b/makeicecat -@@ -58,7 +58,7 @@ readonly SOURCEDIR=icecat-${FFVERSION} - # debug/shell options - readonly DEVEL=0 - set -euo pipefail --(( DEVEL )) && set -x -+set -x - - - ############################################################################### -@@ -459,7 +459,7 @@ configure_search() - sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json - - # Process various JSON pre-configuration dumps. -- python3 ../../tools/process-json-files.py . browser/components/extensions/schemas/ -+ python3 "${DATADIR}"/../tools/process-json-files.py . browser/components/extensions/schemas/ - } - - configure_mobile() -@@ -855,12 +855,12 @@ finalize_sourceball() - # entry point - ############################################################################### - --validate_env || exit 1 --prepare_env --fetch_source --verify_sources --extract_sources --fetch_l10n -+# validate_env || exit 1 -+# prepare_env -+# fetch_source -+# verify_sources -+# extract_sources -+# fetch_l10n - apply_patches - configure - configure_search -@@ -872,4 +872,4 @@ prepare_macos_packaging - configure_extensions - configure_onboarding - apply_bugfixes --finalize_sourceball -+# finalize_sourceball diff --git a/packages/defs/icecat-use-system-graphite2+harfbuzz.patch b/packages/defs/icecat-use-system-graphite2+harfbuzz.patch deleted file mode 100644 index 776b5f3..0000000 --- a/packages/defs/icecat-use-system-graphite2+harfbuzz.patch +++ /dev/null @@ -1,226 +0,0 @@ -Allow building against system-wide graphite2/harfbuzz. -See -Based on: - https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-bug847568?revision=472833&view=co -Modified for use with patch -p1, and to apply cleanly to GNU IceCat. - ---- icecat-60.5.0/config/system-headers.mozbuild -+++ icecat-60.5.0/config/system-headers.mozbuild -@@ -1311,6 +1311,19 @@ - 'pixman.h', - ] - -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ system_headers += [ -+ 'graphite2/Font.h', -+ 'graphite2/Segment.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ system_headers += [ -+ 'harfbuzz/hb-glib.h', -+ 'harfbuzz/hb-ot.h', -+ 'harfbuzz/hb.h', -+ ] -+ - if CONFIG['MOZ_SYSTEM_LIBVPX']: - system_headers += [ - 'vpx_mem/vpx_mem.h', ---- icecat-60.5.0/dom/base/moz.build -+++ icecat-60.5.0/dom/base/moz.build -@@ -474,6 +474,9 @@ - if CONFIG['MOZ_X11']: - CXXFLAGS += CONFIG['TK_CFLAGS'] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - GENERATED_FILES += [ - 'PropertyUseCounterMap.inc', - 'UseCounterList.h', ---- icecat-60.5.0/gfx/graphite2/moz-gr-update.sh -+++ icecat-60.5.0/gfx/graphite2/moz-gr-update.sh -@@ -1,6 +1,7 @@ - #!/bin/bash - - # Script used to update the Graphite2 library in the mozilla source tree -+# and bump version for --with-system-graphite2 - - # This script lives in gfx/graphite2, along with the library source, - # but must be run from the top level of the mozilla-central tree. -@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla - #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; - -+# chase version for --with-system-graphite2 -+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ -+ if /GR2_VERSION_REQUIRE/" old-configure.in -+ - # summarize what's been touched - echo Updated to $RELEASE. - echo Here is what changed in the gfx/graphite2 directory: - echo - --hg stat gfx/graphite2 -+hg stat old-configure.in gfx/graphite2 - - echo - echo If gfx/graphite2/src/files.mk has changed, please make corresponding ---- icecat-60.5.0/gfx/moz.build -+++ icecat-60.5.0/gfx/moz.build -@@ -10,6 +10,12 @@ with Files('**'): - if CONFIG['MOZ_TREE_CAIRO']: - DIRS += ['cairo'] - -+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ DIRS += ['graphite2/src' ] -+ -+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ DIRS += ['harfbuzz/src'] -+ - DIRS += [ - '2d', - 'ycbcr', -@@ -18,8 +24,6 @@ DIRS += [ - 'qcms', - 'gl', - 'layers', -- 'graphite2/src', -- 'harfbuzz/src', - 'ots/src', - 'thebes', - 'ipc', ---- icecat-60.5.0/gfx/skia/generate_mozbuild.py -+++ icecat-60.5.0/gfx/skia/generate_mozbuild.py -@@ -148,6 +148,9 @@ - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] ---- icecat-60.5.0/gfx/skia/moz.build -+++ icecat-60.5.0/gfx/skia/moz.build -@@ -822,6 +822,9 @@ - '-Wno-unused-private-field', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): - CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] - CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] ---- icecat-60.5.0/gfx/thebes/moz.build -+++ icecat-60.5.0/gfx/thebes/moz.build -@@ -272,7 +272,13 @@ - - LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES'] - --DEFINES['GRAPHITE2_STATIC'] = True -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS'] -+else: -+ DEFINES['GRAPHITE2_STATIC'] = True -+ -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] - - if CONFIG['CC_TYPE'] == 'clang': - # Suppress warnings from Skia header files. ---- icecat-60.5.0/intl/unicharutil/util/moz.build -+++ icecat-60.5.0/intl/unicharutil/util/moz.build -@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [ - 'nsUnicodeProperties.cpp', - ] - -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] -+ - FINAL_LIBRARY = 'xul' ---- icecat-60.5.0/netwerk/dns/moz.build -+++ icecat-60.5.0/netwerk/dns/moz.build -@@ -76,3 +76,6 @@ - - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CXXFLAGS += ['-Wno-error=shadow'] -+ -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ---- icecat-60.5.0/old-configure.in -+++ icecat-60.5.0/old-configure.in -@@ -3971,6 +3971,27 @@ - AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) - - dnl ======================================================== -+dnl Check for graphite2 -+dnl ======================================================== -+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then -+ dnl graphite2.pc has bogus version, check manually -+ _SAVE_CFLAGS=$CFLAGS -+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS" -+ AC_TRY_COMPILE([ #include -+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ -+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \ -+ * 100 + GR2_VERSION_BUGFIX >= \ -+ (major) * 10000 + (minor) * 100 + (bugfix) ) -+ ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,10) -+ #error "Insufficient graphite2 version." -+ #endif -+ ], [], -+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])]) -+ CFLAGS=$_SAVE_CFLAGS -+fi -+ -+dnl ======================================================== - dnl Check for pixman and cairo - dnl ======================================================== - ---- icecat-60.5.0/toolkit/library/moz.build -+++ icecat-60.5.0/toolkit/library/moz.build -@@ -235,6 +235,12 @@ - if CONFIG['MOZ_SYSTEM_PNG']: - OS_LIBS += CONFIG['MOZ_PNG_LIBS'] - -+if CONFIG['MOZ_SYSTEM_GRAPHITE2']: -+ OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_HARFBUZZ']: -+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - ---- icecat-60.5.0/toolkit/moz.configure -+++ icecat-60.5.0/toolkit/moz.configure -@@ -1051,6 +1051,26 @@ - add_old_configure_assignment('FT2_CFLAGS', - ft2_info.cflags) - -+# Graphite2 -+# ============================================================== -+option('--with-system-graphite2', -+ help="Use system graphite2 (located with pkgconfig)") -+ -+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', -+ when='--with-system-graphite2') -+ -+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True)) -+ -+# HarfBuzz -+# ============================================================== -+option('--with-system-harfbuzz', -+ help="Use system harfbuzz (located with pkgconfig)") -+ -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.4', -+ when='--with-system-harfbuzz') -+ -+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) -+ - # Mortar - # ============================================================== - option('--enable-mortar', help='Enable mortar extension') diff --git a/packages/defs/icecat-use-system-media-libs.patch b/packages/defs/icecat-use-system-media-libs.patch deleted file mode 100644 index 00c95fb..0000000 --- a/packages/defs/icecat-use-system-media-libs.patch +++ /dev/null @@ -1,380 +0,0 @@ -Support building with system media libraries. -See - -Based on: - https://svnweb.freebsd.org/ports/head/www/firefox-esr/files/patch-z-bug517422?revision=472833&view=markup - -Changes to files within the bundled libraries are omitted, since those files -are removed from Guix sources. Modified for use with patch -p1, and to apply -cleanly to GNU IceCat. - ---- icecat-60.5.0/build/moz.configure/old.configure -+++ icecat-60.5.0/build/moz.configure/old.configure -@@ -273,7 +273,12 @@ - '--with-system-libvpx', - '--with-system-nspr', - '--with-system-nss', -+ '--with-system-ogg', - '--with-system-png', -+ '--with-system-soundtouch', -+ '--with-system-theora', -+ '--with-system-tremor', -+ '--with-system-vorbis', - '--with-system-zlib', - '--with-thumb', - '--with-thumb-interwork', ---- icecat-60.5.0/config/external/moz.build -+++ icecat-60.5.0/config/external/moz.build -@@ -23,12 +23,21 @@ - - external_dirs += ['modules/xz-embedded'] - --if CONFIG['MOZ_VORBIS']: -+if not CONFIG['MOZ_SYSTEM_OGG']: -+ external_dirs += ['media/libogg'] -+ -+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']: - external_dirs += ['media/libvorbis'] - --if CONFIG['MOZ_TREMOR']: -+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']: - external_dirs += ['media/libtremor'] - -+if not CONFIG['MOZ_SYSTEM_THEORA']: -+ external_dirs += ['media/libtheora'] -+ -+if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ external_dirs += ['media/libsoundtouch'] -+ - if CONFIG['MOZ_WEBM_ENCODER']: - external_dirs += ['media/libmkv'] - -@@ -51,11 +60,8 @@ - 'media/kiss_fft', - 'media/libcubeb', - 'media/libnestegg', -- 'media/libogg', - 'media/libopus', -- 'media/libtheora', - 'media/libspeex_resampler', -- 'media/libsoundtouch', - 'media/mp4parse-rust', - 'media/psshparser' - ] ---- icecat-60.5.0/config/system-headers.mozbuild -+++ icecat-60.5.0/config/system-headers.mozbuild -@@ -1324,6 +1324,28 @@ - 'harfbuzz/hb.h', - ] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ system_headers += [ -+ 'ogg/ogg.h', -+ 'ogg/os_types.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ system_headers += [ -+ 'theora/theoradec.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ system_headers += [ -+ 'vorbis/codec.h', -+ 'vorbis/vorbisenc.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ system_headers += [ -+ 'tremor/ivorbiscodec.h', -+ ] -+ - if CONFIG['MOZ_SYSTEM_LIBVPX']: - system_headers += [ - 'vpx_mem/vpx_mem.h', ---- icecat-60.5.0/dom/media/AudioStream.cpp -+++ icecat-60.5.0/dom/media/AudioStream.cpp -@@ -128,7 +128,9 @@ - : mMonitor("AudioStream"), - mChannels(0), - mOutChannels(0), -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - mTimeStretcher(nullptr), -+#endif - mDumpFile(nullptr), - mState(INITIALIZED), - mDataSource(aSource), -@@ -147,9 +149,11 @@ - if (mDumpFile) { - fclose(mDumpFile); - } -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - if (mTimeStretcher) { - soundtouch::destroySoundTouchObj(mTimeStretcher); - } -+#endif - #if defined(XP_WIN) - if (XRE_IsContentProcess()) { - audio::AudioNotificationReceiver::Unregister(this); -@@ -170,7 +174,11 @@ - nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() { - mMonitor.AssertCurrentThreadOwns(); - if (!mTimeStretcher) { -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ mTimeStretcher = new soundtouch::SoundTouch(); -+#else - mTimeStretcher = soundtouch::createSoundTouchObj(); -+#endif - mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); - mTimeStretcher->setChannels(mOutChannels); - mTimeStretcher->setPitch(1.0); ---- icecat-60.5.0/dom/media/AudioStream.h -+++ icecat-60.5.0/dom/media/AudioStream.h -@@ -15,7 +15,11 @@ - #include "mozilla/TimeStamp.h" - #include "mozilla/UniquePtr.h" - #include "CubebUtils.h" -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "soundtouch/SoundTouch.h" -+#else - #include "soundtouch/SoundTouchFactory.h" -+#endif - - #if defined(XP_WIN) - #include "mozilla/audio/AudioNotificationReceiver.h" -@@ -293,7 +297,11 @@ - uint32_t mChannels; - uint32_t mOutChannels; - AudioClock mAudioClock; -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ nsAutoPtr mTimeStretcher; -+#else - soundtouch::SoundTouch* mTimeStretcher; -+#endif - - // Output file for dumping audio - FILE* mDumpFile; ---- icecat-60.5.0/dom/media/moz.build -+++ icecat-60.5.0/dom/media/moz.build -@@ -327,6 +327,21 @@ - - DEFINES['MOZILLA_INTERNAL_API'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] -+ - if CONFIG['MOZ_ANDROID_HLS_SUPPORT']: - DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True - ---- icecat-60.5.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -+++ icecat-60.5.0/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -@@ -15,9 +15,13 @@ - #include - #endif - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "nsXPCOMPrivate.h" // for XUL_DLL -+#else - // We use a known symbol located in lgpllibs to determine its location. - // soundtouch happens to be always included in lgpllibs - #include "soundtouch/SoundTouch.h" -+#endif - - namespace mozilla { - -@@ -60,6 +64,12 @@ - - sLinkStatus = LinkStatus_FAILED; - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ // We retrieve the path of the XUL library as this is where mozavcodec and -+ // mozavutil libs are located. -+ char* path = -+ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); -+#else - // We retrieve the path of the lgpllibs library as this is where mozavcodec - // and mozavutil libs are located. - PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs"); -@@ -68,6 +78,7 @@ - } - PathString path = GetLibraryFilePathname( - lgpllibsname.get(), (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); -+#endif - if (path.IsEmpty()) { - return false; - } ---- icecat-60.5.0/old-configure.in -+++ icecat-60.5.0/old-configure.in -@@ -2417,6 +2417,111 @@ - fi - fi # COMPILE_ENVIRONMENT - -+dnl ======================================================== -+dnl Check for libogg -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-ogg, -+[ --with-system-ogg Use system libogg (located with pkgconfig)], -+MOZ_SYSTEM_OGG=1, -+MOZ_SYSTEM_OGG=) -+ -+if test -n "$MOZ_SYSTEM_OGG"; then -+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.3) -+ -+ _SAVE_LIBS=$LIBS -+ LIBS="$LIBS $MOZ_OGG_LIBS" -+ AC_CHECK_FUNC(ogg_set_mem_functions, [], -+ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) -+ LIBS=$_SAVE_LIBS -+fi -+ -+AC_SUBST(MOZ_SYSTEM_OGG) -+ -+dnl ======================================================== -+dnl Check for libvorbis -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-vorbis, -+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], -+MOZ_SYSTEM_VORBIS=1, -+MOZ_SYSTEM_VORBIS=) -+ -+if test -n "$MOZ_SYSTEM_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.6) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_VORBIS) -+ -+dnl ======================================================== -+dnl Check for integer-only libvorbis aka tremor -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-tremor, -+[ --with-system-tremor Use system libtremor (located with pkgconfig)], -+MOZ_SYSTEM_TREMOR=1, -+MOZ_SYSTEM_TREMOR=) -+ -+if test -n "$MOZ_SYSTEM_TREMOR"; then -+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_TREMOR) -+ -+dnl ======================================================== -+dnl Check for libtheora -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-theora, -+[ --with-system-theora Use system libtheora (located with pkgconfig)], -+MOZ_SYSTEM_THEORA=1, -+MOZ_SYSTEM_THEORA=) -+ -+if test -n "$MOZ_SYSTEM_THEORA"; then -+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_THEORA) -+ -+dnl ======================================================== -+dnl Check for libSoundTouch -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-soundtouch, -+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], -+MOZ_SYSTEM_SOUNDTOUCH=1, -+MOZ_SYSTEM_SOUNDTOUCH=) -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) -+ -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ _SAVE_CXXFLAGS=$CXXFLAGS -+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" -+ AC_CACHE_CHECK(for soundtouch sample type, -+ ac_cv_soundtouch_sample_type, -+ [AC_TRY_COMPILE([#include -+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES -+ #error soundtouch expects float samples -+ #endif], -+ [], -+ [ac_cv_soundtouch_sample_type=short], -+ [ac_cv_soundtouch_sample_type=float])]) -+ CXXFLAGS=$_SAVE_CXXFLAGS -+ AC_LANG_RESTORE -+ -+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ -+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then -+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) -+ fi -+fi -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) -+fi -+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) -+ - dnl system libvpx Support - dnl ======================================================== - MOZ_ARG_WITH_BOOL(system-libvpx, ---- icecat-60.5.0/toolkit/library/moz.build -+++ icecat-60.5.0/toolkit/library/moz.build -@@ -244,6 +244,21 @@ - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - ---- icecat-60.5.0/xpcom/build/XPCOMInit.cpp -+++ icecat-60.5.0/xpcom/build/XPCOMInit.cpp -@@ -139,7 +139,9 @@ - - #include "mozilla/ipc/GeckoChildProcessHost.h" - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - #include "ogg/ogg.h" -+#endif - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - #if defined(HAVE_STDINT_H) - // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in -@@ -635,10 +637,12 @@ - // this oddness. - mozilla::SetICUMemoryFunctions(); - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - // Do the same for libogg. - ogg_set_mem_functions( - OggReporter::CountingMalloc, OggReporter::CountingCalloc, - OggReporter::CountingRealloc, OggReporter::CountingFree); -+#endif - - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX. diff --git a/shell-authorized-directories b/shell-authorized-directories index e69de29..d1d1f5e 100644 --- a/shell-authorized-directories +++ b/shell-authorized-directories @@ -0,0 +1 @@ +/home/neox/Projets/guix