From patchwork Fri Feb 17 17:00:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 47042 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 AB3D11685E; Fri, 17 Feb 2023 17:02:43 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 CDE471688A for ; Fri, 17 Feb 2023 17:02:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT47w-000726-J3; Fri, 17 Feb 2023 12:02: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 1pT47X-0006iE-TZ for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pT47X-0000KX-KO for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT47X-00081u-GJ for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61576] [PATCH 04/21] gnu: spice-gtk: Update to 0.42. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 17:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61576@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 61576-submit@debbugs.gnu.org id=B61576.167665328630592 (code B ref 61576); Fri, 17 Feb 2023 17:02:03 +0000 Received: (at 61576) by debbugs.gnu.org; 17 Feb 2023 17:01:26 +0000 Received: from localhost ([127.0.0.1]:41334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT46v-0007xB-Dp for submit@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:26 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:45574) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT46t-0007wC-0v for 61576@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:23 -0500 Received: by mail-qt1-f169.google.com with SMTP id d10so1417559qtr.12 for <61576@debbugs.gnu.org>; Fri, 17 Feb 2023 09:01:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lIEDo5NN5hcku7eWGJCBmtsAcCxJI78tYCrfEOPVsuM=; b=I3sOYY+mkqKVsrJrNTaGVArt9zvh4pdjeRSLiNouHOuafHZYdv4MBE8uDKWUl6GJWa 0OuGJbHhA+a5Kw9ntjwj5yvVEnZnXy8VXnNYsFtDi1uj5DzmR9Jwl08KSXU43d/TmmD2 aXZOs32+ckwWQ7UC3Di3eFNyzetlWZ5Oz5mJL+nMEF0i6LNiN3vwtLW/3Wk9RbOPMTFS +CfTOlfX62uEcMSAGrmT1s6QgPikutLSmuCRHMiRVAZxYqv51CnH/w5dR88W+jSpSQNq LHjRrPDzWXUuMpL8zgTLTmG5ROC8kfNqU0N58ReKPM89rdVCj69EeJs/9OD0yOpTVRHQ Vw7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lIEDo5NN5hcku7eWGJCBmtsAcCxJI78tYCrfEOPVsuM=; b=F0vtfPmZ4KEtfXKvih44ojNeCqV+KI17PHCp0v4NZrDFBU+kyaDEVr210C3t/uBudw lA8j9XE4C9ivUGzdbFNWZrnpXbEwYIOzVCPqKOQRIlFOCFn50MScD86rjUOSd1eVutzg 037Y6FOY4yZLKPwRJmGBuKHmSOM1jOaDizyljho+brj8Dp5oJmKleg6FopOU4jIOAvOZ cwLtYh8K3AE2bAigk9F1QroqyvdRLkWOK7w7EEmlAkoxAE4dYmAoKhBOtg0oJtnGjauC LVHS7GeIjdtocS0icR4/bPbdNQbq9KmfshPGwHMVzOsaRKokuc2cuIGVSeRoTq1r8Dhy WUxw== X-Gm-Message-State: AO0yUKWpbomv2Q8avcBKg/eDWHLrOX2hdJv4qxlQ2Akgh3D++34jVaw3 ZZkuKcvSwPCpClDXR4njJ65a2tJVgQbTZgk6 X-Google-Smtp-Source: AK7set87/rUuxcHkJU6EQ859DxG5ICz/qY53ZE7tyQletccz7peRb9vDKUGyYLhib7JVW7+6sqCQUQ== X-Received: by 2002:ac8:5854:0:b0:3bb:98c5:1685 with SMTP id h20-20020ac85854000000b003bb98c51685mr2292479qth.50.1676653277352; Fri, 17 Feb 2023 09:01:17 -0800 (PST) Received: from localhost.localdomain (dsl-157-123.b2b2c.ca. [66.158.157.123]) by smtp.gmail.com with ESMTPSA id hf22-20020a05622a609600b003b85ed59fa2sm3455166qtb.50.2023.02.17.09.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 09:01:17 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 12:00:45 -0500 Message-Id: <20230217170103.10147-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230217170103.10147-2-maxim.cournoyer@gmail.com> References: <20230217170103.10147-2-maxim.cournoyer@gmail.com> 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/spice.scm (spice-gtk): Update to 0.42. [build-system]: Use meson-build-system. [arguments]: Remove configure-flags. Rename disable-session-test phase to disable-problematic-tests, and adjust. Remove the patch-la-files phase. [native-inputs]: Add python, python-pyparsing and python-six. [inputs]: Remove python. --- gnu/packages/spice.scm | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 3d625a063a..f67a049176 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -41,6 +41,8 @@ (define-module (gnu packages spice) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages security-token) #:use-module (gnu packages tls) #:use-module (gnu packages virtualization) @@ -137,40 +139,29 @@ (define-public spice-protocol (define-public spice-gtk (package (name "spice-gtk") - (version "0.37") + (version "0.42") (source (origin (method url-fetch) (uri (string-append "https://spice-space.org/download/gtk/" - "spice-gtk-" version ".tar.bz2")) + "spice-gtk-" version ".tar.xz")) (sha256 (base32 - "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z")))) - (build-system gnu-build-system) + "0n3s1rn7yzs28hnl9k6ql3a90qlv8w16djqj32m1zb8i31zi304k")))) + (build-system meson-build-system) (arguments (list - #:configure-flags #~(list "--enable-gstaudio" - "--enable-gstvideo" - "--enable-pulse" - "--enable-vala" - "--enable-introspection") #:phases #~(modify-phases %standard-phases - (add-before 'check 'disable-session-test - (lambda _ - ;; XXX: Disable session tests, because they require USB support, - ;; which is not available in the build container. - (substitute* "tests/Makefile" - (("test-session\\$\\(EXEEXT\\) ") "")))) - (add-after 'install 'patch-la-files + (add-after 'unpack 'disable-problematic-tests (lambda _ - ;; Add an absolute reference for libjpeg in the .la files - ;; so it does not have to be propagated. - (substitute* (find-files (string-append #$output "/lib") - "\\.la$") - (("-ljpeg") - (string-append "-L" #$(this-package-input "libjpeg-turbo") - "/lib -ljpeg"))))) + ;; XXX: Disable the session and cd-emu tests, because they + ;; require USB support, which is not available in the build + ;; container. + (substitute* "tests/meson.build" + ((".*'session.c',.*") "") + (("tests_sources \\+= 'cd-emu.c'" all) + (string-append "# " all))))) (add-after 'install 'wrap-spicy (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/spicy") @@ -180,6 +171,9 @@ (define-public spice-gtk (list `(,glib "bin") intltool pkg-config + python + python-pyparsing + python-six vala)) (inputs (list glib-networking @@ -191,7 +185,6 @@ (define-public spice-gtk lz4 mesa pulseaudio - python opus usbredir)) (propagated-inputs