unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: vagrant@debian.org
To: 65233@debbugs.gnu.org
Cc: vagrant@debian.org
Subject: [bug#65233] [PATCH 2/2] gnu: lcsync: Update to 0.2.1.
Date: Fri, 11 Aug 2023 14:12:00 -0700	[thread overview]
Message-ID: <20230811211200.15605-2-vagrant@debian.org> (raw)
In-Reply-To: <20230811211200.15605-1-vagrant@debian.org>

From: Vagrant Cascadian <vagrant@debian.org>

* gnu/packages/networking.scm (lcsync): Update to 0.2.1.
[arguments]: #:configure-flags Pass --prefix.
Drop 'remove-network-tests and 'remove-immintrin.h phase.
Add 'use-prefix-from-configure-in-doc-makefile phase.
[inputs]: Add lcrq.
[native-inputs]: Remove simde.
---
 gnu/packages/networking.scm | 40 +++++++++++++------------------------
 1 file changed, 14 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index a94e26dd10..a97a3efb12 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -289,7 +289,7 @@ (define-public lcrq
 (define-public lcsync
   (package
     (name "lcsync")
-    (version "0.0.1")
+    (version "0.2.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -298,45 +298,33 @@ (define-public lcsync
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0s038b4xg9nlzhrganzjyfvc6n6cgd6kilnpik4axp62j2n5q11q"))))
+                "0bsd3dkir2i647nmrmyb7skbv16v0f6f3gfwkpxz8g42978dlms5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:parallel-tests? #f
+       #:configure-flags
+       (list
+        (string-append "--prefix="
+                       (assoc-ref %outputs "out")))
        #:make-flags (let ((target ,(%current-target-system)))
                       (list ,(string-append "CC="
-                                            (cc-for-target))
-                            ;; avoid running setcap in the install process
-                            "SETCAP_PROGRAM=true"
-                            (string-append "prefix="
-                                           (assoc-ref %outputs "out"))))
+                                            (cc-for-target))))
        #:test-target "test"
        #:phases (modify-phases %standard-phases
-                  (delete 'configure) ;no configure script
-                  (add-before 'check 'remove-network-tests
+                  (add-after 'unpack 'use-prefix-from-configure-in-doc-makefile
+                    ;; Use prefix from configure. Fixed upstream:
+                    ;; https://codeberg.org/librecast/lcsync/commit/4ba00f6
+                    ;; XXX: Remove for 0.2.2+
                     (lambda _
-                      ;; these tests require networking
-                      (delete-file "./test/0000-0027.c")
-                      (delete-file "./test/0000-0049.c")
-                      (delete-file "./test/0000-0074.c")))
-                  (add-after 'unpack 'remove-immintrin.h
-                    (lambda* (#:key inputs #:allow-other-keys)
-                      (substitute* "Makefile"
-                        (("CFLAGS :=")
-                         (string-append "CFLAGS := -I" (search-input-directory
-                                                         inputs "include/simde"))))
-                      (substitute* (find-files "src")
-                        ((".*immintrin\\.h.*")
-                         (string-append "#include <simde-features.h>\n"
-                                        "#include <x86/ssse3.h>\n"))
-                        (("__m128i") "simde__m128i"))))
+                      (substitute* "doc/Makefile.in"
+                        (("PREFIX .= /usr/local") "PREFIX ?= @prefix@"))))
                   (add-before 'build 'add-library-paths
                     (lambda* (#:key inputs #:allow-other-keys)
                       (let* ((librecast (assoc-ref inputs "librecast")))
                         (substitute* (list "./src/Makefile" "./test/Makefile")
                           (("-llibrecast")
                            (string-append "-L" librecast "/lib -llibrecast")))))))))
-    (inputs (list librecast libsodium))
-    (native-inputs (list simde))
+    (inputs (list lcrq librecast libsodium))
     (home-page "https://librecast.net/lcsync.html")
     (synopsis "Librecast file and data syncing tool")
     (description
-- 
2.39.2





  reply	other threads:[~2023-08-11 21:13 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-11 21:06 [bug#65233] WIP lcsync and librecast updates Vagrant Cascadian
2023-08-11 21:11 ` [bug#65233] [PATCH 1/2] gnu: librecast: Update to 0.7-RC3 vagrant
2023-08-11 21:12   ` vagrant [this message]
2023-08-22 20:31 ` [bug#65233] [PATCH 1/2] gnu: librecast: Update to 0.7.0 vagrant
2023-08-22 20:31   ` [bug#65233] [PATCH 2/2] gnu: lcsync: Update to 0.2.1 vagrant
2023-08-23 22:02   ` [bug#65233] lcsync and librecast updates Vagrant Cascadian
2023-08-29 12:56     ` bug#65233: " Christopher Baines
2023-08-29 17:40       ` [bug#65233] " Vagrant Cascadian
2023-08-29 18:04         ` Vagrant Cascadian
2023-08-31 12:30           ` Christopher Baines
2023-08-31 21:52             ` Vagrant Cascadian

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=20230811211200.15605-2-vagrant@debian.org \
    --to=vagrant@debian.org \
    --cc=65233@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).