From 16447da515b013240e700ce4a49d68454a0b37bd Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 28 Sep 2022 23:39:17 +0200 Subject: gnu: icedove: Update to 102.3.0. * gnu/packages/gnuzilla.scm (icedove): Update to 102.3.0. [source]: Use icecat-source again. [arguments]: Remove `--frozen` flag from cargo invokation. Remove `--with-user-appdir` flag (no longer honoured since TB91). Disable WASM sandbox for now (needs more dependencies). [inputs]: Add alsa-lib. Use icu4c-71. [native-inputs]: Update hg-reference link. Use rust@1.59 and rust-cbindgen@0.23. --- gnu/packages/gnuzilla.scm | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b3a301709f..f006e79dc5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1520,12 +1520,12 @@ standards of the IceCat project.") icecat-dir))))))))) ;; Update this together with icecat! -(define %icedove-build-id "20220919000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20220920000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "91.13.1") - (source icecat-91-source) + (version "102.3.0") + (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) (build-system gnu-build-system) @@ -1557,6 +1557,13 @@ standards of the IceCat project.") (for-each generate-all-checksums '("third_party/rust" "toolkit/library/rust"))))) + (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\",") "")))) ;; Fixes issue where each installation directory generates its own profile. ;; See e.g. https://trac.torproject.org/projects/tor/ticket/31457 (add-after 'patch-source-shebangs 'fix-profile-setting @@ -1709,7 +1716,7 @@ standards of the IceCat project.") "ac_add_options --with-system-nspr\n" ;"ac_add_options --with-system-nss\n" "ac_add_options --with-system-zlib\n" - "ac_add_options --with-user-appdir=\\.icedove\n" + "ac_add_options --without-wasm-sandboxed-libraries\n" "mk_add_options MOZ_MAKE_FLAGS=-j" (number->string (parallel-job-count)) "\n")))) (display (getcwd)) @@ -1759,7 +1766,8 @@ standards of the IceCat project.") `("XDG_DATA_DIRS" prefix (,gtk-share)) `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib))))))))) (inputs - (list bzip2 + (list alsa-lib + bzip2 cairo cups dbus-glib @@ -1770,7 +1778,7 @@ standards of the IceCat project.") gtk+ gtk+-2 hunspell - icu4c + icu4c-71 libcanberra libevent libffi @@ -1803,17 +1811,17 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "2f9b465346ceb38b4ab79ccc1bfe8d8ad0bc8743")) + ,(let ((changeset "04f60827c1b53ab86121c7d122d3a8216219ff9f")) (origin (method hg-fetch) (uri (hg-reference - (url "https://hg.mozilla.org/releases/comm-esr91") + (url "https://hg.mozilla.org/releases/comm-esr102") (changeset changeset))) (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "10vsbwlh5imq7iljwzq3r4y80wzsmj6s2gsi1n64l0wmfq2m6ilb"))))) - ("cargo" ,rust "cargo") + "078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09"))))) + ("cargo" ,(force rust-1.59-promise) "cargo") ("clang" ,clang) ("llvm" ,llvm) ("m4" ,m4) @@ -1822,8 +1830,8 @@ standards of the IceCat project.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("rust" ,rust) - ("rust-cbindgen" ,rust-cbindgen-0.19) + ("rust" ,(force rust-1.59-promise)) + ("rust-cbindgen" ,(force rust-cbindgen-0.23-promise)) ("which" ,which) ("yasm" ,yasm))) (home-page "https://www.thunderbird.net") -- cgit v1.2.3 From bb762ac517ff5ab4e55a0efb7e1b534c36c2b7c3 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 28 Sep 2022 23:47:22 +0200 Subject: gnu: icecat: Remove leftovers from version 91. * gnu/packages/gnuzilla.scm (all-mozilla-91-locales, %icecat-91-version, icecat-91-source): Remove variables. --- gnu/packages/gnuzilla.scm | 280 ---------------------------------------------- 1 file changed, 280 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index f006e79dc5..bb285eab70 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1239,286 +1239,6 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define all-mozilla-91-locales - (mozilla-locales - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("0f2lkv79gqf46f74905mab3zwyz1532chxlf9d28s548p1hw6lv9" "8312cd2e0777" "ach") - ("1v5jpmd0b04mizm9pjffp4r9q121vpq3yzkkxcgmrcwj4gc5jb2y" "21bf766c19d8" "af") - ("1fqjiq2la543z5pbbvd9kfs0wdc2phmqjbxascfsak854qy1z9f9" "34b6a4f0790d" "an") - ("0pl6j99xnali25glyr3g9fmj67v9vqmhd9k74i97f8q5n4xmv3ym" "513c3e8dac97" "ar") - ("0d1fbk9jcai19pi8b7i4y4r0gscqi1inr9dbahd6h0xbxfwc0zif" "19ca0cd0d1bf" "ast") - ("08f9b63wxxy28zaimjn1ab9w51bvrarc3pp75s7v6kzm5bk1jwic" "44aa0dad7964" "az") - ("15pksy9bgaxcbcnvvp8jwqnqxvvhq9vnljpai6jlh52yyrsglbwi" "5e4499355167" "be") - ("0gdg84jp1i4il4nc6gwaswdhc4ljbb9inyip7vhkng09v3pmwm0h" "98d006107851" "bg") - ("0i6vl0ag74phj4l38cvds1ds3jjdal1c8d7hy6pf4aqrp4ai32mh" "2ca52cbb680a" "bn") - ("16yavargwq8rhipzpmrrvyh68g3a6disz9g5m8xbhxvixhcsi5fr" "ce92556a0a90" "br") - ("1512dzp394pj66i13nsz76qh6fmjpz7r7fmvk8d0h7pjk0d6n0dy" "1c79dabdb120" "bs") - ("19wg0kbr2ihbn4lscsxg9agz04r8bsih4692vfgb6nyn1z8vx2i0" "a22912c01617" "ca") - ("1ixpzjb7caq1d9c7c044rxg3ymxs3hjw120kq85v004jrrb4d9c6" "34bf3fd631d4" "ca-valencia") - ("1abizdmd1c56syni1aanwwrfvmgzz25fmimbj2324bcw801ma9h0" "e2e4ba2c37bc" "cak") - ("0wgrg2wiz1jcj52nd4zl4shfkjhbngfj6p1gw1ywj266hk8g6pvw" "a60792bff6ff" "cs") - ("132f29111jd2z9yxpakkyri80mi2ggnik6zxaxqrp4vlcrd1fxd2" "66369fcad8c7" "cy") - ("04lpic3cxdj1imcwjkbk81avp9dpa1c9b1zcchrr1a4vyy4yfjpy" "af198d43f7d6" "da") - ("1h0rkwlsqls8k1qi1y68plw6xk0z2c5xc2y4nqywiirl71yz7fi5" "816fcef20c05" "de") - ("11lzdyl1h42zb1x2yxiv3r0wih8jy1gr0gzs5d1isdq53sa9cqnq" "962e5a544415" "dsb") - ("146jgrhl41k6zbxg58hxh1s088padsjz7ny8nm59i9i8d00jpv0a" "e7c49fd88463" "el") - ("1qppr44hdnrb1z1igcd1p0w5sy9vpihzilkl2w44y0v0v9rigppv" "5a0e35b08a48" "en-CA") - ("1v2irfms24cx9g5s6r1glmp2c000wi91axyca1pn37s7c01r0n4b" "72f8c5d8305d" "en-GB") - ("1y0rbbmax1w6jy4jacy27xgy4aqnd43izysw8qjwm0qhhfjvf3xh" "40994fca693d" "eo") - ("0kmjvinqpb3y81mqda1qq8k202aa36as9z1z775745bx6sbvkggz" "6cf3c836995d" "es-AR") - ("06rvd1z3l0r7hwnsnw90i0f5j2ysbv6wd3cl64g0bgifmwjk75hi" "8727dda3935e" "es-CL") - ("0gzw1rn9nzpgcrrc10indnbqqpax87azczrfxv8mn5n56j734hc0" "5351aba49895" "es-ES") - ("0bnmgisxfkb6rb12avhipbsj1yr0dyv56qjj9471gnc2ppq7k3c9" "dd834a4af402" "es-MX") - ("1951975h9w813qxanbk3frjz7c8knzx5rvq9i82j9i6x6a3fh6fi" "1f2150796079" "et") - ("1vkb5rd0k6vh9dbll3fhyzg8rfpkxxkd2rxwf66b8l3hg4fqd7f2" "2911663f4a7c" "eu") - ("1cj9zblfp94h86m7zd762bfmcfz0yxc1q4ra35s4wnnlqajarzwj" "04ec3c3bbe92" "fa") - ("1ininsyzaj7xd8ppmklm3zglgw1i0nhdy43iiyva32hb592zxy4m" "0cf866f9bc4e" "ff") - ("1hc308d71iygarrpliv7pxjz49gxwqg10d0pv8j4sbb2pw39bprl" "04a600fc54a4" "fi") - ("02nl54db9130rg59wmrrnh0z726fg5ir1njfcnhxagb4g5b7s69f" "64a3576df276" "fr") - ("1qbby23qlkxjz3vwlk8pd2w1w4cxdff8cq7j0ipk44mijkxkry0c" "c84177dfa254" "fy-NL") - ("1x23pg36ld5qnrmdn149rkl85ia8lmiqbzcac2bm0iqprnjdszii" "31590cffac56" "ga-IE") - ("005fpyr1lvw23dja3yrzx4y8wdih7vx6ljjpisf4pd3k5zai4x81" "ba4f274ac4a1" "gd") - ("0kdlb5q74n0fl5fxfy873s392kry69dmdl8b4gvqdyh5sy66vsqm" "56b41bdcd401" "gl") - ("0v8r8b0nrk1l4xipzhq16klmh0pinzcrma0s0gyhgzqqli6z7aym" "59e2afb65c08" "gn") - ("1grb1lq1f9p5jxgh9v78jl1wswxmsqxkcssm35l30k6y24pglr0m" "33b4409fb615" "gu-IN") - ("172fg55y8l90ix4c8s5x7f8mg6rc7779p6l852cnnkfqjgqa5a5f" "92f9f8238189" "he") - ("0i52nmg0yv3y1y3rkinxcyh51mgjksk7c3jlc8014801m3zvyxj7" "00090f7a2a3f" "hi-IN") - ("074q8n00yq54kzk632dwbs64r0sygvybbvwpd6hbvfpn38lz8hxf" "6e4a3fdc01f3" "hr") - ("1jxiz8zyxbpnwgk5xkwfxlr5f1zfyc88jcsajy8wcaifdkld3cwn" "7fd9bc25e49d" "hsb") - ("0ca11pmkzyd9ccrnrbmk0jrpcb03k88v4zivxblnxj4w03g0hyhq" "ce3b378ce950" "hu") - ("1yszljbh8f7w6lckfw22jwximy3yhis4430lfynfb8lh9nm0fw59" "c91a4a3e8821" "hy-AM") - ("0hhl8b8szqlhjdxhsa81zmgr303kr0jx5d6rzbi840qwf01h12sz" "4f235acc839e" "ia") - ("063yfk3nz3kignbri7r9sr3jwr5p9yyqc6sckgqs94hx6lvc355p" "fface86a34e4" "id") - ("1qszxkgliall4haaq6v0xayxikq43ddcdsn1d4m1mwyp7gdpbry5" "5978ae767b44" "is") - ("1fsfz9iz5pdd5r9ckdal6grvddchsc4r3r8gn4w6f2bja6vpbs05" "0c7d2a0e1304" "it") - ("1phkw0apiicgbw2nq3g392xncw1v2c4yac595h3nchs4q6rp9pd9" "1c923f3e88b9" "ja") - ("1y4gc4l6g72nphhsw4aqhcl80a7wi9qdy61h66c6jc6h14i7278d" "66f700940cfa" "ja-JP-mac") - ("0iqwj0y19zqcdclnn92z490s1g9vh2qr9gmkyfnpsz69llxidx1j" "49b4a7c6bb2c" "ka") - ("111nm2khff0zxnqqfc68rbi3j0b1nx5r4xai7b8yymyv1i0qbsxd" "4854facbd60b" "kab") - ("12p7lg2p6pcqdlb4bqbz5isxilw2r9vb8344sh8zrvv9cb9jq04f" "d2fda8a1b287" "kk") - ("142vpw9npqgc8b5zcg5cy2lh07s4mg8xfbaymg44fb4j3s6agw88" "3a5a1cae9b93" "km") - ("00v1sd2byj2ksxw1020z142cdlxa7ri2v1rzjrhay9l465bj3k8x" "6ed122b33cac" "kn") - ("1s07yhwzpxj0l5vj5lzbvgw115sjx1g2zgbqca5wln95dds39npl" "49bc07645a47" "ko") - ("1b4brfww0w7x1h3ff19i6xi8xq2cb1hxysilira6yq4rb6vhlmly" "93f04df12616" "lij") - ("1i30my0bbgm9z02rxxi7x4vc69bs3bnjs9l2q6jd8xvs1ga3vc7n" "e1f4e0d87509" "lt") - ("1bjh4xlx6562hxq527cqcn4b5295dsdpwn4c4y5ci902nlh6fc8l" "daea4ba4e7f4" "lv") - ("0vig42slcx6bhpisyc1bnyklr95lbv7vqd1ckiywp5c5qzfa9afi" "0c4ca0f4fc17" "mk") - ("10qfnkqi2snmgvm4vcrmp2489klchv3hn2c4rmkdhi5bilfk42jx" "9be8d5951976" "mr") - ("1bkn8ds3fyz710ck4gg4g5vpv23bi573ssm9xbiyl8y59pvbig9b" "0f44d0bcfda2" "ms") - ("1j9af3axbijn0s8y96310mvgaq5a36m0r3ij550jv5bv52862crj" "ccbf0c4355d6" "my") - ("0lspnp9jn3rrgz3djnmc0qrb6ymigvqnr3fb0jbhmf83r4yfs8z1" "a6cf2c6e3594" "nb-NO") - ("1xp2884m9gqm9gaakc747bd9j55wssrh3qsf4y4k02ijh08sfmwb" "c1636a1a7507" "ne-NP") - ("0y1fxp9pxia6x2wxdharh2ynvzdqcmzpya1gdb89pcv5qyrzqgcl" "60ed1c2397a6" "nl") - ("1nbp924p7fp2c76ym71wp34vk96z89i4g2rfgpsi54cgv42a6vgq" "a7f9a3d35875" "nn-NO") - ("1yrmhyvb6skypcyvi6j3py51sdkq9vn35zkryx6rdp8ygqwm1va7" "9ac29828960e" "oc") - ("0rn2414ji1icar627arf5rjwl9r9vxhznbfsyxgrmrf0p6dp72fv" "87720cc32205" "pa-IN") - ("09lam6yaprc8zyisq0pcdj4afpg930c2x3x47gdxnqfyhmcfygs7" "56b2c592ffba" "pl") - ("0mbc1a8wvjs3k928qh0k800d230251i0rw0myhdpc6mk3xjna7i5" "89f1b173c9b1" "pt-BR") - ("1v1qa5slllz78222rlqr4b8k7c8dapmx8d7s5nb90wdffic0zcqy" "27adc5dad781" "pt-PT") - ("04k6h5d7c740lz1hx1vavj6p0fmhgn9mm3nwvk4p9iccy5nw5pmf" "83e2e4833fc3" "rm") - ("0f0hz792wr17mgi6n190dliqx67479aqg3y2ak0jg0fiz2c8qr7p" "69cdc288966f" "ro") - ("17yngj0v30687m7fa1ls0g86vjg8jzxs7bnsca91jpxf3ij44xp6" "03046775600f" "ru") - ("1fvz23nphs9i4gdkx9fcy5ahdk2f879281pchclwi0qlciq7digr" "61ea93a50fff" "sco") - ("0yc1iwqbnpnf1i7yz3zqrx6g8pinc7l53pvbczywfkq3rz6wmmf5" "2b134d24c046" "si") - ("0kizljksn2vn4yw7qlv7c8h2m75f7n9ddg6n6ag3hwxxip83hn4y" "6d69c24dc8db" "sk") - ("1ll936b18wy464623jc5smf3c6dpimh0qwn28a991h7zcw31n3kp" "29e195d1d160" "sl") - ("14w9n994z9gf0wx7vrqisyxkngvhmmnayx8r0vwiq8k7jy81sxlm" "60a3b235fe1d" "son") - ("0z7bcfvq6x6dxf4d4bbjsg36r5npkr89087b0j360ljampk6c2fn" "8588cbc89847" "sq") - ("1fcq9g89lhzckzr2qb6x0w0z6q486n9jdqfi6h70dx8b069b3jfj" "198f7e89f10d" "sr") - ("0ap3m1sbibnaj9s2l139m7l8cc8s2ky4jlxwgzbxdzvqxfz7n954" "b098e2ebc049" "sv-SE") - ("0k93gnwfs5mahb9vz1c65ddcbkav0cwhxnrww3qk7gcmn7q88gqk" "25951b964d5b" "szl") - ("0b0v5pcwvhvhg8vlzy26g3j0m1r8svrpq07hq0q7lxldwlb48phz" "94659c83c9d8" "ta") - ("1v35cl6m3ikzsriq6zkjzjs3p9bhl8zmbp2gl14mga1f1zy4kcah" "eb59646a5d36" "te") - ("0y3r30mjgxngjraqmf5cm00kgqx2pvhbvy8sfxb3fhypv9vda3yr" "10d257301a2d" "th") - ("1inyqk495py20jwjvs4yl0n5ncf3hhb896bs1lwfsgpvbvr5hbq1" "9be6adca0e51" "tl") - ("0vsirjs655cia9n8dys2r84bvg303hcxkk2w6a9j3dkbifq5ymk6" "51354c936bf6" "tr") - ("050x882c0ywil290k4g861njw70ffw2y55dqk3w0kffi972mm909" "d7510f2d01dc" "trs") - ("001ykwxkwibavbi1k42b1hmysb3gmrwcs68zmw96m1vc80p29nz1" "4d1fa878042b" "uk") - ("0lsz6jlmmsqdg47pdx8b1djjvcavi0wlyr0mkpyhjgpginag21zx" "ad3035f28183" "ur") - ("0d3ggm3q76pkpg4n3lz2ji4pbb47n885byqxbp7sk6n9vlgzir7l" "8ea7a5a051db" "uz") - ("0v7d8y6xsr6yf2s1sjxnsjmw0hdnj91f0w2da6spkifb52lmbv6v" "67fe2acb306f" "vi") - ("0j8l09vzqlw4zlkyp6wkh44c5gr1xgbcmnawks1zj7xz02ambwii" "abc22dfb6d84" "xh") - ("1c01pbyswixkjg42714fvfy33b09mpdbf4d8f8kcs88c86jpf07z" "d6d6f9bb6113" "zh-CN") - ("0yq8fqdz862pnlbvfsqfc152rhpsqgncvp8bqkd653mdfv4qkwr4" "0cbdc5f1a048" "zh-TW"))) - -(define %icecat-91-version "91.13.0-guix0-preview1") - -(define icecat-91-source - (let* ((base-version (first (string-split %icecat-91-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 - "0qh7j960wdp5zcfqhkj8ki47spp9i9ms12xx0v0kxvmmw36jpgjk")))) - - (upstream-icecat-base-version "91.13.0") ; maybe older than base-version - ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "4a87716686104266a9cccc2d83cc249e312f3673") - (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 - "070j78al04xzchfl5xj1w300hmw17a3iqcw7mnlxf6b8rqlgj20p")))) - - ;; 'search-patch' returns either a valid file name or #f, so wrap it - ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. - (gnuzilla-fixes-patch - (local-file (assume-valid-file-name - (search-patch "icecat-use-older-reveal-hidden-html.patch")))) - (makeicecat-patch - (local-file (assume-valid-file-name - (search-patch "icecat-makeicecat.patch"))))) - - (origin - (method computed-origin-method) - (file-name (string-append "icecat-" %icecat-91-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-91-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" #+gnuzilla-fixes-patch) - (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-"))))) - (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-91-locales) - (copy-recursively #+mozilla-compare-locales - "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))))))))) - ;; Update this together with icecat! (define %icedove-build-id "20220920000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove -- cgit v1.2.3 From e0546a11f0b65e301dc9d1d1cfec26e686070029 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 29 Sep 2022 21:03:45 +0200 Subject: gnu: IceCat, Icedove: Use the default 'rust'. * gnu/packages/gnuzilla.scm (rust-1.58-promise, rust-1.59-promise): Remove variables. (icecat, icedove)[native-inputs]: Change from RUST-1.59-PROMISE to RUST. --- gnu/packages/gnuzilla.scm | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index f54210b412..aee9a16576 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -350,27 +350,6 @@ in C/C++.") (inputs (list icu4c readline zlib)))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Temporary packaging of rust-1.59, pending inclusion in (gnu packages rust) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define rust-1.58-promise - (delay - (let ((rust-bootstrapped-package - (@@ (gnu packages rust) - rust-bootstrapped-package))) - (rust-bootstrapped-package - rust "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8")))) - -(define rust-1.59-promise - (delay - (let ((rust-bootstrapped-package - (@@ (gnu packages rust) - rust-bootstrapped-package))) - (rust-bootstrapped-package - (force rust-1.58-promise) - "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57")))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Temporary packaging of rust-cbindgen-0.23 and its dependencies ;; follow, pending their inclusion into (gnu packages rust-apps) @@ -887,8 +866,8 @@ in C/C++.") ;; ("icecat-use-system-media-libs.patch" ;; ,(search-patch "icecat-use-system-media-libs.patch")) ;; TODO: Change the following lines to use 'rust' when it's >= 1.59. - (force rust-1.59-promise) - `(,(force rust-1.59-promise) "cargo") + rust + `(,rust "cargo") (force rust-cbindgen-0.23-promise) llvm clang @@ -1565,7 +1544,7 @@ standards of the IceCat project.") (sha256 (base32 "078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09"))))) - ("cargo" ,(force rust-1.59-promise) "cargo") + ("cargo" ,rust "cargo") ("clang" ,clang) ("llvm" ,llvm) ("m4" ,m4) @@ -1574,7 +1553,7 @@ standards of the IceCat project.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("rust" ,(force rust-1.59-promise)) + ("rust" ,rust) ("rust-cbindgen" ,(force rust-cbindgen-0.23-promise)) ("which" ,which) ("yasm" ,yasm))) -- cgit v1.2.3 From 1c821a3a6347c8e0476225adaf077f69e19dc449 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Tue, 4 Oct 2022 20:36:24 +0200 Subject: gnu: icedove: Update to 102.3.1 [security fixes]. Fixes CVE-2022-39236, CVE-2022-39249, CVE-2022-39250 and CVE-2022-39251. * gnu/packages/gnuzilla.scm (icedove): Update to 102.3.1. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index bb285eab70..304b98832e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1240,11 +1240,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20220920000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20220928000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "102.3.0") + (version "102.3.1") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1531,7 +1531,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "04f60827c1b53ab86121c7d122d3a8216219ff9f")) + ,(let ((changeset "07a17b101f904a686bbdf798ba2e820079a8323f")) (origin (method hg-fetch) (uri (hg-reference @@ -1540,7 +1540,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09"))))) + "16wlpcv1n64crcgk4gcl92r37dlpw26izvam82pbp5f8c25amlnk"))))) ("cargo" ,(force rust-1.59-promise) "cargo") ("clang" ,clang) ("llvm" ,llvm) -- cgit v1.2.3 From 64e8ed1061ffbb0fd07b41c85faffd06f7d6376a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 10 Oct 2022 20:17:04 -0400 Subject: gnu: icedove: Use gexps. * gnu/packages/gnuzilla.scm (icedove) [arguments]: Use gexps, adjusting phases as needed. --- gnu/packages/gnuzilla.scm | 425 +++++++++++++++++++++++----------------------- 1 file changed, 212 insertions(+), 213 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 304b98832e..04e283111e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1250,214 +1250,214 @@ standards of the IceCat project.") `((cpe-name . "thunderbird_esr"))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no check target - #:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' - #:modules ((guix build utils) ;find-files + (list + #:tests? #f ;no check target + #:imported-modules %cargo-utils-modules ;for `generate-all-checksums' + #:modules `((guix build utils) ;find-files (sxml simple) (ice-9 regex) ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'prepare-thunderbird-sources - (lambda* (#:key inputs #:allow-other-keys) - (mkdir "comm") - (copy-recursively (assoc-ref inputs "thunderbird-sources") - "comm") - (delete-file "sourcestamp.txt"))) - (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 - '("third_party/rust" - "toolkit/library/rust"))))) - (add-after 'patch-cargo-checksums 'remove-cargo-frozen-flag + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-thunderbird-sources + (lambda* (#:key inputs #:allow-other-keys) + (mkdir "comm") + (copy-recursively (assoc-ref inputs "thunderbird-sources") + "comm") + (delete-file "sourcestamp.txt"))) + (add-after 'patch-source-shebangs 'patch-cargo-checksums + (lambda _ + (use-modules (guix build cargo-utils)) + (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934\ +ca495991b7852b855")) + (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 + '("third_party/rust" + "toolkit/library/rust"))))) + (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\",") "")))) - ;; Fixes issue where each installation directory generates its own profile. - ;; See e.g. https://trac.torproject.org/projects/tor/ticket/31457 - (add-after 'patch-source-shebangs 'fix-profile-setting - (lambda _ - (substitute* "comm/mail/moz.configure" - (("MOZ_DEDICATED_PROFILES, True") - "MOZ_DEDICATED_PROFILES, False")))) - (add-after 'prepare-thunderbird-sources 'rename-to-icedove - (lambda _ - (substitute* "comm/mail/confvars.sh" - (("MOZ_APP_NAME=thunderbird") - "MOZ_APP_NAME=icedove") - (("MOZ_UPDATER=1") - "MOZ_UPDATER=0")) - ;; Remove branding to comply with Mozilla's trademark policy - (with-directory-excursion "comm/mail/branding/nightly" - (delete-file "content/about-wordmark.svg") - (call-with-output-file "content/about-wordmark.svg" - (lambda (port) - (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") - (viewBox "0 0 789.1 90.78") - (width "333") - (height "48") - (fill "#fff")) - (text (@ (x "400") (y "70") - (text-anchor "middle") - (font-size "90")) - "Icedove Daily")) - port))) - (substitute* '("locales/en-US/brand.properties" - "locales/en-US/brand.ftl" - "locales/en-US/brand.dtd" - "configure.sh") - (("Thunderbird") "Icedove") - (("mozilla.org") "guix.gnu.org"))) - ;; Remove other mentions of Thunderbird in user-visible text. - (with-directory-excursion "comm/mail/base/content" - (substitute* '("overrides/app-license-name.html") - (("Thunderbird") "Icedove"))) - (with-directory-excursion "comm/mail/components/" - (substitute* '("MailGlue.jsm" - "extensions/schemas/addressBook.json" - "extensions/schemas/tabs.json" - "extensions/schemas/cloudFile.json" - "extensions/schemas/chrome_settings_overrides.json" - "extensions/schemas/windows.json" - "extensions/parent/ext-mail.js" - "im/messages/mail/Info.plist" - "enterprisepolicies/moz.build" - "enterprisepolicies/helpers/moz.build" - "enterprisepolicies/schemas/moz.build") - (("Thunderbird") "Icedove"))) - (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" - "comm/mail/base/content/customizeToolbar.js" - "comm/suite/components/customizeToolbar.js") - (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) - (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) - - ;; Override addon URLs and settings - (substitute* "comm/mail/app/profile/all-thunderbird.js" - (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) - (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) - (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) - (string-append m ", \"https://guix.gnu.org/packages\");")) - (("(pref\\(\"extensions.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) - (string-append m ", false);")) - (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) - (string-append m ", false);"))))) - (add-after 'build 'neutralize-store-references - (lambda _ - ;; Mangle the store references to compilers & other build tools in - ;; about:buildconfig, reducing Icedove's closure significant. - ;; The resulting files are saved in lib/thunderbird/omni.ja - (substitute* - ;; Use find because the path "obj-x86_64-pc-linux-gnu" contains - ;; the architecture and the system -> more complicated. - (find-files "." "buildconfig.html") - (((format #f "(~a/)([0-9a-df-np-sv-z]{32})" - (regexp-quote (%store-directory))) - _ store hash) - (string-append store - (string-take hash 8) - "" - (string-drop hash 8)))))) - (delete 'bootstrap) - (replace 'configure - (lambda* (#:key inputs outputs configure-flags #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (which "bash")) - (abs-srcdir (getcwd)) - (srcdir (string-append "../" (basename abs-srcdir))) - (flags `(,(string-append "--prefix=" out) - ,@configure-flags)) - (mozconfig (string-append (getcwd) "/.mozconfig"))) - (setenv "SHELL" bash) - (setenv "CONFIG_SHELL" bash) - (setenv "QA_CONFIGURE_OPTIONS" ".*") - (setenv "MOZBUILD_STATE_PATH" - (string-append (getcwd) "/mach_state")) - (setenv "MOZCONFIG" - (string-append (getcwd) "/.mozconfig")) - - (setenv "AR" "llvm-ar") - (setenv "NM" "llvm-nm") - (setenv "CC" "clang") - (setenv "CXX" "clang++") - - (setenv "MOZ_NOSPAM" "1") - (setenv "MACH_USE_SYSTEM_PYTHON" "1") - (setenv "PYTHON" - (search-input-file inputs "/bin/python")) - (setenv "MOZ_BUILD_DATE" ,%icedove-build-id) ; avoid timestamp - (setenv "MOZ_APP_NAME" "icedove") - (setenv "LDFLAGS" (string-append "-Wl,-rpath=" - (assoc-ref outputs "out") - "/lib/icedove")) - (mkdir-p (string-append (getcwd) "/builddir")) - (with-output-to-file mozconfig - (lambda () - (display - (string-append - "ac_add_options --disable-crashreporter\n" - "ac_add_options --disable-debug\n" - "ac_add_options --disable-debug-symbols\n" - "ac_add_options --disable-elf-hack\n" - "ac_add_options --disable-jit\n" - "ac_add_options --disable-necko-wifi\n" - "ac_add_options --disable-official-branding\n" - "ac_add_options --disable-tests\n" - "ac_add_options --disable-updater\n" - "ac_add_options --disable-webrtc\n" - "ac_add_options --enable-application=comm/mail\n" - "ac_add_options --enable-default-toolkit=\"cairo-gtk3\"\n" - "ac_add_options --enable-optimize\n" - "ac_add_options --enable-pulseaudio\n" - "ac_add_options --enable-release\n" - "ac_add_options --enable-strip\n" - "ac_add_options --enable-system-ffi\n" - "ac_add_options --enable-system-pixman\n" - "ac_add_options --prefix=" out "\n" - "ac_add_options --with-clang-path=" (assoc-ref %build-inputs "clang") "/bin/clang\n" - "ac_add_options --with-distribution-id=org.gnu\n" - "ac_add_options --with-libclang-path=" (assoc-ref %build-inputs "clang") "/lib\n" - "ac_add_options --with-system-bz2\n" - "ac_add_options --with-system-icu\n" - "ac_add_options --with-system-jpeg\n" - "ac_add_options --with-system-libevent\n" - "ac_add_options --with-system-nspr\n" - ;"ac_add_options --with-system-nss\n" - "ac_add_options --with-system-zlib\n" - "ac_add_options --without-wasm-sandboxed-libraries\n" - "mk_add_options MOZ_MAKE_FLAGS=-j" - (number->string (parallel-job-count)) "\n")))) - (display (getcwd)) - (newline) - (display "mach configure") - (invoke "./mach" "configure")))) - (replace 'build - (lambda _ (invoke "./mach" "build"))) - (replace 'install - (lambda _ (invoke "./mach" "install"))) - ;; Thunderbird doesn't provide any .desktop file. - ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1637575 - (add-after 'install 'install-desktop-file - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (apps (string-append out "/share/applications"))) - (mkdir-p apps) - (with-output-to-file (string-append apps "/icedove.desktop") - (lambda _ - (format #t - "[Desktop Entry]~@ + ;; Fixes issue where each installation directory generates its own + ;; profile (see: + ;; https://trac.torproject.org/projects/tor/ticket/31457). + (add-after 'patch-source-shebangs 'fix-profile-setting + (lambda _ + (substitute* "comm/mail/moz.configure" + (("MOZ_DEDICATED_PROFILES, True") + "MOZ_DEDICATED_PROFILES, False")))) + (add-after 'prepare-thunderbird-sources 'rename-to-icedove + (lambda _ + (substitute* "comm/mail/confvars.sh" + (("MOZ_APP_NAME=thunderbird") + "MOZ_APP_NAME=icedove") + (("MOZ_UPDATER=1") + "MOZ_UPDATER=0")) + ;; Remove branding to comply with Mozilla's trademark policy + (with-directory-excursion "comm/mail/branding/nightly" + (delete-file "content/about-wordmark.svg") + (call-with-output-file "content/about-wordmark.svg" + (lambda (port) + (sxml->xml '(svg (@ (xmlns "http://www.w3.org/2000/svg") + (viewBox "0 0 789.1 90.78") + (width "333") + (height "48") + (fill "#fff")) + (text (@ (x "400") (y "70") + (text-anchor "middle") + (font-size "90")) + "Icedove Daily")) + port))) + (substitute* '("locales/en-US/brand.properties" + "locales/en-US/brand.ftl" + "locales/en-US/brand.dtd" + "configure.sh") + (("Thunderbird") "Icedove") + (("mozilla.org") "guix.gnu.org"))) + ;; Remove other mentions of Thunderbird in user-visible text. + (with-directory-excursion "comm/mail/base/content" + (substitute* '("overrides/app-license-name.html") + (("Thunderbird") "Icedove"))) + (with-directory-excursion "comm/mail/components/" + (substitute* '("MailGlue.jsm" + "extensions/schemas/addressBook.json" + "extensions/schemas/tabs.json" + "extensions/schemas/cloudFile.json" + "extensions/schemas/chrome_settings_overrides.json" + "extensions/schemas/windows.json" + "extensions/parent/ext-mail.js" + "im/messages/mail/Info.plist" + "enterprisepolicies/moz.build" + "enterprisepolicies/helpers/moz.build" + "enterprisepolicies/schemas/moz.build") + (("Thunderbird") "Icedove"))) + (substitute* '("comm/mailnews/base/prefs/content/accountUtils.js" + "comm/mail/base/content/customizeToolbar.js" + "comm/suite/components/customizeToolbar.js") + (("AppConstants.MOZ_APP_NAME (.)= \"thunderbird" _ e) + (format #f "AppConstants.MOZ_APP_NAME ~a= \"icedove" e))) + + ;; Override addon URLs and settings + (substitute* "comm/mail/app/profile/all-thunderbird.js" + (("(pref\\(\"extensions.webservice.discoverURL\").*" _ m) + (string-append m ", \"https://directory.fsf.org/wiki/Icedove\");")) + (("(pref\\(\"extensions.getAddons.search.url\").*" _ m) + (string-append m ", \"https://guix.gnu.org/packages\");")) + (("(pref\\(\"extensions.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"extensions.systemAddon.update.enabled\").*" _ m) + (string-append m ", false);")) + (("(pref\\(\"lightweightThemes.update.enabled\").*" _ m) + (string-append m ", false);"))))) + (add-after 'build 'neutralize-store-references + (lambda _ + ;; Mangle the store references to compilers & other build tools in + ;; about:buildconfig, reducing Icedove's closure significant. + ;; The resulting files are saved in lib/thunderbird/omni.ja + (substitute* + ;; Use find because the path "obj-x86_64-pc-linux-gnu" contains + ;; the architecture and the system -> more complicated. + (find-files "." "buildconfig.html") + (((format #f "(~a/)([0-9a-df-np-sv-z]{32})" + (regexp-quote (%store-directory))) + _ store hash) + (string-append store + (string-take hash 8) + "" + (string-drop hash 8)))))) + (delete 'bootstrap) + (replace 'configure + (lambda* (#:key inputs configure-flags #:allow-other-keys) + (let* ((bash (which "bash")) + (abs-srcdir (getcwd)) + (srcdir (string-append "../" (basename abs-srcdir))) + (flags `(,(string-append "--prefix=" #$output) + ,@configure-flags)) + (mozconfig (string-append (getcwd) "/.mozconfig"))) + (setenv "SHELL" bash) + (setenv "CONFIG_SHELL" bash) + (setenv "QA_CONFIGURE_OPTIONS" ".*") + (setenv "MOZBUILD_STATE_PATH" + (string-append (getcwd) "/mach_state")) + (setenv "MOZCONFIG" + (string-append (getcwd) "/.mozconfig")) + + (setenv "AR" "llvm-ar") + (setenv "NM" "llvm-nm") + (setenv "CC" "clang") + (setenv "CXX" "clang++") + + (setenv "MOZ_NOSPAM" "1") + (setenv "MACH_USE_SYSTEM_PYTHON" "1") + (setenv "PYTHON" + (search-input-file inputs "/bin/python")) + (setenv "MOZ_BUILD_DATE" #$%icedove-build-id) ; avoid timestamp + (setenv "MOZ_APP_NAME" "icedove") + (setenv "LDFLAGS" (string-append "-Wl,-rpath=" #$output + "/lib/icedove")) + (mkdir-p (string-append (getcwd) "/builddir")) + (with-output-to-file mozconfig + (lambda () + (display + (string-append + "ac_add_options --disable-crashreporter\n" + "ac_add_options --disable-debug\n" + "ac_add_options --disable-debug-symbols\n" + "ac_add_options --disable-elf-hack\n" + "ac_add_options --disable-jit\n" + "ac_add_options --disable-necko-wifi\n" + "ac_add_options --disable-official-branding\n" + "ac_add_options --disable-tests\n" + "ac_add_options --disable-updater\n" + "ac_add_options --disable-webrtc\n" + "ac_add_options --enable-application=comm/mail\n" + "ac_add_options --enable-default-toolkit=\"cairo-gtk3\"\n" + "ac_add_options --enable-optimize\n" + "ac_add_options --enable-pulseaudio\n" + "ac_add_options --enable-release\n" + "ac_add_options --enable-strip\n" + "ac_add_options --enable-system-ffi\n" + "ac_add_options --enable-system-pixman\n" + "ac_add_options --prefix=" #$output "\n" + "ac_add_options --with-clang-path=" (assoc-ref %build-inputs "clang") "/bin/clang\n" + "ac_add_options --with-distribution-id=org.gnu\n" + "ac_add_options --with-libclang-path=" (assoc-ref %build-inputs "clang") "/lib\n" + "ac_add_options --with-system-bz2\n" + "ac_add_options --with-system-icu\n" + "ac_add_options --with-system-jpeg\n" + "ac_add_options --with-system-libevent\n" + "ac_add_options --with-system-nspr\n" + ;"ac_add_options --with-system-nss\n" + "ac_add_options --with-system-zlib\n" + "ac_add_options --without-wasm-sandboxed-libraries\n" + "mk_add_options MOZ_MAKE_FLAGS=-j" + (number->string (parallel-job-count)) "\n")))) + (display (getcwd)) + (newline) + (display "mach configure") + (invoke "./mach" "configure")))) + (replace 'build + (lambda _ (invoke "./mach" "build"))) + (replace 'install + (lambda _ (invoke "./mach" "install"))) + ;; Thunderbird doesn't provide any .desktop file. + ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1637575 + (add-after 'install 'install-desktop-file + (lambda _ + (let ((apps (string-append #$output "/share/applications"))) + (mkdir-p apps) + (with-output-to-file (string-append apps "/icedove.desktop") + (lambda _ + (format #t + "[Desktop Entry]~@ Name=Icedove~@ Exec=~a/bin/icedove~@ Icon=icedove~@ @@ -1471,20 +1471,19 @@ standards of the IceCat project.") [Desktop Action ComposeMessage]~@ Name=Write new message~@ Exec=~@*~a/bin/icedove -compose~%" - out)))))) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (gtk (assoc-ref inputs "gtk+")) - (gtk-share (string-append gtk "/share")) - (pulseaudio (assoc-ref inputs "pulseaudio")) - (pulseaudio-lib (string-append pulseaudio "/lib")) - (eudev (assoc-ref inputs "eudev")) - (eudev-lib (string-append eudev "/lib"))) - (wrap-program (car (find-files lib "^icedove$")) - `("XDG_DATA_DIRS" prefix (,gtk-share)) - `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib))))))))) + #$output)))))) + (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")) + (pulseaudio #$(this-package-input "pulseaudio")) + (pulseaudio-lib (string-append pulseaudio "/lib")) + (eudev #$(this-package-input "eudev")) + (eudev-lib (string-append eudev "/lib"))) + (wrap-program (car (find-files lib "^icedove$")) + `("XDG_DATA_DIRS" prefix (,gtk-share)) + `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib))))))))) (inputs (list alsa-lib bzip2 -- cgit v1.2.3 From a73cb189c3de70a30d4d465c36d72617d98d66b6 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sun, 16 Oct 2022 08:26:07 +0200 Subject: gnu: icedove: Update to 102.3.3. * gnu/packages/gnuzilla.scm (icedove): Update to 102.3.3. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index d8a729c395..0bf687ac5a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1243,11 +1243,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20220928000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20221012000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "102.3.1") + (version "102.3.3") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1533,7 +1533,7 @@ ca495991b7852b855")) ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "07a17b101f904a686bbdf798ba2e820079a8323f")) + ,(let ((changeset "afeec21c1fcc27ba58f98f629e85609a728f79e6")) (origin (method hg-fetch) (uri (hg-reference @@ -1542,7 +1542,7 @@ ca495991b7852b855")) (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09"))))) + "1n4cj673akv9rwymc4bj3g3cx39amg9xpi504vkjpmykfbvrvr01"))))) ("cargo" ,rust "cargo") ("clang" ,clang) ("llvm" ,llvm) -- cgit v1.2.3 From b172241134b505b1a53fb29b72c7cb18592afbc0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 19 Oct 2022 22:20:14 -0400 Subject: gnu: icecat: Update to 102.4.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2022-42927, CVE-2022-42928, CVE-2022-42929, and CVE-2022-42932. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. --- gnu/packages/gnuzilla.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0bf687ac5a..be24185be7 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -621,8 +621,8 @@ in C/C++.") ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.3.0-guix0-preview1") -(define %icecat-build-id "20220920000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "102.4.0-guix0-preview1") +(define %icecat-build-id "20221019000000") ;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' @@ -644,11 +644,11 @@ in C/C++.") "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0nmm861p4zakdvi9lj0ac8dkf9v17250rzcmrx1f6r7rvjv273ih")))) + "0klh3lbm0zdmv90kmmpkzgn15pfjibr7zsjy3kvbzpql97fhv7z7")))) - (upstream-icecat-base-version "102.3.0") ; maybe older than base-version + (upstream-icecat-base-version "102.4.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "f82b5b40943fe7723486fadccb48d454ee3e9dad") + (gnuzilla-commit "8f1aa117ddca6e8cd0114265fb4ca9b5a927565a") (gnuzilla-source (origin (method git-fetch) @@ -660,7 +660,7 @@ in C/C++.") (string-take gnuzilla-commit 8))) (sha256 (base32 - "1d7lfvwi9mvaxcfiqcgch3idhyxpdf56r9b71r54yiifv6xlr7x9")))) + "0ryrn8ivm763swd0qbqhlgdwc2dj4xjd81d9i2r6hb7bsb4ky3y5")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. -- cgit v1.2.3 From 64562d0c43b98e71f9aa641d28e92c729302d2b5 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 21 Oct 2022 12:11:26 +0200 Subject: gnu: icedove: Simplify native inputs. Moving the thunderbird-source out of native-inputs makes the transition to simplified inputs easier (at least for me). * gnu/packages/gnuzilla.scm (%icedove-version, thunderbird-source): New variables. Move out of the package definition. (icedove)[arguments]: Adapt 'prepare-thunderbird-sources phase to gexp. [native-inputs]: Simplify and remove thunderbird-source. --- gnu/packages/gnuzilla.scm | 64 +++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 33 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index be24185be7..140964faa4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1242,12 +1242,26 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -;; Update this together with icecat! (define %icedove-build-id "20221012000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "102.3.3") + +;; Provides the "comm" folder which is inserted into the icecat source. +;; Avoids the duplication of Icecat's source tarball. +(define thunderbird-source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.mozilla.org/releases/comm-esr102") + (changeset "afeec21c1fcc27ba58f98f629e85609a728f79e6"))) + (file-name (string-append "thunderbird-" %icedove-version "-checkout")) + (sha256 + (base32 + "1n4cj673akv9rwymc4bj3g3cx39amg9xpi504vkjpmykfbvrvr01")))) + (define-public icedove (package (name "icedove") - (version "102.3.3") + (version %icedove-version) (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1263,10 +1277,9 @@ standards of the IceCat project.") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'prepare-thunderbird-sources - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (mkdir "comm") - (copy-recursively (assoc-ref inputs "thunderbird-sources") - "comm") + (copy-recursively #$thunderbird-source "comm") (delete-file "sourcestamp.txt"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ @@ -1528,34 +1541,19 @@ ca495991b7852b855")) zip zlib)) (native-inputs - `(("thunderbird-sources" - ;; The changeset identifier is taken from the file "sourcestamp.txt" - ;; in the Thunderbird release tarball. We don't use the release - ;; tarball because it duplicates the Icecat sources and only adds the - ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "afeec21c1fcc27ba58f98f629e85609a728f79e6")) - (origin - (method hg-fetch) - (uri (hg-reference - (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset changeset))) - (file-name (string-append "thunderbird-" version "-checkout")) - (sha256 - (base32 - "1n4cj673akv9rwymc4bj3g3cx39amg9xpi504vkjpmykfbvrvr01"))))) - ("cargo" ,rust "cargo") - ("clang" ,clang) - ("llvm" ,llvm) - ("m4" ,m4) - ("nasm" ,nasm) - ("node" ,node) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-wrapper) - ("rust" ,rust) - ("rust-cbindgen" ,(force rust-cbindgen-0.23-promise)) - ("which" ,which) - ("yasm" ,yasm))) + (list `(,rust "cargo") + clang + llvm + m4 + nasm + node + perl + pkg-config + python-wrapper + rust + (force rust-cbindgen-0.23-promise) + which + yasm)) (home-page "https://www.thunderbird.net") (synopsis "Rebranded Mozilla Thunderbird email client") (description -- cgit v1.2.3 From e94d63d49e134932eeefe21c09e4d25bc829f59b Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 21 Oct 2022 13:27:56 +0200 Subject: gnu: icedove: Update to 102.4.0. * gnu/packages/gnuzilla.scm (%icedove-build-id, %icedove-version) Update to 102.4.0. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 140964faa4..6b70f4b544 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1242,8 +1242,8 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define %icedove-build-id "20221012000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.3.3") +(define %icedove-build-id "20221019000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "102.4.0") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1252,11 +1252,11 @@ standards of the IceCat project.") (method hg-fetch) (uri (hg-reference (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "afeec21c1fcc27ba58f98f629e85609a728f79e6"))) + (changeset "c064680366a130c4c02ba9b85ef324f0f075c47b"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "1n4cj673akv9rwymc4bj3g3cx39amg9xpi504vkjpmykfbvrvr01")))) + "0ccpp4890nqill1yn2lb5b855r4hpmhrcsdbxdk2sdn52dc0qda6")))) (define-public icedove (package -- cgit v1.2.3 From 328fa8b290676fc22b7a4ba5a69565b9dcf09ef2 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Fri, 28 Oct 2022 10:01:18 +0200 Subject: gnu: icedove: Update to 102.4.1. * gnu/packages/gnuzilla.scm (%icedove-build-id, %icedove-version) Update to 102.4.1. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 6b70f4b544..5c81f2ca98 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1242,8 +1242,8 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define %icedove-build-id "20221019000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.4.0") +(define %icedove-build-id "20221026000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "102.4.1") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1252,11 +1252,11 @@ standards of the IceCat project.") (method hg-fetch) (uri (hg-reference (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "c064680366a130c4c02ba9b85ef324f0f075c47b"))) + (changeset "e572bc3cfa07492189aec439e98378b0811ae3bb"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "0ccpp4890nqill1yn2lb5b855r4hpmhrcsdbxdk2sdn52dc0qda6")))) + "1qmf8j9yrc815h7j06m3id6h7cck6d5b0rhzr82wgmwf1xnngxl7")))) (define-public icedove (package -- cgit v1.2.3 From cc4fa1018dfec8a60b73da3917830635ac7d2af4 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 10 Nov 2022 09:44:06 +0100 Subject: gnu: icedove: Update to 102.4.2. * gnu/packages/gnuzilla.scm (%icedove-build-id, %icedove-version) Update to 102.4.2. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 5c81f2ca98..e8059b1a0a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1242,8 +1242,8 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define %icedove-build-id "20221026000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.4.1") +(define %icedove-build-id "20221104000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "102.4.2") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1252,11 +1252,11 @@ standards of the IceCat project.") (method hg-fetch) (uri (hg-reference (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "e572bc3cfa07492189aec439e98378b0811ae3bb"))) + (changeset "bece6c033f6b24b9c126598da7c6eb5bc2a48b14"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "1qmf8j9yrc815h7j06m3id6h7cck6d5b0rhzr82wgmwf1xnngxl7")))) + "1fsn5lg0c89rnsnljd48gq1z751sxf6zv2rv7wgnhifc45w4s80j")))) (define-public icedove (package -- cgit v1.2.3 From 0747cacc58e5bb798676d43133cfd664a601fa39 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 16 Nov 2022 01:03:21 -0500 Subject: gnu: icecat: Update to 102.5.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2022-45403, CVE-2022-45404, CVE-2022-45405, CVE-2022-45406, CVE-2022-45408, CVE-2022-45409, CVE-2022-45410, CVE-2022-45411, CVE-2022-45412, CVE-2022-45416, CVE-2022-45418, CVE-2022-45420, and CVE-2022-45421. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. --- gnu/packages/gnuzilla.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e8059b1a0a..f3e7efead7 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -621,8 +621,8 @@ in C/C++.") ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.4.0-guix0-preview1") -(define %icecat-build-id "20221019000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "102.5.0-guix0-preview1") +(define %icecat-build-id "20221115000000") ;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' @@ -644,11 +644,11 @@ in C/C++.") "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0klh3lbm0zdmv90kmmpkzgn15pfjibr7zsjy3kvbzpql97fhv7z7")))) + "1n2pq165fxmvgcr5mv3hhaid2vn7lh3jg03lf13kz4c5295x8z81")))) - (upstream-icecat-base-version "102.4.0") ; maybe older than base-version + (upstream-icecat-base-version "102.5.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "8f1aa117ddca6e8cd0114265fb4ca9b5a927565a") + (gnuzilla-commit "a8848cb35e4e47a344d40596f72d82d57bf5a6f1") (gnuzilla-source (origin (method git-fetch) @@ -660,7 +660,7 @@ in C/C++.") (string-take gnuzilla-commit 8))) (sha256 (base32 - "0ryrn8ivm763swd0qbqhlgdwc2dj4xjd81d9i2r6hb7bsb4ky3y5")))) + "0d0brzi7wmg70kvi9p3g24cyya17bvg2djgjn64g14hpnalg8icw")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. -- cgit v1.2.3 From f5a7e4b9b21d3e8b01b479515023a9cf03ca3e06 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 17 Nov 2022 18:21:44 +0100 Subject: gnu: icedove: Update to 102.5.0. * gnu/packages/gnuzilla.scm (%icedove-build-id, %icedove-version): Update to 102.5.0. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index f3e7efead7..feb80d81a2 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1242,8 +1242,8 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define %icedove-build-id "20221104000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.4.2") +(define %icedove-build-id "20221115000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "102.5.0") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1252,11 +1252,11 @@ standards of the IceCat project.") (method hg-fetch) (uri (hg-reference (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "bece6c033f6b24b9c126598da7c6eb5bc2a48b14"))) + (changeset "b6e9b5a1d1b53d26cfb7032ef2ff02203ab0486b"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "1fsn5lg0c89rnsnljd48gq1z751sxf6zv2rv7wgnhifc45w4s80j")))) + "0i2w1ibaip8rlghrk5iaih14xnz5n19ag64qcdgjxic78mhnmm04")))) (define-public icedove (package -- cgit v1.2.3 From 3275068f191e76c8615b8719f3d1a286b9f1403c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 30 Nov 2022 11:13:23 +0200 Subject: gnu: gnuzilla.scm: Move rust packages to standard locations. * gnu/packages/gnuzilla.scm (rust-textwrap-0.15-promise, rust-lex-0.2, rust-clap-derive-3.2-promise): Remove variables. (icecat,icedove)[native-inputs]: Replace rust-cbindgen-0.23-promise with rust-cbindgen-0.23. (rust-cbindgen-0.24-promise, rust-cbindgen-0.23-promise): Move to ... * gnu/packages/rust-apps.scm (rust-cbindgen-0.24, rust-cbindgen-0.23): ... here. Rename without '-promise' suffix. --- gnu/packages/gnuzilla.scm | 149 +-------------------------------------------- gnu/packages/rust-apps.scm | 44 +++++++++++++ 2 files changed, 46 insertions(+), 147 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index feb80d81a2..52ece9bbd4 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -19,7 +19,6 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 Baptiste Strazzul -;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,7 +84,6 @@ #:use-module (gnu packages assembly) #:use-module (gnu packages rust) #:use-module (gnu packages rust-apps) - #:use-module (gnu packages crates-io) #:use-module (gnu packages llvm) #:use-module (gnu packages nss) #:use-module (gnu packages icu4c) @@ -350,148 +348,6 @@ in C/C++.") (inputs (list icu4c readline zlib)))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Temporary packaging of rust-cbindgen-0.23 and its dependencies -;; follow, pending their inclusion into (gnu packages rust-apps) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(define rust-textwrap-0.15-promise - (delay - (package - (inherit rust-textwrap-0.12) - (name "rust-textwrap") - (version "0.15.0") - (source (origin - (method url-fetch) - (uri (crate-uri "textwrap" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-hyphenation" ,rust-hyphenation-0.8) - ("rust-smawk" ,rust-smawk-0.3) - ("rust-terminal-size" ,rust-terminal-size-0.1) - ("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1) - ("rust-unicode-width" ,rust-unicode-width-0.1))))))) - -(define rust-clap-lex-0.2 - (package - (name "rust-clap-lex") - (version "0.2.4") - (source (origin - (method url-fetch) - (uri (crate-uri "clap_lex" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6)))) - (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex") - (synopsis "Minimal, flexible command line parser") - (description "Minimal, flexible command line parser") - (license (list license:expat license:asl2.0)))) - -(define rust-clap-derive-3.2.15-promise - (delay - (package - (inherit rust-clap-derive-3) - (name "rust-clap-derive") - (version "3.2.15") - (source (origin - (method url-fetch) - (uri (crate-uri "clap_derive" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1d2c4vs345fwihkd8cc7m6acbiydcwramkd5mnp36p0a7g6jm9cv")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-heck" ,rust-heck-0.4) - ("rust-proc-macro-error" ,rust-proc-macro-error-1) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1))))))) - -(define rust-clap-3.2.16-promise - (delay - (package - (inherit rust-clap-3) - (name "rust-clap") - (version "3.2.16") - (source (origin - (method url-fetch) - (uri (crate-uri "clap" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1af06z8z7m3327yz1xvzxfjanclgpvvy3lssb745rig7adkbpnx3")))) - (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-backtrace" ,rust-backtrace-0.3) - ("rust-bitflags" ,rust-bitflags-1) - ("rust-clap-derive" ,(force rust-clap-derive-3.2.15-promise)) - ("rust-clap-lex" ,rust-clap-lex-0.2) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-regex" ,rust-regex-1) - ("rust-strsim" ,rust-strsim-0.10) - ("rust-termcolor" ,rust-termcolor-1) - ("rust-terminal-size" ,rust-terminal-size-0.1) - ("rust-textwrap" ,(force rust-textwrap-0.15-promise)) - ("rust-unicase" ,rust-unicase-2) - ("rust-yaml-rust" ,rust-yaml-rust-0.4))))))) - -(define rust-cbindgen-0.24-promise - (delay - (package - (inherit rust-cbindgen-0.19) - (name "rust-cbindgen") - (version "0.24.3") - (source (origin - (method url-fetch) - (uri (crate-uri "cbindgen" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6")))) - (arguments - `(#:cargo-inputs (("rust-clap" ,(force rust-clap-3.2.16-promise)) - ("rust-heck" ,rust-heck-0.4) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-log" ,rust-log-0.4) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-syn" ,rust-syn-1) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-toml" ,rust-toml-0.5)) - #:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.5))))))) - -;; Bug with IceCat 102 with cbindgen-0.24, see -;; https://bugzilla.mozilla.org/show_bug.cgi?id=1773259#c5 for -;; possible patch (untested) -(define rust-cbindgen-0.23-promise - (delay - (package - (inherit (force rust-cbindgen-0.24-promise)) - (name "rust-cbindgen") - (version "0.23.0") - (source (origin - (method url-fetch) - (uri (crate-uri "cbindgen" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav"))))))) - - (define mozilla-compare-locales (origin (method hg-fetch) @@ -865,10 +721,9 @@ in C/C++.") ;; ,(search-patch "icecat-use-system-graphite2+harfbuzz.patch")) ;; ("icecat-use-system-media-libs.patch" ;; ,(search-patch "icecat-use-system-media-libs.patch")) - ;; TODO: Change the following lines to use 'rust' when it's >= 1.59. rust `(,rust "cargo") - (force rust-cbindgen-0.23-promise) + rust-cbindgen-0.23 llvm clang perl @@ -1551,7 +1406,7 @@ ca495991b7852b855")) pkg-config python-wrapper rust - (force rust-cbindgen-0.23-promise) + rust-cbindgen-0.23 which yasm)) (home-page "https://www.thunderbird.net") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 9fefde310d..865e982f14 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2022 Ricardo Wurmus ;;; Copyright © 2022 Mathieu Laparie ;;; Copyright © 2022 ( +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -1030,6 +1031,49 @@ rebase.") "This package provides a tool for generating C/C++ bindings to Rust code.") (license license:mpl2.0))) +(define-public rust-cbindgen-0.24 + (package + (inherit rust-cbindgen) + (name "rust-cbindgen") + (version "0.24.3") + (source (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6")))) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-3) + ("rust-heck" ,rust-heck-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-syn" ,rust-syn-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-toml" ,rust-toml-0.5)) + #:cargo-development-inputs + (("rust-serial-test" ,rust-serial-test-0.5)))) + (native-inputs + (list python-cython)))) + +(define-public rust-cbindgen-0.23 + (package + (inherit rust-cbindgen-0.24) + (name "rust-cbindgen") + (version "0.23.0") + (source (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav")))))) + (define-public rust-cbindgen-0.19 (package (inherit rust-cbindgen) -- cgit v1.2.3 From 5c996aa8e4df75c6eb4b6ce58067889c3be11f66 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Thu, 8 Dec 2022 20:17:12 +0100 Subject: gnu: icedove: Update to 102.5.1 [fixes CVE-2022-45414]. * gnu/packages/gnuzilla.scm (icedove): Update to 102.5.1. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 52ece9bbd4..ba910934be 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1097,8 +1097,8 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define %icedove-build-id "20221115000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.5.0") +(define %icedove-build-id "20221201000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "102.5.1") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1107,11 +1107,11 @@ standards of the IceCat project.") (method hg-fetch) (uri (hg-reference (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "b6e9b5a1d1b53d26cfb7032ef2ff02203ab0486b"))) + (changeset "bbf216e50e6a8cb4362b2b77feeb8ca4a1d78914"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "0i2w1ibaip8rlghrk5iaih14xnz5n19ag64qcdgjxic78mhnmm04")))) + "06fhdzpl72mihm97g2i76knbny1jj261isl2jy8085wdmriv2f8z")))) (define-public icedove (package -- cgit v1.2.3 From d83eef22b25a8717a62ba9d3432b7a8657b7b50b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 13 Dec 2022 02:22:37 -0500 Subject: gnu: icecat: Update to 102.6.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2022-46872, CVE-2022-46874, CVE-2022-46875, CVE-2022-46878, CVE-2022-46880, CVE-2022-46881, and CVE-2022-46882. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. --- gnu/packages/gnuzilla.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ba910934be..1942fb0d8d 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -477,8 +477,8 @@ in C/C++.") ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.5.0-guix0-preview1") -(define %icecat-build-id "20221115000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "102.6.0-guix0-preview1") +(define %icecat-build-id "20221213000000") ;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' @@ -500,11 +500,11 @@ in C/C++.") "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1n2pq165fxmvgcr5mv3hhaid2vn7lh3jg03lf13kz4c5295x8z81")))) + "1zhggzrk7lgip8jm37idh22qks76kmjy4yqy2qi63mvnv2j58cfj")))) - (upstream-icecat-base-version "102.5.0") ; maybe older than base-version + (upstream-icecat-base-version "102.6.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "a8848cb35e4e47a344d40596f72d82d57bf5a6f1") + (gnuzilla-commit "b6260130b9808f550bdb35061af2d7962109a181") (gnuzilla-source (origin (method git-fetch) @@ -516,7 +516,7 @@ in C/C++.") (string-take gnuzilla-commit 8))) (sha256 (base32 - "0d0brzi7wmg70kvi9p3g24cyya17bvg2djgjn64g14hpnalg8icw")))) + "19v443w43jbcl9m5kl52nfai7hs4j07nf2ad9ggca7b2b0cz89b4")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. -- cgit v1.2.3 From 8c8a7dc66c8fdf39d6d2d459022e32d376d9a562 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 14 Dec 2022 23:16:32 +0100 Subject: gnu: icedove: Update to 102.6.0. * gnu/packages/gnuzilla.scm (icedove): Update to 102.6.0. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1942fb0d8d..b507ec0406 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1097,8 +1097,8 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define %icedove-build-id "20221201000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.5.1") +(define %icedove-build-id "20221213000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "102.6.0") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1107,11 +1107,11 @@ standards of the IceCat project.") (method hg-fetch) (uri (hg-reference (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "bbf216e50e6a8cb4362b2b77feeb8ca4a1d78914"))) + (changeset "d46a947ae837300f19cc45c75d473c7b1cf4ebb3"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "06fhdzpl72mihm97g2i76knbny1jj261isl2jy8085wdmriv2f8z")))) + "0klr6i2sbaiv2gc8q1cxrz87zd5cskdwa9qacp3dhfb8x17qwb41")))) (define-public icedove (package -- cgit v1.2.3 From 201793fd07f602270b2375491a2f5d1d85d4f2b1 Mon Sep 17 00:00:00 2001 From: Brian Cully Date: Tue, 3 Jan 2023 18:48:39 -0500 Subject: gnu: hunspell: Move hunspell and dictionaries to hunspell module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate hunspell and its dictionaries into the (gnu packages hunspell) module instead of having them scattered about. * gnu/packages/aspell.scm (aspell-word-list, define-word-list-dictionary, hunspell-dict-{en, en-au, en-gb, en-gb-ize, en-us}): Remove variables. * gnu/packages/libreoffice.scm (hunspell, dicollecte-french-dictionary, define-french-dictionary, hunspell-dict-fr-{classique, moderne, réforme, toutes-variantes}, hunspell-dict-pl, hunspell-dict-de, hunspell-dict-hu): Remove variables. * gnu/packages/hunspell.scm (hunspell, dicollecte-french-dictionary, define-french-dictionary, hunspell-dict-fr-{classique, moderne, réforme, toutes-variantes}, hunspell-dict-pl, hunspell-dict-de, hunspell-dict-hu, aspell-word-list, define-word-list-dictionary, hunspell-dict-{en, en-au, en-gb, en-gb-ize, en-us}): Add variables. (hunspell-dictionary): Explicitly declare upstream libreoffice version to prevent circular dependency. * gnu/packages/ebook.scm, gnu/packages/enchant.scm, gnu/packages/freedesktop.scm, gnu/packages/gnuzilla.scm, gnu/packages/kde-frameworks.scm, gnu/packages/messaging.scm, gnu/packages/scribus.scm, gnu/packages/task-management.scm, gnu/packages/telegram.scm, gnu/packages/tex.scm, gnu/packages/text-editors.scm, gnu/packages/video.scm: Adjust module imports. --- gnu/packages/aspell.scm | 118 ------------- gnu/packages/ebook.scm | 3 +- gnu/packages/enchant.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/gnuzilla.scm | 2 +- gnu/packages/hunspell.scm | 362 ++++++++++++++++++++++++++++++++++++++- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/libreoffice.scm | 233 +------------------------ gnu/packages/messaging.scm | 2 +- gnu/packages/scribus.scm | 1 + gnu/packages/task-management.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/tex.scm | 1 + gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 2 +- 15 files changed, 374 insertions(+), 362 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 76deb7cdce..8978b4e087 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -395,124 +395,6 @@ dictionaries, including personal ones.") (base32 "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"))) - -;;; -;;; Hunspell packages made from the Aspell word lists. -;;; - -(define* (aspell-word-list language synopsis - #:optional - (nick (string-map (lambda (chr) - (if (char=? #\_ chr) - #\- - chr)) - (string-downcase language)))) - (package - (name (string-append "hunspell-dict-" nick)) - (version "2018.04.16") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/wordlist/SCOWL/" - version "/scowl-" version ".tar.gz")) - (sha256 - (base32 - "11lkrnhwrf5mvrrq45k4mads3n9aswgac8dc25ba61c75alxb5rs")))) - (native-inputs - (list tar gzip perl aspell)) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-reproducible - (lambda _ - (substitute* "speller/README_en.txt.sh" - (("\\bdate\\b") "")))) - (delete 'configure) - (delete 'check) - (replace 'build - (lambda _ - (substitute* "speller/make-hunspell-dict" - (("zip -9 .*$") - "return\n")) - (mkdir "speller/hunspell") - - ;; XXX: This actually builds all the dictionary variants. - (invoke "make" "-C" "speller" "hunspell"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (hunspell (string-append out "/share/hunspell")) - (myspell (string-append out "/share/myspell")) - (doc (string-append out "/share/doc/" - ,name)) - (dot-dic ,(string-append "speller/" language ".dic"))) - (mkdir-p myspell) - - ;; Usually there's only a 'LANGUAGE.dic' file, but for the "en" - ;; dictionary, there no 'en.dic'. Instead, there's a set of - ;; 'en*.dic' files, hence the 'find-files' call below. - (if (file-exists? dot-dic) - (install-file dot-dic hunspell) - (for-each (lambda (dic) - (install-file dic hunspell)) - (find-files "speller" - ,(string-append language ".*\\.dic$")))) - - ;; Install affix files corresponding to installed dictionaries - (for-each (lambda (dic) - (install-file (string-append - "speller/" (basename dic ".dic") ".aff") - hunspell)) - (find-files hunspell ".*\\.dic$")) - (symlink hunspell (string-append myspell "/dicts")) - (for-each (lambda (file) - (install-file file doc)) - (find-files "." - "^(Copyright|.*\\.(txt|org|md))$")) - #t)))))) - (synopsis synopsis) - (description - "This package provides a dictionary for the Hunspell spell-checking -library.") - (home-page "http://wordlist.aspell.net/") - (license (non-copyleft "file://Copyright" - "Word lists come from several sources, all -under permissive licensing terms. See the 'Copyright' file.")))) - -(define-syntax define-word-list-dictionary - (syntax-rules (synopsis) - ((_ name language (synopsis text)) - (define-public name - (aspell-word-list language text))) - ((_ name language nick (synopsis text)) - (define-public name - (aspell-word-list language text nick))))) - -(define-word-list-dictionary hunspell-dict-en - "en" - (synopsis "Hunspell dictionary for English")) - -(define-word-list-dictionary hunspell-dict-en-au - "en_AU" - (synopsis "Hunspell dictionary for Australian English")) - -(define-word-list-dictionary hunspell-dict-en-ca - "en_CA" - (synopsis "Hunspell dictionary for Canadian English")) - -(define-word-list-dictionary hunspell-dict-en-gb - "en_GB-ise" "en-gb" - (synopsis "Hunspell dictionary for British English, with -ise endings")) - -(define-word-list-dictionary hunspell-dict-en-gb-ize - "en_GB-ize" - (synopsis "Hunspell dictionary for British English, with -ize endings")) - -(define-word-list-dictionary hunspell-dict-en-us - "en_US" - (synopsis "Hunspell dictionary for United States English")) - (define-public ispell (package (name "ispell") diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 8dff0f2ec8..b21fcfdc9a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -56,12 +56,13 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages glib) #:use-module (gnu packages gstreamer) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages javascript) #:use-module (gnu packages language) - #:use-module (gnu packages libusb) #:use-module (gnu packages libreoffice) + #:use-module (gnu packages libusb) #:use-module (gnu packages music) #:use-module (gnu packages pantheon) #:use-module (gnu packages pdf) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index 1f82b2447e..015af0d096 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -25,8 +25,8 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages glib) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages man) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 304d04a711..515d9b9cea 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -94,12 +94,12 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages ibus) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libffi) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b507ec0406..01b6245f8b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -70,8 +70,8 @@ #: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 libreoffice) ;for hunspell #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages pulseaudio) diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm index 48df196e17..8bc8c38176 100644 --- a/gnu/packages/hunspell.scm +++ b/gnu/packages/hunspell.scm @@ -17,13 +17,253 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages hunspell) + #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (ice-9 match) - #:use-module (gnu packages libreoffice)) + #:use-module (gnu packages aspell) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages m4) + #:use-module (gnu packages perl) + #:use-module (gnu packages textutils)) + +(define-public hunspell + (package + (name "hunspell") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hunspell/hunspell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qxlkd012r45ppd21kldbq9k5ac5nmxz290z6m2kch9l56v768k1")))) + (build-system gnu-build-system) + (native-inputs + (list autoconf automake libtool)) + (inputs + (list perl)) + (native-search-paths (list (search-path-specification + (variable "DICPATH") + (files '("share/hunspell"))))) + (home-page "https://hunspell.github.io/") + (synopsis "Spell checker") + (description "Hunspell is a spell checker and morphological analyzer +library and program designed for languages with rich morphology and complex +word compounding or character encoding.") + ;; Triple license, including "mpl1.1 or later". + (license (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)))) + +(define (dicollecte-french-dictionary variant synopsis) + ;; Return a French dictionary package from dicollecte.org, for the given + ;; VARIANT. + (package + (name (match variant + ("classique" "hunspell-dict-fr") + (_ (string-append "hunspell-dict-fr-" variant)))) + (version "6.2") + (source (origin + (uri (string-append + "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v" + version ".zip")) + (method url-fetch) + (sha256 + (base32 + "139hfrn5p87sl8hqmgkf6sgvnxrk2mm8vd8xsm8sm98qjnwlg0f9")))) + (build-system trivial-build-system) + (native-inputs (list unzip)) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((out (assoc-ref %outputs "out")) + (hunspell (string-append out "/share/hunspell")) + (myspell (string-append out "/share/myspell")) + (doc (string-append out "/share/doc/" + ,name)) + (unzip (assoc-ref %build-inputs "unzip"))) + (invoke (string-append unzip "/bin/unzip") + (assoc-ref %build-inputs "source")) + (for-each (cut install-file <> hunspell) + (find-files "." + ,(string-append variant + "\\.(dic|aff)$"))) + (mkdir-p myspell) + (symlink hunspell (string-append myspell "/dicts")) + (for-each (cut install-file <> doc) + (find-files "." "\\.(txt|org|md)$")) + #t)))) + (synopsis synopsis) + (description + "This package provides a dictionary for the Hunspell spell-checking +library.") + (home-page "https://www.dicollecte.org/home.php?prj=fr") + (license license:mpl2.0))) + +(define-syntax define-french-dictionary + (syntax-rules (synopsis) + ((_ name variant (synopsis text)) + (define-public name + (dicollecte-french-dictionary variant text))))) + +(define-french-dictionary hunspell-dict-fr-classique + "classique" + ;; TRANSLATORS: In French, this is "Français classique". + (synopsis "Hunspell dictionary for ``classic'' French (recommended)")) + +(define-french-dictionary hunspell-dict-fr-moderne + "moderne" + ;; TRANSLATORS: In French, this is "Français moderne". + (synopsis "Hunspell dictionary for ``modern'' French")) + +(define-french-dictionary hunspell-dict-fr-réforme-1990 + "reforme1990" + (synopsis "Hunspell dictionary for the post @dfn{1990 réforme} French")) + +(define-french-dictionary hunspell-dict-fr-toutes-variantes + "toutesvariantes" + (synopsis "Hunspell dictionary for all variants of French")) + +(define-public hunspell-dict-pl + (package + (name "hunspell-dict-pl") + (version "20200327") + (source + (origin + (method url-fetch) + ;; Since creators of dictionary host only the latest daily release, + ;; we're using version mirrored by Arch Linux, which seems good + ;; enough. They're mirroring hunspell-pl releases since 2011. + (uri (string-append "https://sources.archlinux.org/other/community/" + "hunspell-pl/sjp-myspell-pl-" + version ".zip")) + (sha256 (base32 + "14mzf8glxkp2775dcqisb1zv6r8ncm3bvzl46q352rwyl2dg1c59")))) + + (build-system trivial-build-system) + (native-inputs (list unzip)) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((out (assoc-ref %outputs "out")) + (hunspell (string-append out "/share/hunspell")) + (myspell (string-append out "/share/myspell")) + (doc (string-append out "/share/doc/" + ,name)) + (unzip (search-input-file %build-inputs + "/bin/unzip"))) + (invoke unzip "-j" "-o" (assoc-ref %build-inputs "source")) + (invoke unzip "-j" "-o" "pl_PL.zip") + (for-each (cut install-file <> hunspell) + (find-files "." + ,(string-append "pl_PL" + "\\.(dic|aff)$"))) + (mkdir-p myspell) + (symlink hunspell (string-append myspell "/dicts")) + (for-each (cut install-file <> doc) + (find-files "." "\\.(txt|org|md)$")) + #t)))) + (synopsis "Hunspell dictionary for Polish") + (description + "This package provides a dictionary for the Hunspell spell-checking +library.") + (home-page "https://sjp.pl/slownik/ort/") + (license + (list license:gpl2 license:mpl1.1 license:cc-by4.0 license:lgpl2.1 license:asl2.0)))) + +(define-public hunspell-dict-de + (package + (name "hunspell-dict-de") + (version "20161207") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.j3e.de/ispell/igerman98/dict/" + "igerman98-" version ".tar.bz2")) + (sha256 + (base32 "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("hunspell/de_DE.dic") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/hunspell/"))) + (install-file "hunspell/de_DE.aff" share) + (install-file "hunspell/de_DE.dic" share) + #t)))) + #:tests? #f)) ; no tests + (native-inputs + (list hunspell ispell perl)) + (synopsis "Hunspell dictionary for German (de_DE)") + (description "This package provides a dictionary for the Hunspell +spell-checking library.") + (home-page "https://www.j3e.de/ispell/igerman98/") + (license (list license:gpl2 license:gpl3)))) + +(define-public hunspell-dict-hu + (let ((revision "2") + (major+minor "1.7")) + (package + (name "hunspell-dict-hu") + (version (string-append major+minor "-" revision)) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/magyarispell/Magyar Ispell/" + major+minor + "/magyarispell-" version ".tar.gz")) + (sha256 + (base32 "0r22rvqrp5bzgr9sqyap82kibi5z9n6xy5b06si28idqijw7c772")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags + #~(list "myspell" + "--jobs=1" ;the Makefile is not ready for parallelism + (string-append "SH=" + (search-input-file %build-inputs + "/bin/bash")) + (string-append "AWK=" + (search-input-file %build-inputs + "/bin/awk"))) + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "config" + (("/usr/bin/awk") + (which "awk"))))) + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/hunspell/"))) + (install-file "hu_HU.aff" share) + (install-file "hu_HU.dic" share))))) + #:tests? #f)) ; no tests + (native-inputs + (list hunspell m4 recode)) + (synopsis "Hunspell dictionary for Hungarian (hu_HU)") + (description "This package provides a dictionary for the Hunspell +spell-checking library.") + (home-page "http://magyarispell.sourceforge.net/") + (license (list license:gpl2 license:gpl3))))) (define* (hunspell-dictionary dict-name full-name #:key synopsis home-page license) (package @@ -35,7 +275,7 @@ (#\_ #\-) (chr chr)) (string-downcase dict-name)))) - (version (package-version libreoffice)) + (version "7.4.3.2") (source (origin (method git-fetch) @@ -79,3 +319,121 @@ spell-checking library.") #:synopsis (synopsis "Hunspell dictionary for Italian") #:home-page "https://www.libreitalia.org/" #:license license:gpl3))) + +;;; +;;; Hunspell packages made from the Aspell word lists. +;;; + +(define* (aspell-word-list language synopsis + #:optional + (nick (string-map (lambda (chr) + (if (char=? #\_ chr) + #\- + chr)) + (string-downcase language)))) + (package + (name (string-append "hunspell-dict-" nick)) + (version "2018.04.16") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/wordlist/SCOWL/" + version "/scowl-" version ".tar.gz")) + (sha256 + (base32 + "11lkrnhwrf5mvrrq45k4mads3n9aswgac8dc25ba61c75alxb5rs")))) + (native-inputs + (list tar gzip perl aspell)) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-reproducible + (lambda _ + (substitute* "speller/README_en.txt.sh" + (("\\bdate\\b") "")))) + (delete 'configure) + (delete 'check) + (replace 'build + (lambda _ + (substitute* "speller/make-hunspell-dict" + (("zip -9 .*$") + "return\n")) + (mkdir "speller/hunspell") + + ;; XXX: This actually builds all the dictionary variants. + (invoke "make" "-C" "speller" "hunspell"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (hunspell (string-append out "/share/hunspell")) + (myspell (string-append out "/share/myspell")) + (doc (string-append out "/share/doc/" + ,name)) + (dot-dic ,(string-append "speller/" language ".dic"))) + (mkdir-p myspell) + + ;; Usually there's only a 'LANGUAGE.dic' file, but for the "en" + ;; dictionary, there no 'en.dic'. Instead, there's a set of + ;; 'en*.dic' files, hence the 'find-files' call below. + (if (file-exists? dot-dic) + (install-file dot-dic hunspell) + (for-each (lambda (dic) + (install-file dic hunspell)) + (find-files "speller" + ,(string-append language ".*\\.dic$")))) + + ;; Install affix files corresponding to installed dictionaries + (for-each (lambda (dic) + (install-file (string-append + "speller/" (basename dic ".dic") ".aff") + hunspell)) + (find-files hunspell ".*\\.dic$")) + (symlink hunspell (string-append myspell "/dicts")) + (for-each (lambda (file) + (install-file file doc)) + (find-files "." + "^(Copyright|.*\\.(txt|org|md))$")) + #t)))))) + (synopsis synopsis) + (description + "This package provides a dictionary for the Hunspell spell-checking +library.") + (home-page "http://wordlist.aspell.net/") + (license (license:non-copyleft "file://Copyright" + "Word lists come from several sources, all +under permissive licensing terms. See the 'Copyright' file.")))) + +(define-syntax define-word-list-dictionary + (syntax-rules (synopsis) + ((_ name language (synopsis text)) + (define-public name + (aspell-word-list language text))) + ((_ name language nick (synopsis text)) + (define-public name + (aspell-word-list language text nick))))) + +(define-word-list-dictionary hunspell-dict-en + "en" + (synopsis "Hunspell dictionary for English")) + +(define-word-list-dictionary hunspell-dict-en-au + "en_AU" + (synopsis "Hunspell dictionary for Australian English")) + +(define-word-list-dictionary hunspell-dict-en-ca + "en_CA" + (synopsis "Hunspell dictionary for Canadian English")) + +(define-word-list-dictionary hunspell-dict-en-gb + "en_GB-ise" "en-gb" + (synopsis "Hunspell dictionary for British English, with -ise endings")) + +(define-word-list-dictionary hunspell-dict-en-gb-ize + "en_GB-ize" + (synopsis "Hunspell dictionary for British English, with -ize endings")) + +(define-word-list-dictionary hunspell-dict-en-us + "en_US" + (synopsis "Hunspell dictionary for United States English")) + diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index aaa5a82d5f..fb578ee7e1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -64,13 +64,13 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages image) #:use-module (gnu packages iso-codes) #:use-module (gnu packages kerberos) #:use-module (gnu packages kde) #:use-module (gnu packages kde-plasma) #:use-module (gnu packages libcanberra) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages mp3) #:use-module (gnu packages openbox) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 2103aec5a0..b959470d8f 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -70,6 +70,7 @@ #:use-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages java) @@ -792,191 +793,6 @@ Callisto/Draw documents. Currently it only understands documents created by Zoner Draw version 4 and 5.") (license license:mpl2.0))) -(define-public hunspell - (package - (name "hunspell") - (version "1.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hunspell/hunspell") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qxlkd012r45ppd21kldbq9k5ac5nmxz290z6m2kch9l56v768k1")))) - (build-system gnu-build-system) - (native-inputs - (list autoconf automake libtool)) - (inputs - (list perl)) - (native-search-paths (list (search-path-specification - (variable "DICPATH") - (files '("share/hunspell"))))) - (home-page "https://hunspell.github.io/") - (synopsis "Spell checker") - (description "Hunspell is a spell checker and morphological analyzer -library and program designed for languages with rich morphology and complex -word compounding or character encoding.") - ;; Triple license, including "mpl1.1 or later". - (license (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)))) - -(define (dicollecte-french-dictionary variant synopsis) - ;; Return a French dictionary package from dicollecte.org, for the given - ;; VARIANT. - (package - (name (match variant - ("classique" "hunspell-dict-fr") - (_ (string-append "hunspell-dict-fr-" variant)))) - (version "6.2") - (source (origin - (uri (string-append - "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v" - version ".zip")) - (method url-fetch) - (sha256 - (base32 - "139hfrn5p87sl8hqmgkf6sgvnxrk2mm8vd8xsm8sm98qjnwlg0f9")))) - (build-system trivial-build-system) - (native-inputs (list unzip)) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((out (assoc-ref %outputs "out")) - (hunspell (string-append out "/share/hunspell")) - (myspell (string-append out "/share/myspell")) - (doc (string-append out "/share/doc/" - ,name)) - (unzip (assoc-ref %build-inputs "unzip"))) - (invoke (string-append unzip "/bin/unzip") - (assoc-ref %build-inputs "source")) - (for-each (cut install-file <> hunspell) - (find-files "." - ,(string-append variant - "\\.(dic|aff)$"))) - (mkdir-p myspell) - (symlink hunspell (string-append myspell "/dicts")) - (for-each (cut install-file <> doc) - (find-files "." "\\.(txt|org|md)$")) - #t)))) - (synopsis synopsis) - (description - "This package provides a dictionary for the Hunspell spell-checking -library.") - (home-page "https://www.dicollecte.org/home.php?prj=fr") - (license license:mpl2.0))) - -(define-syntax define-french-dictionary - (syntax-rules (synopsis) - ((_ name variant (synopsis text)) - (define-public name - (dicollecte-french-dictionary variant text))))) - -(define-french-dictionary hunspell-dict-fr-classique - "classique" - ;; TRANSLATORS: In French, this is "Français classique". - (synopsis "Hunspell dictionary for ``classic'' French (recommended)")) - -(define-french-dictionary hunspell-dict-fr-moderne - "moderne" - ;; TRANSLATORS: In French, this is "Français moderne". - (synopsis "Hunspell dictionary for ``modern'' French")) - -(define-french-dictionary hunspell-dict-fr-réforme-1990 - "reforme1990" - (synopsis "Hunspell dictionary for the post @dfn{1990 réforme} French")) - -(define-french-dictionary hunspell-dict-fr-toutes-variantes - "toutesvariantes" - (synopsis "Hunspell dictionary for all variants of French")) - -(define-public hunspell-dict-pl - (package - (name "hunspell-dict-pl") - (version "20200327") - (source - (origin - (method url-fetch) - ;; Since creators of dictionary host only the latest daily release, - ;; we're using version mirrored by Arch Linux, which seems good - ;; enough. They're mirroring hunspell-pl releases since 2011. - (uri (string-append "https://sources.archlinux.org/other/community/" - "hunspell-pl/sjp-myspell-pl-" - version ".zip")) - (sha256 (base32 - "14mzf8glxkp2775dcqisb1zv6r8ncm3bvzl46q352rwyl2dg1c59")))) - - (build-system trivial-build-system) - (native-inputs (list unzip)) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((out (assoc-ref %outputs "out")) - (hunspell (string-append out "/share/hunspell")) - (myspell (string-append out "/share/myspell")) - (doc (string-append out "/share/doc/" - ,name)) - (unzip (search-input-file %build-inputs - "/bin/unzip"))) - (invoke unzip "-j" "-o" (assoc-ref %build-inputs "source")) - (invoke unzip "-j" "-o" "pl_PL.zip") - (for-each (cut install-file <> hunspell) - (find-files "." - ,(string-append "pl_PL" - "\\.(dic|aff)$"))) - (mkdir-p myspell) - (symlink hunspell (string-append myspell "/dicts")) - (for-each (cut install-file <> doc) - (find-files "." "\\.(txt|org|md)$")) - #t)))) - (synopsis "Hunspell dictionary for Polish") - (description - "This package provides a dictionary for the Hunspell spell-checking -library.") - (home-page "https://sjp.pl/slownik/ort/") - (license - (list license:gpl2 license:mpl1.1 license:cc-by4.0 license:lgpl2.1 license:asl2.0)))) - -(define-public hunspell-dict-de - (package - (name "hunspell-dict-de") - (version "20161207") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.j3e.de/ispell/igerman98/dict/" - "igerman98-" version ".tar.bz2")) - (sha256 - (base32 "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags '("hunspell/de_DE.dic") - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install ;no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share/hunspell/"))) - (install-file "hunspell/de_DE.aff" share) - (install-file "hunspell/de_DE.dic" share) - #t)))) - #:tests? #f)) ; no tests - (native-inputs - (list hunspell ispell perl)) - (synopsis "Hunspell dictionary for German (de_DE)") - (description "This package provides a dictionary for the Hunspell -spell-checking library.") - (home-page "https://www.j3e.de/ispell/igerman98/") - (license (list license:gpl2 license:gpl3)))) - (define-public hyphen (package (name "hyphen") @@ -1000,53 +816,6 @@ patterns, which are pre-processed by a perl script.") (license (list license:mpl1.1 license:mpl2.0 license:gpl2+ license:lgpl2.1+)))) -(define-public hunspell-dict-hu - (let ((revision "2") - (major+minor "1.7")) - (package - (name "hunspell-dict-hu") - (version (string-append major+minor "-" revision)) - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/magyarispell/Magyar Ispell/" - major+minor - "/magyarispell-" version ".tar.gz")) - (sha256 - (base32 "0r22rvqrp5bzgr9sqyap82kibi5z9n6xy5b06si28idqijw7c772")))) - (build-system gnu-build-system) - (arguments - (list #:make-flags - #~(list "myspell" - "--jobs=1" ;the Makefile is not ready for parallelism - (string-append "SH=" - (search-input-file %build-inputs - "/bin/bash")) - (string-append "AWK=" - (search-input-file %build-inputs - "/bin/awk"))) - #:phases - #~(modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "config" - (("/usr/bin/awk") - (which "awk"))))) - (replace 'install ;no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share/hunspell/"))) - (install-file "hu_HU.aff" share) - (install-file "hu_HU.dic" share))))) - #:tests? #f)) ; no tests - (native-inputs - (list hunspell m4 recode)) - (synopsis "Hunspell dictionary for Hungarian (hu_HU)") - (description "This package provides a dictionary for the Hunspell -spell-checking library.") - (home-page "http://magyarispell.sourceforge.net/") - (license (list license:gpl2 license:gpl3))))) - (define-public mythes (package (name "mythes") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7b693a07fa..80a058f12e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -88,6 +88,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages kde) @@ -98,7 +99,6 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages lua) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index a1d81f5697..de598ac2f4 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index cb5cc6ff0d..c4f7f99049 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -36,7 +36,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) - #:use-module (gnu packages libreoffice) ;for hunspell + #:use-module (gnu packages hunspell) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 82c9227ba8..14e0602d93 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -38,12 +38,12 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages image) #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libevent) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a600bcae58..13bc000918 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages ghostscript) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libreoffice) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 854a424b8a..0094959cbb 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -72,10 +72,10 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libbsd) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c4b0024d06..e934379ff4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -145,11 +145,11 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages hunspell) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages iso-codes) #:use-module (gnu packages libidn) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) -- cgit v1.2.3 From 306737c6797cc209a4f034e51c4057c15c6cc311 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 16 Jan 2023 07:08:09 -0500 Subject: gnu: icecat: Update to 102.7.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2022-46871, CVE-2022-46877, CVE-2023-23598, CVE-2023-23599, CVE-2023-23601, CVE-2023-23602, CVE-2023-23603, and CVE-2023-23605. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update gnuzilla commit, base version, and hashes. --- gnu/packages/gnuzilla.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 01b6245f8b..23249791bb 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -477,8 +477,8 @@ in C/C++.") ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-version "102.6.0-guix0-preview1") -(define %icecat-build-id "20221213000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "102.7.0-guix0-preview1") +(define %icecat-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' @@ -500,11 +500,11 @@ in C/C++.") "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1zhggzrk7lgip8jm37idh22qks76kmjy4yqy2qi63mvnv2j58cfj")))) + "1ahl66x8chnsz80capqa5ivyrqhc50s91zrcgz1jxd7w2ws61957")))) - (upstream-icecat-base-version "102.6.0") ; maybe older than base-version + (upstream-icecat-base-version "102.7.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) - (gnuzilla-commit "b6260130b9808f550bdb35061af2d7962109a181") + (gnuzilla-commit "7f76da3cfd5d04fa38d894f6ea6ac5f2fd0ea837") (gnuzilla-source (origin (method git-fetch) @@ -516,7 +516,7 @@ in C/C++.") (string-take gnuzilla-commit 8))) (sha256 (base32 - "19v443w43jbcl9m5kl52nfai7hs4j07nf2ad9ggca7b2b0cz89b4")))) + "19i66qvwzgllgnlw270bxphymybjj1qb5hdznqi4i2dcgpcrq77l")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. -- cgit v1.2.3 From 4eccb27b4c74a9112cbbad722d85558e9565f20b Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sun, 29 Jan 2023 22:03:45 +0100 Subject: gnu: icedove: Update to 102.7.0. * gnu/packages/gnuzilla.scm (icedove): Update to 102.7.0. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnuzilla.scm') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 23249791bb..0b39774a2e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1097,8 +1097,8 @@ standards of the IceCat project.") (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) -(define %icedove-build-id "20221213000000") ;must be of the form YYYYMMDDhhmmss -(define %icedove-version "102.6.0") +(define %icedove-build-id "20230119000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-version "102.7.0") ;; Provides the "comm" folder which is inserted into the icecat source. ;; Avoids the duplication of Icecat's source tarball. @@ -1107,11 +1107,11 @@ standards of the IceCat project.") (method hg-fetch) (uri (hg-reference (url "https://hg.mozilla.org/releases/comm-esr102") - (changeset "d46a947ae837300f19cc45c75d473c7b1cf4ebb3"))) + (changeset "a786f143946e93a3059e6fe290bb954840ab9778"))) (file-name (string-append "thunderbird-" %icedove-version "-checkout")) (sha256 (base32 - "0klr6i2sbaiv2gc8q1cxrz87zd5cskdwa9qacp3dhfb8x17qwb41")))) + "02pz9yhpp3lswjmvj30vbx05mbi31bnzzfwyw5v996zg5wz2fpyv")))) (define-public icedove (package -- cgit v1.2.3