From: ludo@gnu.org (Ludovic Courtès)
To: Hartmut Goebel <h.goebel@crazy-compilers.com>
Cc: 26352@debbugs.gnu.org
Subject: bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2.
Date: Mon, 10 Apr 2017 12:04:12 +0200 [thread overview]
Message-ID: <871st0efz7.fsf@gnu.org> (raw)
In-Reply-To: <1491245802-28648-1-git-send-email-h.goebel@crazy-compilers.com> (Hartmut Goebel's message of "Mon, 3 Apr 2017 20:56:40 +0200")
Hi Hartmut,
Hartmut Goebel <h.goebel@crazy-compilers.com> skribis:
> * gnu/packages/gnome.scm (networkmanager): [source] Update to 1.6.2
> [pre-configure]: Adopt to now used single Makefile.in.
> [fix-docbook]: New phase, required for docbook-xsl catalogs.
> [install]: Also pass "nmstatedir".
> [native-inputs]: Add docbook-xsl, libxslt.
> [inputs]: Add jansson.
Note that ‘pre-configure’, ‘fix-docbook’, and ‘install’ are not fields
of <package>, so we normally don’t represent them this way in commit
logs.
> ;; cope with being already in the Guix build jail as that jail
> ;; lacks some features that they would like to proxy over (like
> ;; a /sys mount).
> - (substitute* '("src/platform/Makefile.in"
> - "src/devices/Makefile.in")
> - (("SUBDIRS = tests") ""))
> - (substitute* '("src/tests/Makefile.in")
> - (("\ttest-route-manager-linux") "\t")
> - (("\ttest-route-manager-fake") "\t"))
> + (substitute* '("Makefile.in")
> + (("src/platform/tests/test-address-linux") " ")
> + (("src/platform/tests/test-cleanup-linux") " ")
> + (("src/platform/tests/test-link-linux") " ")
> + (("src/platform/tests/test-route-linux") " ")
> + (("src/devices/tests/test-arping") " ")
> + (("src/devices/tests/test-lldp") " ")
> + (("src/tests/test-route-manager-linux") " "))
> #t))
A couple of new tests are being skipped, this is for the same reason as
the others, right?
> + (add-before 'configure 'fix-docbook
> + (lambda* (#:key inputs #:allow-other-keys)
> + (setenv "XML_CATALOG_FILES"
> + (string-append
> + (assoc-ref %build-inputs "docbook-xsl")
> + "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl)
> + "/catalog.xml"))))
Normally adding both libxml2 and libxslt as inputs would save you from
writing this phase. Could you check that this is the case?
If it is, please do that instead; otherwise, the new phase is OK, but
best call it ’set-xml-catalog-path’ and return #t.
Thank you!
Ludo’.
next prev parent reply other threads:[~2017-04-10 10:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-03 18:54 bug#26352: [PATCH 0/3] Update KDE Frameworks to 5.32 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 2/3] gnu: Update phonon to 4.9.1 Hartmut Goebel
2017-04-03 18:56 ` bug#26352: [PATCH 3/3] gnu: Update kde-frameworks to 5.32.0 Hartmut Goebel
2017-04-10 10:04 ` Ludovic Courtès [this message]
2017-04-11 13:48 ` bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2 Hartmut Goebel
2017-04-11 15:45 ` Ludovic Courtès
2017-04-12 8:11 ` Hartmut Goebel
2017-04-12 8:11 ` bug#26352: close Hartmut Goebel
2017-04-12 13:34 ` Clément Lassieur
2017-04-03 19:12 ` bug#26352: [PATCH 4/4] gnu: kde-frameworks: No longer setenv CTEST_OUTPUT_ON_FAILURE Hartmut Goebel
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=871st0efz7.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=26352@debbugs.gnu.org \
--cc=h.goebel@crazy-compilers.com \
/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).