[bug#65233] WIP lcsync and librecast updates

[bug#65233] WIP lcsync and librecast updates

[Vagrant Cascadian]

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

There have been recent updates to librecast and lcsync. librecast should
release 0.7.x someday soon, so I will submit patches for the latest
release candidate to get the review process started. The lcsync 0.2.x
versions depend on librecast 0.7.x.

live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#65233] [PATCH 1/2] gnu: librecast: Update to 0.7-RC3.

[vagrant]

From: Vagrant Cascadian <vagrant@debian.org>

* gnu/packages/networking.scm (librecast): Update to 0.7-RC3.
[arguments]: Drop 'remove-network-tests phase.
---
 gnu/packages/networking.scm | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 542e93891c..a94e26dd10 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -489,7 +489,7 @@ (define-public libnice
 (define-public librecast
   (package
     (name "librecast")
-    (version "0.6.1")
+    (version "0.7-RC3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -498,7 +498,7 @@ (define-public librecast
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1kixnm7pn8345wp0klhnpw5x992cqbqx3bhc01j8xhqf6irlzdm3"))))
+                "06k5a84byj7md82a7idlqwricrjbmqxn3w1cjaarybiwd2jwqg80"))))
     (build-system gnu-build-system)
     (arguments
      `(#:parallel-tests? #f
@@ -507,26 +507,7 @@ (define-public librecast
                                             (cc-for-target))
                             (string-append "PREFIX="
                                            (assoc-ref %outputs "out"))))
-       #:test-target "test"
-       #:phases (modify-phases %standard-phases
-                  (add-before 'check 'remove-network-tests
-                    (lambda _
-                      ;; these tests require networking
-                      (delete-file "./test/0000-0010.c")
-                      (delete-file "./test/0000-0012.c")
-                      (delete-file "./test/0000-0013.c")
-                      (delete-file "./test/0000-0014.c")
-                      (delete-file "./test/0000-0015.c")
-                      (delete-file "./test/0000-0016.c")
-                      (delete-file "./test/0000-0018.c")
-                      (delete-file "./test/0000-0019.c")
-                      (delete-file "./test/0000-0021.c")
-                      (delete-file "./test/0000-0028.c")
-                      (delete-file "./test/0000-0036.c")
-                      (delete-file "./test/0000-0037.c")
-                      (delete-file "./test/0000-0038.c")
-                      (delete-file "./test/0000-0039.c")
-                      (delete-file "./test/0000-0040.c"))))))
+       #:test-target "test"))
     (inputs (list libsodium lcrq))
     (synopsis "IPv6 multicast library")
     (description "Librecast is a C library which supports IPv6 multicast

base-commit: 19a7a824c35eae56ce56e2a460042fb7e2129234
-- 
2.39.2

[bug#65233] [PATCH 2/2] gnu: lcsync: Update to 0.2.1.

[vagrant]

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

[bug#65233] [PATCH 1/2] gnu: librecast: Update to 0.7.0.

[vagrant]

From: Vagrant Cascadian <vagrant@debian.org>

* gnu/packages/networking.scm (librecast): Update to 0.7.0.
[arguments]: Drop 'remove-network-tests phase.
---
 gnu/packages/networking.scm | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 04461fec2d..2b2e2bd4a5 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -487,7 +487,7 @@ (define-public libnice
 (define-public librecast
   (package
     (name "librecast")
-    (version "0.6.1")
+    (version "0.7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -496,7 +496,7 @@ (define-public librecast
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1kixnm7pn8345wp0klhnpw5x992cqbqx3bhc01j8xhqf6irlzdm3"))))
+                "0y0km0fv39m3i227pyg7fcr7d94gbji51fkcywqyrjgmk4j1hp1n"))))
     (build-system gnu-build-system)
     (arguments
      `(#:parallel-tests? #f
@@ -505,26 +505,7 @@ (define-public librecast
                                             (cc-for-target))
                             (string-append "PREFIX="
                                            (assoc-ref %outputs "out"))))
-       #:test-target "test"
-       #:phases (modify-phases %standard-phases
-                  (add-before 'check 'remove-network-tests
-                    (lambda _
-                      ;; these tests require networking
-                      (delete-file "./test/0000-0010.c")
-                      (delete-file "./test/0000-0012.c")
-                      (delete-file "./test/0000-0013.c")
-                      (delete-file "./test/0000-0014.c")
-                      (delete-file "./test/0000-0015.c")
-                      (delete-file "./test/0000-0016.c")
-                      (delete-file "./test/0000-0018.c")
-                      (delete-file "./test/0000-0019.c")
-                      (delete-file "./test/0000-0021.c")
-                      (delete-file "./test/0000-0028.c")
-                      (delete-file "./test/0000-0036.c")
-                      (delete-file "./test/0000-0037.c")
-                      (delete-file "./test/0000-0038.c")
-                      (delete-file "./test/0000-0039.c")
-                      (delete-file "./test/0000-0040.c"))))))
+       #:test-target "test"))
     (inputs (list libsodium lcrq))
     (synopsis "IPv6 multicast library")
     (description "Librecast is a C library which supports IPv6 multicast

base-commit: db02fcde386892b3a054d64403a4a5bfa1b7fce8
-- 
2.39.2

[bug#65233] [PATCH 2/2] gnu: lcsync: Update to 0.2.1.

[vagrant]

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 2b2e2bd4a5..50de871e82 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

[bug#65233] lcsync and librecast updates

[Vagrant Cascadian]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

retitle 65233 lcsync and librecast updates
thanks

Both lcsync 0.2.1 and librecast 0.7.0 have upstream releases now, thus
removing "WIP" from the title; these are worthy of merging, I hope. :)

live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

bug#65233: lcsync and librecast updates

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]


Vagrant Cascadian <vagrant@debian.org> writes:

> Both lcsync 0.2.1 and librecast 0.7.0 have upstream releases now, thus
> removing "WIP" from the title; these are worthy of merging, I hope. :)

