Re:Re: IceCat-78.2 preview on 'wip-icecat-78' branch; need icedove-78.

["Zhu Zihao" <all_but_last@163.com>]

[-- Attachment #1: Type: text/plain, Size: 2201 bytes --]

Patches sent to http://debbugs.gnu.org/cgi/bugreport.cgi?bug=43663


Please review, thanks!








At 2020-09-28 04:15:42, "Mark H Weaver" <mhw@netris.org> wrote:
>Hi,
>
>"Zhu Zihao" <all_but_last@163.com> writes:
>
>> @@ -1017,10 +1010,31 @@ from forcing GEXP-PROMISE."
>>             (lambda _
>>               (use-modules (guix build cargo-utils))
>>               (let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
>> -               (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock")
>> -                 (("(\"checksum .* = )\".*\"" all name)
>> -                  (string-append name "\"" null-hash "\"")))
>> -               (generate-all-checksums "third_party/rust"))
>> +               (for-each (lambda (file)
>> +                           (format #t "patching checksums in ~a~%" file)
>> +                           (substitute* (find-files "." "Cargo.lock$")
>> +                             (("^checksum = \".*\"")
>> +                              (string-append "checksum = \"" null-hash "\""))))
>> +                         (find-files "." "Cargo.lock$"))
>[...]
>> Why we need another `find-files` in `substitute*`? The outer
>> `find-files` should find all locks file for you, maybe you can use the
>> arg of lambda instead.
>
>Indeed, that's clearly what I had intended to do, but then I apparently
>forgot a step.  Good catch, thanks!
>
>> @@ -756,8 +750,8 @@ from forcing GEXP-PROMISE."
>>         ("libxt" ,libxt)
>>         ("libffi" ,libffi)
>>         ("ffmpeg" ,ffmpeg)
>> -       ("libvpx" ,libvpx)
>> -       ("icu4c" ,icu4c)
>> +       ;; UNBUNDLE-ME! ("libvpx" ,libvpx)
>> +       ;; UNBUNDLE-ME! ("icu4c" ,icu4c)
>>         ("pixman" ,pixman)
>>         ("pulseaudio" ,pulseaudio)
>>         ("mesa" ,mesa)
>>
>> IceCat 78 may need icu4c v67, which variable name is `icu4c-67` in
>> guix channel.
>
>Good idea!  Would you like to propose a patch, test it, and report back?
>If not, I'll try it eventually.  I would certainly be very glad to
>reduce the number of bundled libraries in our IceCat package, which
>seems to be getting worse over time.  Any help on that effort would be
>much appreciated.
>
>       Best,
>        Mark

[-- Attachment #2: Type: text/html, Size: 2820 bytes --]