From patchwork Thu Jan 9 21:38:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 36828 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0BFBE27BBE9; Thu, 9 Jan 2025 22:31:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 975AF27BBE2 for ; Thu, 9 Jan 2025 22:31:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tW12q-0008Cu-Ju; Thu, 09 Jan 2025 17:30:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tW12n-0008An-NC for guix-patches@gnu.org; Thu, 09 Jan 2025 17:30:25 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tW12n-0004So-EB for guix-patches@gnu.org; Thu, 09 Jan 2025 17:30:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=ONlflKQ/LwiH4+VxIYQbL7L2+Z1YZJyh33vOnZRyIks=; b=HKYrRP2B+RbJPlT/QkqMJk1aQ1w5SJpMNLgHAPS9PMQoehKtFGRviTv6up4YAEK0nj2xTozAudRD5er3XkWWS1tBD/S0Z3rx/pTwc6voP29owDDTagqbWM2WumLLEUQPqSUexDOVouo0fK6Qo9zy6cZJ5FXs+0FjNgSp5Oy3eOahZezWmqd6z59KA2tm4xKihyfm4QA11xyVbgJUK1g/zrDOnWLptJKV5xG+DSuINYGPOzxoMhcsyOKW7FVRLWDLIg0YCx4w4TsXEO/F8gm6ZZP1S6QogLgtsY94/ZU1OVqEH0gdFEkpSwaNAiAbKogrjnbmvyezKo2HVGoBfV5qJA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tW12n-0001e5-7y; Thu, 09 Jan 2025 17:30:25 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75470] [PATCH gnome-team 15/59] gnu: uhttpmock: Update to 0.11.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 09 Jan 2025 22:30:25 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75470@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 75470-submit@debbugs.gnu.org id=B75470.17364618175948 (code B ref 75470); Thu, 09 Jan 2025 22:30:25 +0000 Received: (at 75470) by debbugs.gnu.org; 9 Jan 2025 22:30:17 +0000 Received: from localhost ([127.0.0.1]:54913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tW12e-0001Wr-4P for submit@debbugs.gnu.org; Thu, 09 Jan 2025 17:30:17 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:57431) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tW12L-0001PI-UT for 75470@debbugs.gnu.org; Thu, 09 Jan 2025 17:29:58 -0500 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-4362f61757fso14730635e9.2 for <75470@debbugs.gnu.org>; Thu, 09 Jan 2025 14:29:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736461792; x=1737066592; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ONlflKQ/LwiH4+VxIYQbL7L2+Z1YZJyh33vOnZRyIks=; b=OoIBaoV0BDVEOSqto/DHYhGdXXHxgporhvOngn/GGS37EcLAcFB0TfZ4o2ZJaofn5O WVuULRf5+6PlZ8P1p+ppeFwPEGAaYXS+xtNN7dX4h20Np1GR4RdnnXPpnbhPRCXF66BF BsWnc+d85FNVwudUD73yj6O70IEU2ZkuxOxRdpbyk/crEVqSjguCEy5r2/8vnX1jsITb FiuxEv6IqlmF2G1zwoT+V6zUsXtPz3VNEAGM24YWJh2KLpoNsoMtaByETQFJX5xmCrzv n/XUANFeqpUCWrD6FumJ2T5WNv2u8BvOR+qd2R8Maxjzwd8n+nFexQVB4y/2BAzUzXyF KdJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736461792; x=1737066592; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ONlflKQ/LwiH4+VxIYQbL7L2+Z1YZJyh33vOnZRyIks=; b=CnDyi1ROFamzN8LIK48W58DYbAcypWzZxqLZdDCTaKMXmHyGVMP+kK2sdfsOFlEFTE Iv8m17KogOMYMYYGiRfZHtDQxV7jLOLc9KaF0SNAqW8y4yyWyhdb6FuYpRwTMp/b6yBp Fp9O4jTMf4oFttPsjpfu75ZKIXPIInr1CBYlNkGowi5/obCu60wiS4xns7Z0CndD5IlD toRt+E9VGK0iPrnZfZ59r8X3IHidp5E6BUdCnt/vPx4tO6QtEqRsxOsKCWTdQXKAFvhr 0qXXVUzzO5WecbJ54GKAznlmjIgNNFpgQnrJ/paKzLwHM5lmM8s0EalGMM/5cBxPq/aE k5lA== X-Gm-Message-State: AOJu0Yxn9Vf7WWpHy+dVizMFm/U8AQVkeLDGp+G3ScilIl6xaQEFyyQY Ib1261GXlbRsF2ln5gfZVsMjN+3v/8GnDMoCqCMpaIwGb0RlXK/gXxfsut2m X-Gm-Gg: ASbGncufQd5neZ7KsjW3/KblryTkdce6WmnBIOEf5ws6Zg4JHk7TnG6+h3SW8gjkjpC F7aZde09yQQnW4sTNZNgQTnLJc/LZM6w9+nWt1zdazHyiWOab7Q8DEhQHTCTQQEr7qUdfUeqQXy vCmppYotHUIbZo7FKdtj2AdK8wPvpRxlJnLRJzKn4ptRIh66VVm9c1KdlT/9UiBdKUkmVuj4+bZ pdNxgFBmPcXUm0+VbxeAFNtzWGLlN/O7UeQ8lv8Wv4rlwXZkTMQ3C14ElkOrKUpXwxSDjBr4Iwq N27pxLFKOR/2H4prNljYjolfm4gEthtx X-Google-Smtp-Source: AGHT+IG/QysH/O7ZhUCSumC7/vLyHORkk5PAQMW1i3uMbrsAPqSUOciW0+QUkmJnt+erFP0IVfvcrA== X-Received: by 2002:a05:600c:1c87:b0:434:f5d1:f10f with SMTP id 5b1f17b1804b1-436e26cfe50mr81460895e9.17.1736461791757; Thu, 09 Jan 2025 14:29:51 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e9dc895esm33120785e9.13.2025.01.09.14.29.50 for <75470@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 14:29:51 -0800 (PST) Message-ID: <6d235f7a6deefc83a0d387e55d242c81376908e4.1736458798.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 9 Jan 2025 22:38:04 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 --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")