From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 02 14:34:54 2022 Received: (at submit) by debbugs.gnu.org; 2 Apr 2022 18:34:54 +0000 Received: from localhost ([127.0.0.1]:46863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naiaF-0004lW-U6 for submit@debbugs.gnu.org; Sat, 02 Apr 2022 14:34:54 -0400 Received: from lists.gnu.org ([209.51.188.17]:38830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naiaE-0004lO-06 for submit@debbugs.gnu.org; Sat, 02 Apr 2022 14:34:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naiaD-0005Lo-QY for guix-patches@gnu.org; Sat, 02 Apr 2022 14:34:45 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52383) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naia7-000602-WE for guix-patches@gnu.org; Sat, 02 Apr 2022 14:34:43 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 994CD5C0067; Sat, 2 Apr 2022 14:34:36 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Sat, 02 Apr 2022 14:34:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lnikki.la; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm2; bh=7UIhlw3rbMfn6fckhTJLEp+7i8w29lYaxLEopP VQuCE=; b=Ep2NR22fQR6s/KLuuLEGyWoHk7V3tgWLBUN3R4mDS4HJQXaVUUrR9S IXRkfm48dwk/xCodEMOQmxer8qmK1ZnhCJGh6dlixoRL9DxgmFPt2UAPosXlMkX5 g4obIoZX8JyPBYub8JEV+VcstEmYFx9ANc9VMXUJjFojYd5zTvK0i4FMXiu6L3lK FNgF8p6iBuEWK+xEazCKx9BBNoWxLVBOcbfAAy28QsFGXMJ+B1qLCs+g1r62NJL2 CPeIEBJ0hjbZnGaS7ukuuBRCXoIGq749nsSdD/ktEviDTKEKDHuI9t8vbgjw7o0C DvaysV4U3+xF85gtRq0dJ2VZc9KQY5Ng== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=7UIhlw 3rbMfn6fckhTJLEp+7i8w29lYaxLEopPVQuCE=; b=lCzp0Hot6yRArsQw5LfsS5 qLkR3EYVd2GKjFtCYlYJ54L1ArxOeWHLn+XAEM/Rm0S2YBFHgvyGfulP3qs5IQ6b hmFosiLkK/Imj7fVw3TPP36+9sT7705kSfV/4JQbu/W5Fy9qcEiOG0C1JNmSk8AV u6nBacZZKCzj2UT+zFzWq8JLknDo1UMyOlZEPC+6NLmzeXbpf3nsJtxy0nh6STC5 3u/+3ISEoYtt45uOtKLJ4Kk62V2Ggq2qa9ecQqoE1dJb1UKzF+ejKyaU3Nshd4p5 YOfhlJNK5Rf8idexvQ4LLqwFHgKgDKhCnFSY3SqF/rplqGL8Umn1ZpRHNb+xTZUg == X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudeikedguddvlecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffogggtgfesthekre dtredtjeenucfhrhhomhepnfgvohcupfhikhhkihhlmocuoehhvghllhhosehlnhhikhhk ihdrlhgrqeenucggtffrrghtthgvrhhnpeefkeeftddukeduvdejjeekfeffudehleelhe fgudffheelveelvdevjeefvdehteenucffohhmrghinhepghhnuhdrohhrghenucevlhhu shhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhvghllhhosehlnh hikhhkihdrlhgr X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 2 Apr 2022 14:34:35 -0400 (EDT) From: =?utf-8?Q?Leo=20Nikkil=C3=A4?= To: guix-patches@gnu.org Subject: [PATCH] gnu: phodav: Use libsoup 2 instead of libsoup 3. Date: Sat, 2 Apr 2022 21:34:18 +0300 Message-Id: <20220402183418.4135-1-hello@lnikki.la> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=66.111.4.29; envelope-from=hello@lnikki.la; helo=out5-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Leo=20Nikkil=C3=A4?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Looks like phodav requires libsoup 2. Example of failing build logs, wanting libsoup 2.4: After swapping the dependency, tests were failing due to HOME not being writable. I added a new build phase to account for this. I also removed the start-virtual-dir-server phase which no longer seems required, the tests pass without it. * gnu/packages/gnome.scm (phodav): Fix build, tests. [inputs]: Replace libsoup 3 with libsoup 2. [arguments]<#:phases>[set-temporary-home]: New phase. [arguments]<#:phases>[start-virtual-dir-server]: Remove phase. --- gnu/packages/gnome.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8ff59f084b..19adb67423 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -69,6 +69,7 @@ ;;; Copyright © 2022 Pierre Langlois ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Denis 'GNUtoo' Carikli +;;; Copyright © 2022 Leo Nikkilä ;;; ;;; This file is part of GNU Guix. ;;; @@ -1191,12 +1192,10 @@ (define-public phodav (substitute* "data/meson.build" (("udev\\.get_pkgconfig_variable\\('udevdir'\\)") (format #f "'~a'" rules)))))) - (add-before 'check 'start-virtual-dir-server - ;; The same server when started by tests/virtual-dir returns an - ;; unexpected status (4 instead of 200) and fails a test. It is - ;; unclear why starting it manually here makes it pass. + (add-before 'check 'set-temporary-home + ;; Tests want to write into HOME. (lambda _ - (system "tests/virtual-dir-server &")))))) + (setenv "HOME" "/tmp")))))) (native-inputs `(("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) @@ -1205,7 +1204,7 @@ (define-public phodav ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs - (list avahi libgudev libsoup)) + (list avahi libgudev libsoup-minimal-2)) (synopsis "WebDav server implementation using libsoup") (description "PhoDav was initially developed as a file-sharing mechanism for Spice, but it is generic enough to be reused in other projects, -- 2.34.0