Re: [Patch 1/10] Add pjproject.

[Ricardo Wurmus]

Hi Lukas,

Thanks for sending an updated patch!

>>> +(define-public pjproject-sfl
>>> +  (let ((sfl-patches
>>> +         (let ((commit "3dbedf53e9cceebb1eed155b5143026f6d253cb8"))
>>> +           (origin
>>> +             (method git-fetch)
>>> +             (uri
>>> +              (git-reference
>>> +               (url
>>> +                "https://gerrit-ring.savoirfairelinux.com/ring-daemon.git";)
>>> +               (commit commit)))
>>> +             (file-name (string-append "sfl-patches" "-" "0.0.0-1."
>>> +                                       (string-take commit 7)  
>>> "-checkout"))
>>> +             (modules '((guix build utils)
>>> +                        (ice-9 ftw)))
>>> +             (snippet
>>> +              '(let ((files (scandir "." (lambda (file)
>>> +                                           (if (or (string=? file ".")
>>> +                                                   (string=? file ".."))
>>> +                                               #f
>>> +                                               #t)))))
>>> +                 (mkdir-p "sfl-patches")
>>> +                 (copy-recursively "contrib/src/pjproject/" "sfl-patches")
>>> +                 (for-each delete-file-recursively files)))
>>
>> Why is this needed?
>
> My idea here is the following:  The source tree downloaded here contains
> the complete source for libring, which includes the patches to
> pjproject.  In this snippet I try to get rid of all the other libring
> files that are not needed and only keep the patches to pjproject.  Then
> I try to make the directory tree that contains these patches as shallow
> as possible.  I remember I had some problems with copying them to "."
> but trying again now it works.  I attached an updated patch that does
> this.

Is there no release that includes these patches?  Why do we have to
apply them ourselves?  In Guix we try to avoid patching upstream sources
with functional patches (as opposed to patches that fix problems with
building the software on Guix), as this is really upstream’s work.

Is this really pjproject version 2.4 when we apply a massive patch set
like that?

~~ Ricardo