This looks good to me, I've pushed it to master as
5f672aaa0ca7e2c5775c8950fa1627ac419e557e.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#65233] lcsync and librecast updates

[Vagrant Cascadian]

[-- Attachment #1: Type: text/plain, Size: 631 bytes --]

On 2023-08-29, Christopher Baines wrote:
> Vagrant Cascadian <vagrant@debian.org> writes:
>
>> Both lcsync 0.2.1 and librecast 0.7.0 have upstream releases now, thus
>> removing "WIP" from the title; these are worthy of merging, I hope. :)
>
> This looks good to me, I've pushed it to master as
> 5f672aaa0ca7e2c5775c8950fa1627ac419e557e.

Thanks!

It looks like you ended up merging the old librecast 0.7-RC3 patch,
rather than the 0.7.0 patch I submitted later. I apparently forgot to
mark it as a v2 patch, which maybe tripped you up.

Would it be ok if I pushed the newer version or would you be able to?

live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#65233] lcsync and librecast updates

[Vagrant Cascadian]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

On 2023-08-29, Vagrant Cascadian wrote:
> On 2023-08-29, Christopher Baines wrote:
>> Vagrant Cascadian <vagrant@debian.org> writes:
>>
>>> Both lcsync 0.2.1 and librecast 0.7.0 have upstream releases now, thus
>>> removing "WIP" from the title; these are worthy of merging, I hope. :)
>>
>> This looks good to me, I've pushed it to master as
>> 5f672aaa0ca7e2c5775c8950fa1627ac419e557e.
>
> Thanks!
>
> It looks like you ended up merging the old librecast 0.7-RC3 patch,
> rather than the 0.7.0 patch I submitted later. I apparently forgot to
> mark it as a v2 patch, which maybe tripped you up.
>
> Would it be ok if I pushed the newer version or would you be able to?

I just went ahead and pushed c61c499c59109f6094384ee205c98034d759b600 as
a follow-up to update librecast to 0.7.0.

live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#65233] lcsync and librecast updates

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]


Vagrant Cascadian <vagrant@debian.org> writes:

> [[PGP Signed Part:Signature made by expired key DC518FC87F9716AA Vagrant Cascadian <vagrant@aikidev.net>]]
> On 2023-08-29, Vagrant Cascadian wrote:
>> On 2023-08-29, Christopher Baines wrote:
>>> Vagrant Cascadian <vagrant@debian.org> writes:
>>>
>>>> Both lcsync 0.2.1 and librecast 0.7.0 have upstream releases now, thus
>>>> removing "WIP" from the title; these are worthy of merging, I hope. :)
>>>
>>> This looks good to me, I've pushed it to master as
>>> 5f672aaa0ca7e2c5775c8950fa1627ac419e557e.
>>
>> Thanks!
>>
>> It looks like you ended up merging the old librecast 0.7-RC3 patch,
>> rather than the 0.7.0 patch I submitted later. I apparently forgot to
>> mark it as a v2 patch, which maybe tripped you up.
>>
>> Would it be ok if I pushed the newer version or would you be able to?
>
> I just went ahead and pushed c61c499c59109f6094384ee205c98034d759b600 as
> a follow-up to update librecast to 0.7.0.

Apologies for this, I didn't check that I'd got the right patches before
pushing. The slightly longer story is that I cherry picked these from
the guix-patches repository [1], but a bug in QA meant that it hadn't
been updating the branches, so I cherry picked the earlier version of
the patch.

1: https://git.guix-patches.cbaines.net/guix-patches/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#65233] lcsync and librecast updates

[Vagrant Cascadian]

[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]

On 2023-08-31, Christopher Baines wrote:
> Vagrant Cascadian <vagrant@debian.org> writes:
>
>> [[PGP Signed Part:Signature made by expired key DC518FC87F9716AA Vagrant Cascadian <vagrant@aikidev.net>]]
>> On 2023-08-29, Vagrant Cascadian wrote:
>>> On 2023-08-29, Christopher Baines wrote:
>>>> Vagrant Cascadian <vagrant@debian.org> writes:
>>>>
>>>>> Both lcsync 0.2.1 and librecast 0.7.0 have upstream releases now, thus
>>>>> removing "WIP" from the title; these are worthy of merging, I hope. :)
>>>>
>>>> This looks good to me, I've pushed it to master as
>>>> 5f672aaa0ca7e2c5775c8950fa1627ac419e557e.
>>>
>>> Thanks!
>>>
>>> It looks like you ended up merging the old librecast 0.7-RC3 patch,
>>> rather than the 0.7.0 patch I submitted later. I apparently forgot to
>>> mark it as a v2 patch, which maybe tripped you up.
>>>
>>> Would it be ok if I pushed the newer version or would you be able to?
>>
>> I just went ahead and pushed c61c499c59109f6094384ee205c98034d759b600 as
>> a follow-up to update librecast to 0.7.0.
>
> Apologies for this, I didn't check that I'd got the right patches before
> pushing.

No worries, it was easy enough to fix. :)

> The slightly longer story is that I cherry picked these from
> the guix-patches repository [1], but a bug in QA meant that it hadn't
> been updating the branches, so I cherry picked the earlier version of
> the patch.
>
> 1: https://git.guix-patches.cbaines.net/guix-patches/

This is so tremendously useful, even with a few glitches now and then! I
only recently learned about it!

live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]