unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Ricardo Wurmus <rekado@elephly.net>
To: Lukas Gradl <lgradl@openmailbox.org>
Cc: guix-devel@gnu.org
Subject: Re: [Patch 1/10] Add pjproject.
Date: Thu, 22 Sep 2016 04:46:14 +0200	[thread overview]
Message-ID: <87bmzg8xe1.fsf@elephly.net> (raw)
In-Reply-To: <87oa3j870k.fsf@openmailbox.org>


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

  reply	other threads:[~2016-09-22  2:46 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-13  2:22 [Patch 0/10] Add Ring Lukas Gradl
2016-09-13  2:23 ` [Patch 1/10] Add pjproject Lukas Gradl
2016-09-19  7:41   ` Ricardo Wurmus
2016-09-20  5:39     ` Lukas Gradl
2016-09-22  2:46       ` Ricardo Wurmus [this message]
2016-09-26  6:41         ` Lukas Gradl
2016-11-05 22:25           ` Ricardo Wurmus
2016-11-05 22:49             ` Mathieu Lirzin
2016-11-05 22:54               ` Ricardo Wurmus
2016-09-13  2:24 ` [Patch 2/10] Add dbus-c++ Lukas Gradl
2016-09-28  9:09   ` Ludovic Courtès
2016-09-13  2:25 ` [Patch 3/10] Add gsm Lukas Gradl
2016-09-28  9:16   ` Ludovic Courtès
2016-09-13  2:26 ` [Patch 4/10] argon2: Install pkg-config file Lukas Gradl
2016-09-15 21:24   ` Danny Milosavljevic
2016-09-17 16:47     ` Lukas Gradl
2016-09-18 21:32       ` Lukas Gradl
2016-09-18 21:43     ` Lukas Gradl
2016-09-19 19:15       ` Danny Milosavljevic
2016-09-25 22:45         ` Lukas Gradl
2016-09-25 23:13           ` Danny Milosavljevic
2016-09-25 23:32             ` Lukas Gradl
2016-09-28  9:18               ` Ludovic Courtès
2016-09-13  2:27 ` [Patch 5/10] opendht: Propagate argon2 Lukas Gradl
2016-09-25 22:54   ` Lukas Gradl
2016-09-25 23:24     ` Danny Milosavljevic
2016-09-25 23:43       ` Lukas Gradl
2016-09-13  2:28 ` [Patch 6/10] telephony: Add license prefix Lukas Gradl
2016-09-15 21:25   ` Danny Milosavljevic
2016-09-28  9:25   ` Ludovic Courtès
2016-09-13  2:29 ` [Patch 7/10] opendht: Propagate msgpack Lukas Gradl
2016-09-28  9:48   ` Ludovic Courtès
2016-09-13  2:30 ` [Patch 8/10] Add libring Lukas Gradl
2016-11-05 22:30   ` Ricardo Wurmus
2016-09-13  2:30 ` [Patch 9/10] Add libringclient Lukas Gradl
2016-09-13  2:31 ` [Patch 10/10] Add ring-client-gnome Lukas Gradl
2016-09-15 21:27   ` Danny Milosavljevic
2016-09-17 16:38     ` Lukas Gradl
2016-09-25 23:23       ` Lukas Gradl
2016-09-25 23:35       ` GNOME Settings Schemas - How are they searched for? Danny Milosavljevic
2016-10-23 15:36         ` Pjotr Prins
2016-11-05  4:59 ` [Patch 0/10] Add Ring Chris Marusich
2016-11-09 18:07   ` Lukas Gradl
2016-11-09 22:43     ` Leo Famulari
2016-11-12 23:39       ` Lukas Gradl
2016-11-13  0:52     ` Mike Gerwitz
2016-11-13 21:00       ` Lukas Gradl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87bmzg8xe1.fsf@elephly.net \
    --to=rekado@elephly.net \
    --cc=guix-devel@gnu.org \
    --cc=lgradl@openmailbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).