all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#69276] [PATCH] gnu: libtorrent-rasterbar: Update to 2.0.10.
@ 2024-02-19 16:16 Tomas Volf
  2024-08-06 13:07 ` [bug#69276] [PATCH 1/2] " Adam Faiz via Guix-patches via
  2024-08-06 13:09 ` [bug#69276] [PATCH 2/2] gnu: libtorrent-rasterbar: Use gexps and new input style Adam Faiz via Guix-patches via
  0 siblings, 2 replies; 4+ messages in thread
From: Tomas Volf @ 2024-02-19 16:16 UTC (permalink / raw)
  To: 69276; +Cc: Tomas Volf

* gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 2.0.10.

Change-Id: I9056b2cb6eac9740f95daf2fb73d874ca95f1a7f
---
 gnu/packages/bittorrent.scm | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 0d544235c1..34a7c17738 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -418,16 +418,10 @@ (define-public mktorrent
     (license (list l:public-domain      ; sha1.*, used to build without OpenSSL
                    l:gpl2+))))          ; with permission to link with OpenSSL
 
-(define %v2_empty_file.torrent
-  (origin (method url-fetch)
-          (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent")
-          (sha256
-           (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn"))))
-
 (define-public libtorrent-rasterbar
   (package
     (name "libtorrent-rasterbar")
-    (version "2.0.9")
+    (version "2.0.10")
     (source
      (origin
        (method url-fetch)
@@ -436,14 +430,7 @@ (define-public libtorrent-rasterbar
                        "releases/download/v" version "/"
                        "libtorrent-rasterbar-" version ".tar.gz"))
        (sha256
-        (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch"))
-       ;; https://github.com/arvidn/libtorrent/issues/7566
-       ;; Remove when resolved.  I would hope this to be fixed in 2.0.10.
-       (modules '((guix build utils)))
-       (snippet
-        #~(substitute* "test/test_copy_file.cpp"
-            (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all)
-             (string-append all ", TMPFS_MAGIC\n"))))))
+        (base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-Dpython-bindings=ON"
@@ -452,14 +439,6 @@ (define-public libtorrent-rasterbar
        #:parallel-tests? #f
        #:phases
        (modify-phases %standard-phases
-         ;; https://github.com/arvidn/libtorrent/issues/7567
-         ;; Remove when resolved.  I would hope this to be fixed in 2.0.10.
-         ;; Do not forget to remove the %v2_empty_file.torrent variable.
-         (add-before 'configure 'copy-v2_empty_file.torrent
-           (lambda* (#:key native-inputs inputs #:allow-other-keys)
-             (copy-file (assoc-ref (or native-inputs inputs)
-                                   "%v2_empty_file.torrent")
-                        "test/test_torrents/v2_empty_file.torrent")))
          (replace 'check
            (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
              (let* ((disabled-tests
@@ -500,10 +479,9 @@ (define-public libtorrent-rasterbar
                  ;;         "--output-on-failure")
                  )))))))
     (inputs (list boost openssl))
-    (native-inputs `(("libfaketime" ,libfaketime)
-                     ("python-wrapper" ,python-wrapper)
-                     ("pkg-config" ,pkg-config)
-                     ("%v2_empty_file.torrent" ,%v2_empty_file.torrent)))
+    (native-inputs (list libfaketime
+                         python-wrapper
+                         pkg-config))
     (home-page "https://www.libtorrent.org/")
     (synopsis "Feature-complete BitTorrent implementation")
     (description

base-commit: fdbf4192f5eaa7fdb5e6e2e98ada0726c8104824
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#69276] [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10.
  2024-02-19 16:16 [bug#69276] [PATCH] gnu: libtorrent-rasterbar: Update to 2.0.10 Tomas Volf
@ 2024-08-06 13:07 ` Adam Faiz via Guix-patches via
  2024-10-06  9:12   ` Z572
  2024-08-06 13:09 ` [bug#69276] [PATCH 2/2] gnu: libtorrent-rasterbar: Use gexps and new input style Adam Faiz via Guix-patches via
  1 sibling, 1 reply; 4+ messages in thread
From: Adam Faiz via Guix-patches via @ 2024-08-06 13:07 UTC (permalink / raw)
  To: 69276

From 4af05095ca922bb6d0335a6e946a404d4764ac1f Mon Sep 17 00:00:00 2001
Message-ID: <4af05095ca922bb6d0335a6e946a404d4764ac1f.1722949379.git.adam.faiz@disroot.org>
In-Reply-To: <cover.1722949379.git.adam.faiz@disroot.org>
References: <cover.1722949379.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Tue, 6 Aug 2024 19:57:47 +0800
Subject: [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10.

* gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 2.0.10.
[source]<snippet>: Remove test/test_copy_file.cpp patch since it's resolved.
[native-inputs]: Remove no longer needed file (v2_empty_file.torrent).
[arguments]<#:phases>: And remove a phase copying it into the correct place.
---
 gnu/packages/bittorrent.scm | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 5c2fa9c688..abc598f7fa 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -418,16 +418,10 @@ (define-public mktorrent
     (license (list l:public-domain      ; sha1.*, used to build without OpenSSL
                    l:gpl2+))))          ; with permission to link with OpenSSL
 
-(define %v2_empty_file.torrent
-  (origin (method url-fetch)
-          (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent")
-          (sha256
-           (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn"))))
-
 (define-public libtorrent-rasterbar
   (package
     (name "libtorrent-rasterbar")
-    (version "2.0.9")
+    (version "2.0.10")
     (source
      (origin
        (method url-fetch)
@@ -436,14 +430,7 @@ (define-public libtorrent-rasterbar
                        "releases/download/v" version "/"
                        "libtorrent-rasterbar-" version ".tar.gz"))
        (sha256
-        (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch"))
-       ;; https://github.com/arvidn/libtorrent/issues/7566
-       ;; Remove when resolved.  I would hope this to be fixed in 2.0.10.
-       (modules '((guix build utils)))
-       (snippet
-        #~(substitute* "test/test_copy_file.cpp"
-            (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all)
-             (string-append all ", TMPFS_MAGIC\n"))))))
+        (base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-Dpython-bindings=ON"
@@ -452,14 +439,6 @@ (define-public libtorrent-rasterbar
        #:parallel-tests? #f
        #:phases
        (modify-phases %standard-phases
-         ;; https://github.com/arvidn/libtorrent/issues/7567
-         ;; Remove when resolved.  I would hope this to be fixed in 2.0.10.
-         ;; Do not forget to remove the %v2_empty_file.torrent variable.
-         (add-before 'configure 'copy-v2_empty_file.torrent
-           (lambda* (#:key native-inputs inputs #:allow-other-keys)
-             (copy-file (assoc-ref (or native-inputs inputs)
-                                   "%v2_empty_file.torrent")
-                        "test/test_torrents/v2_empty_file.torrent")))
          (replace 'check
            (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
              (let* ((disabled-tests
@@ -502,8 +481,7 @@ (define-public libtorrent-rasterbar
     (inputs (list boost openssl))
     (native-inputs `(("libfaketime" ,libfaketime)
                      ("python-wrapper" ,python-wrapper)
-                     ("pkg-config" ,pkg-config)
-                     ("%v2_empty_file.torrent" ,%v2_empty_file.torrent)))
+                     ("pkg-config" ,pkg-config)))
     (home-page "https://www.libtorrent.org/")
     (synopsis "Feature-complete BitTorrent implementation")
     (description
-- 
2.41.0




^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#69276] [PATCH 2/2] gnu: libtorrent-rasterbar: Use gexps and new input style.
  2024-02-19 16:16 [bug#69276] [PATCH] gnu: libtorrent-rasterbar: Update to 2.0.10 Tomas Volf
  2024-08-06 13:07 ` [bug#69276] [PATCH 1/2] " Adam Faiz via Guix-patches via
@ 2024-08-06 13:09 ` Adam Faiz via Guix-patches via
  1 sibling, 0 replies; 4+ messages in thread
From: Adam Faiz via Guix-patches via @ 2024-08-06 13:09 UTC (permalink / raw)
  To: 69276

From 646cc0c6857c41564eda8ccc0ade07ae16a18a6c Mon Sep 17 00:00:00 2001
Message-ID: <646cc0c6857c41564eda8ccc0ade07ae16a18a6c.1722949379.git.adam.faiz@disroot.org>
In-Reply-To: <cover.1722949379.git.adam.faiz@disroot.org>
References: <cover.1722949379.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Tue, 6 Aug 2024 20:55:13 +0800
Subject: [PATCH 2/2] gnu: libtorrent-rasterbar: Use gexps and new input style.

* gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]: Use gexps.
[native-inputs]: Drop labels.
---
 gnu/packages/bittorrent.scm | 75 +++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index abc598f7fa..fa2765da5b 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -433,33 +433,34 @@ (define-public libtorrent-rasterbar
         (base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags '("-Dpython-bindings=ON"
-                           "-Dbuild_tests=ON")
-       ;; Tests do not reliably work when executed in parallel.
-       #:parallel-tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
-             (let* ((disabled-tests
-                     '(
-                       ;; Requires a non-localhost IPv4 interface.
-                       "test_upnp"
-                       ;; test_ssl needs to be run separately.
-                       "test_ssl"))
-                    (exclude-regex (string-append "^("
-                                                  (string-join disabled-tests "|")
-                                                  ")$"))
-                    (timeout "600")
-                    (jobs (if parallel-tests?
-                              (number->string (parallel-job-count))
-                              "1")))
-               (when tests?
-                 (invoke "ctest"
-                         "-E" exclude-regex
-                         "-j" jobs
-                         "--timeout" timeout
-                         "--output-on-failure")
+     (list
+      #:configure-flags
+      #~'("-Dpython-bindings=ON"
+          "-Dbuild_tests=ON")
+      ;; Tests do not reliably work when executed in parallel.
+      #:parallel-tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+              (let* ((disabled-tests
+                      '(;; Requires a non-localhost IPv4 interface.
+                        "test_upnp"
+                        ;; test_ssl needs to be run separately.
+                        "test_ssl"))
+                     (exclude-regex (string-append "^("
+                                                   (string-join disabled-tests "|")
+                                                   ")$"))
+                     (timeout "600")
+                     (jobs (if parallel-tests?
+                               (number->string (parallel-job-count))
+                               "1")))
+                (when tests?
+                  (invoke "ctest"
+                          "-E" exclude-regex
+                          "-j" jobs
+                          "--timeout" timeout
+                          "--output-on-failure")
                  ;; test_ssl relies on bundled TLS certificates with a fixed
                  ;; expiry date.  To ensure succesful builds in the future,
                  ;; fake the time to be roughly that of the release.
@@ -471,17 +472,17 @@ (define-public libtorrent-rasterbar
                  ;;
                  ;; Note: The test_ssl test times out in the ci.
                  ;; Temporarily disable it until that is resolved.
-                 ;; (invoke "faketime" "2022-10-24"
-                 ;;         "ctest"
-                 ;;         "-R" "^test_ssl$"
-                 ;;         "-j" jobs
-                 ;;         "--timeout" timeout
-                 ;;         "--output-on-failure")
-                 )))))))
+                    #;(invoke "faketime" "2022-10-24"
+                            "ctest"
+                            "-R" "^test_ssl$"
+                            "-j" jobs
+                            "--timeout" timeout
+                            "--output-on-failure"))))))))
     (inputs (list boost openssl))
-    (native-inputs `(("libfaketime" ,libfaketime)
-                     ("python-wrapper" ,python-wrapper)
-                     ("pkg-config" ,pkg-config)))
+    (native-inputs
+     (list libfaketime
+           python-wrapper
+           pkg-config))
     (home-page "https://www.libtorrent.org/")
     (synopsis "Feature-complete BitTorrent implementation")
     (description
-- 
2.41.0




^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#69276] [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10.
  2024-08-06 13:07 ` [bug#69276] [PATCH 1/2] " Adam Faiz via Guix-patches via
@ 2024-10-06  9:12   ` Z572
  0 siblings, 0 replies; 4+ messages in thread
From: Z572 @ 2024-10-06  9:12 UTC (permalink / raw)
  To: 69276; +Cc: 69276-done, Adam Faiz

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

Adam Faiz via Guix-patches via <guix-patches@gnu.org> writes:

> From 4af05095ca922bb6d0335a6e946a404d4764ac1f Mon Sep 17 00:00:00 2001
> Message-ID: <4af05095ca922bb6d0335a6e946a404d4764ac1f.1722949379.git.adam.faiz@disroot.org>
> In-Reply-To: <cover.1722949379.git.adam.faiz@disroot.org>
> References: <cover.1722949379.git.adam.faiz@disroot.org>
> From: AwesomeAdam54321 <adam.faiz@disroot.org>
> Date: Tue, 6 Aug 2024 19:57:47 +0800
> Subject: [PATCH 1/2] gnu: libtorrent-rasterbar: Update to 2.0.10.
>
> * gnu/packages/bittorrent.scm (libtorrent-rasterbar): Update to 2.0.10.
> [source]<snippet>: Remove test/test_copy_file.cpp patch since it's resolved.
> [native-inputs]: Remove no longer needed file (v2_empty_file.torrent).
> [arguments]<#:phases>: And remove a phase copying it into the correct place.
> ---
>  gnu/packages/bittorrent.scm | 28 +++-------------------------
>  1 file changed, 3 insertions(+), 25 deletions(-)
>
> diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
> index 5c2fa9c688..abc598f7fa 100644
> --- a/gnu/packages/bittorrent.scm
> +++ b/gnu/packages/bittorrent.scm
> @@ -418,16 +418,10 @@ (define-public mktorrent
>      (license (list l:public-domain      ; sha1.*, used to build without OpenSSL
>                     l:gpl2+))))          ; with permission to link with OpenSSL
>  
> -(define %v2_empty_file.torrent
> -  (origin (method url-fetch)
> -          (uri "https://github.com/arvidn/libtorrent/raw/v2.0.9/test/test_torrents/v2_empty_file.torrent")
> -          (sha256
> -           (base32 "1hydgf0m9193hy9010wl0wrbz4k4cgrqg70jakx68pgi79jcqnrn"))))
> -
>  (define-public libtorrent-rasterbar
>    (package
>      (name "libtorrent-rasterbar")
> -    (version "2.0.9")
> +    (version "2.0.10")
>      (source
>       (origin
>         (method url-fetch)
> @@ -436,14 +430,7 @@ (define-public libtorrent-rasterbar
>                         "releases/download/v" version "/"
>                         "libtorrent-rasterbar-" version ".tar.gz"))
>         (sha256
> -        (base32 "13kry578ifzz4m2f291bbd7v5v9zsi8y3mf38146cnqw0sv95kch"))
> -       ;; https://github.com/arvidn/libtorrent/issues/7566
> -       ;; Remove when resolved.  I would hope this to be fixed in 2.0.10.
> -       (modules '((guix build utils)))
> -       (snippet
> -        #~(substitute* "test/test_copy_file.cpp"
> -            (("EXT4_SUPER_MAGIC, EXT3_SUPER_MAGIC, XFS_SUPER_MAGIC" all)
> -             (string-append all ", TMPFS_MAGIC\n"))))))
> +        (base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw"))))
>      (build-system cmake-build-system)
>      (arguments
>       `(#:configure-flags '("-Dpython-bindings=ON"
> @@ -452,14 +439,6 @@ (define-public libtorrent-rasterbar
>         #:parallel-tests? #f
>         #:phases
>         (modify-phases %standard-phases
> -         ;; https://github.com/arvidn/libtorrent/issues/7567
> -         ;; Remove when resolved.  I would hope this to be fixed in 2.0.10.
> -         ;; Do not forget to remove the %v2_empty_file.torrent variable.
> -         (add-before 'configure 'copy-v2_empty_file.torrent
> -           (lambda* (#:key native-inputs inputs #:allow-other-keys)
> -             (copy-file (assoc-ref (or native-inputs inputs)
> -                                   "%v2_empty_file.torrent")
> -                        "test/test_torrents/v2_empty_file.torrent")))
>           (replace 'check
>             (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
>               (let* ((disabled-tests
> @@ -502,8 +481,7 @@ (define-public libtorrent-rasterbar
>      (inputs (list boost openssl))
>      (native-inputs `(("libfaketime" ,libfaketime)
>                       ("python-wrapper" ,python-wrapper)
> -                     ("pkg-config" ,pkg-config)
> -                     ("%v2_empty_file.torrent" ,%v2_empty_file.torrent)))
> +                     ("pkg-config" ,pkg-config)))
>      (home-page "https://www.libtorrent.org/")
>      (synopsis "Feature-complete BitTorrent implementation")
>      (description

adjust message, not use #; , push and close.

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-10-06  9:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-19 16:16 [bug#69276] [PATCH] gnu: libtorrent-rasterbar: Update to 2.0.10 Tomas Volf
2024-08-06 13:07 ` [bug#69276] [PATCH 1/2] " Adam Faiz via Guix-patches via
2024-10-06  9:12   ` Z572
2024-08-06 13:09 ` [bug#69276] [PATCH 2/2] gnu: libtorrent-rasterbar: Use gexps and new input style Adam Faiz via Guix-patches via

Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.