diff mbox series

[bug#75470,gnome-team,15/59] gnu: uhttpmock: Update to 0.11.0.

Message ID 6d235f7a6deefc83a0d387e55d242c81376908e4.1736458798.git.liliana.prikler@gmail.com
State New
Headers
Series To 46.7 and beyond |

Commit Message

Liliana Marie Prikler Jan. 9, 2025, 9:38 p.m. UTC 
  * gnu/packages/web.scm (uhttpmock): Update to 0.11.0.
[build-system]: Use meson-build-system.
[inputs]: Replace libsoup-minimal-2 with libsoup.  Drop labels.
[arguments]: Add #:glib-or-gtk? and #:configure-flags.
(uhttpmock-with-libsoup2): New variable.
* gnu/packages/gnome.scm (libgdata)[native-inputs]: Use
uhttpmock-with-libsoup2 instead of uhttpmock.
---
 gnu/packages/gnome.scm |  2 +-
 gnu/packages/web.scm   | 33 +++++++++++++++++++++++++++------
 2 files changed, 28 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 81c66c5b1d..6b4890c51d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2084,7 +2084,7 @@  (define-public libgdata
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
        ("intltool" ,intltool)
        ("pkg-config" ,pkg-config)
-       ("uhttpmock" ,uhttpmock)))
+       ("uhttpmock" ,uhttpmock-with-libsoup2)))
     (inputs
      (list cyrus-sasl glib-networking vala))
     (propagated-inputs
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 3de10a0da7..7f7c62c945 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5701,23 +5701,24 @@  (define-public pup
 (define-public uhttpmock
   (package
     (name "uhttpmock")
-    (version "0.5.3")
+    (version "0.11.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://tecnocode.co.uk/downloads/uhttpmock/"
                            "uhttpmock-" version ".tar.xz"))
        (sha256
-        (base32 "0bqizz69hxk8rn4z57asz1d45vizl1rj6i5k3rzxn2x3qcik514h"))))
-    (build-system glib-or-gtk-build-system)
+        (base32 "1gw4g3m99j00rjd3flbxigv3qgbkafnkhf77c76hv7yy58dc1vgy"))))
+    (build-system meson-build-system)
     (native-inputs
      (list gobject-introspection
            ;; For check phase.
            glib-networking gsettings-desktop-schemas pkg-config))
-    (inputs
-     `(("libsoup" ,libsoup-minimal-2)))
+    (inputs (list libsoup))
     (arguments
-     `(#:phases
+     `(#:glib-or-gtk? #t
+       #:configure-flags '("-Dgtk_doc=false")
+       #:phases
        (modify-phases %standard-phases
          (add-before 'check 'set-home-for-tests
            (lambda _
@@ -5730,6 +5731,26 @@  (define-public uhttpmock
 playback of HTTP request/response traces.")
     (license license:lgpl2.1+)))
 
+(define-public uhttpmock-with-libsoup2
+  (package
+    (inherit uhttpmock)
+    (version "0.5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://tecnocode.co.uk/downloads/uhttpmock/"
+                           "uhttpmock-" version ".tar.xz"))
+       (sha256
+        (base32 "0bqizz69hxk8rn4z57asz1d45vizl1rj6i5k3rzxn2x3qcik514h"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-before 'check 'set-home-for-tests
+                 (lambda _
+                   (setenv "HOME" "/tmp"))))))
+    (inputs (list libsoup-minimal-2))))
+
 (define-public woof
   (package
     (name "woof")