unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Brice Waegeneire <brice@waegenei.re>
To: 40996@debbugs.gnu.org
Subject: [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch'.
Date: Fri,  1 May 2020 15:09:30 +0200	[thread overview]
Message-ID: <20200501130930.5888-3-brice@waegenei.re> (raw)
In-Reply-To: <20200501130930.5888-1-brice@waegenei.re>

* gnu/packages/hardware.scm (usgbuard)[source]: Get it from git.
[arguments]: Rename phase 'patch-makefile' to 'patch-build-scripts',
adjust it for the source from git and fix 'catch' path.
[native-inputs]: Add 'libtool'.
---
 gnu/packages/hardware.scm | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 74fd282191..de4f82e105 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -389,21 +389,26 @@ applications.")
     (name "usbguard")
     (version "0.7.6")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/USBGuard/usbguard/releases/download/usbguard-"
-                    version "/usbguard-" version ".tar.gz"))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "0gzhs8s4aka86mkcjib36z54si939ki4bmk46p6v8kln1fixad3j"))))
+               (method git-fetch)
+               (uri (git-reference
+                     (url "https://github.com/USBGuard/usbguard.git")
+                     (commit (string-append name "-" version))))
+               (file-name (git-file-name name version))
+               (sha256
+                (base32
+                 "1x8pvlfy3b87iqxh2bjzjd4w26fllwd25c4haz9rqkrvrl27nx38"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-after 'configure 'patch-makefile
-           (lambda _
+         (add-after 'unpack 'patch-build-scripts
+           (lambda* (#:key inputs #:allow-other-keys)
+             (delete-file "autogen.sh") ; Want network access
+             (substitute* "configure.ac"
+               (("/usr/include/catch")
+                (string-append (assoc-ref inputs "catch") "/include")))
              ;; Do not create log directory.
-             (substitute* "Makefile" ((".*/log/usbguard.*") ""))
+             (substitute* "Makefile.am" ((".*/log/usbguard.*") ""))
              ;; Disable LDAP tests: they use 'sudo'.
              (substitute* "src/Tests/Makefile.am"
                (("WITH_LDAP") "FALSE"))
@@ -452,6 +457,7 @@ applications.")
        ("automake" ,automake)
        ("bash-completion" ,bash-completion)
        ("gdbus-codegen" ,glib "bin")
+       ("libtool" ,libtool)
        ("umockdev" ,umockdev)
        ("xmllint" ,libxml2)
        ("xsltproc" ,libxslt)
-- 
2.26.0





  parent reply	other threads:[~2020-05-01 13:13 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-01 13:06 [bug#40996] [PATCH 0/3] Fix usbguard's warning about 'catch' Brice Waegeneire
2020-05-01 13:09 ` [bug#40996] [PATCH 1/3] gnu: Add pegtl Brice Waegeneire
2020-05-01 13:09   ` [bug#40996] [PATCH 2/3] gnu: usbguard: Use packaged 'pegtl' Brice Waegeneire
2020-05-04 20:13     ` Ludovic Courtès
2020-05-01 13:09   ` Brice Waegeneire [this message]
2020-05-04 20:17     ` [bug#40996] [PATCH 3/3] gnu: usbguard: Fix warning about 'catch' Ludovic Courtès
2020-05-07  9:33       ` bug#40996: " Brice Waegeneire
2020-05-04 20:13   ` [bug#40996] [PATCH 1/3] gnu: Add pegtl Ludovic Courtès

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=20200501130930.5888-3-brice@waegenei.re \
    --to=brice@waegenei.re \
    --cc=40996@debbugs.gnu.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).