From debbugs-submit-bounces@debbugs.gnu.org Thu May 06 13:27:52 2021 Received: (at 48262) by debbugs.gnu.org; 6 May 2021 17:27:52 +0000 Received: from localhost ([127.0.0.1]:38716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lehmx-0005kQ-W8 for submit@debbugs.gnu.org; Thu, 06 May 2021 13:27:52 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:33787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lehmv-0005kK-KK for 48262@debbugs.gnu.org; Thu, 06 May 2021 13:27:50 -0400 Received: by mail-qv1-f48.google.com with SMTP id i8so3493509qvv.0 for <48262@debbugs.gnu.org>; Thu, 06 May 2021 10:27:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=y8W703RQ69m5JkhSV13OJDVMnz0Eix8rwZJvSmdy3rQ=; b=FUeKm0UbCSDH0Cf3n5T81UaXfNlTIW885l6FOa9RDef+arqLTZh+Xz0MtZCNoF6iIK QX9hgPoo9+nvGpabKeRBV3Py3KqBJ+bov9Nvu7P05FTjTkUJtvzjDaXDn3aU/TuvB5Pu mHN2/dKkHkafzIzZ37vvi8nn5d+YdVDPOs5hp6kCs0Ik6U/1ho6KSjCHwnj+j+YDDRVj M4Q+njXTU0jYwpxMF8bFK+pt9aI5J9MtlpaJb7GczBd0q/hV3dv3rAquPE1ZotSMaWU8 1W5tntZKLBAKu8sbvRrlaFivhu/ttnnyeohO0l7SaH5Eu66tMaMzMlMCfjVY3/eRy0t/ uWOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=y8W703RQ69m5JkhSV13OJDVMnz0Eix8rwZJvSmdy3rQ=; b=cq/NlzbvLI0WzIMh7si5YZR8tG9NgX66OV2jZOjfWCzVI9kWyIGhAxl1FGI7EuylI1 +eDix+HcoH4ZHbXlxRkNzMHwKI588YfoLP1b3TGXL6jANWiXEcFYBQWMy0iy5k/MqAQc fi9LAC7slTFK8Ui4aBkgucInKmbVGqwTUhhz3vv31vE4KUrxmdT4Wqj2ibmSxnPT6Opk KGMoMgwDx2jscmgcn2+6agA+OHEpg++quUFopd9bCG4Zn+uK4zKEdkIHA6qWhpNncYWC 1UKxgPof64QTibaLx6MbJ5fjwxqEsOMR4DlJ3jNEbV5I5/GnVUdaCTDJ7vTMPFCNy6t6 5orw== X-Gm-Message-State: AOAM532kkKbcCIFe8X8+6ckc6rFJRocs614d7Cc5Its8ZEdx7mb3kSkB NfltnHxd/HHbed07i00NN3+6wsN/fSA5Dg== X-Google-Smtp-Source: ABdhPJyXsDU1qwHwNewFrY/EsbdqLzxZ2mnB/6fshqVsQCzmCa1HbNnc2FIxtImHKvdbjIse3S1xzw== X-Received: by 2002:a05:6214:a0b:: with SMTP id dw11mr5822607qvb.51.1620322063979; Thu, 06 May 2021 10:27:43 -0700 (PDT) Received: from localhost.localdomain (dsl-10-131-245.b2b2c.ca. [72.10.131.245]) by smtp.gmail.com with ESMTPSA id y13sm2495704qkj.84.2021.05.06.10.27.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 May 2021 10:27:43 -0700 (PDT) From: Maxim Cournoyer To: 48262@debbugs.gnu.org Subject: [PATCH version-1.3.0 1/3] gnu: spice-vdagent: Update to 0.21.0 and enable GTK+ support. Date: Thu, 6 May 2021 13:27:30 -0400 Message-Id: <20210506172732.12294-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 48262 Cc: Maxim Cournoyer 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: -1.0 (-) * gnu/packages/spice.scm (spice-vdagent): Update to 0.21.0. Remove trailing #t. [make-flags]: New argument. [phases]{fix-test-termination}: New phase. [inputs]: Add gtk+. [native-inputs]{procps}: New input. --- gnu/packages/spice.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 92aeef7f79..0e47609b9e 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -261,7 +261,7 @@ Internet and from a wide variety of machine architectures.") (define-public spice-vdagent (package (name "spice-vdagent") - (version "0.20.0") + (version "0.21.0") (source (origin (method url-fetch) (uri (string-append @@ -269,11 +269,14 @@ Internet and from a wide variety of machine architectures.") "spice-vdagent-" version ".tar.bz2")) (sha256 (base32 - "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf")))) + "0n8jlc1pv6mkry161y656b1nk9hhhminjq6nymzmmyjl7k95ymzx")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--localstatedir=/var") + ;; The test-session-info test fails for unknown reasons (see: + ;; https://gitlab.freedesktop.org/spice/linux/vd_agent/-/issues/24). + #:make-flags '("XFAIL_TESTS=tests/test-session-info") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefile.in @@ -281,19 +284,27 @@ Internet and from a wide variety of machine architectures.") (substitute* "Makefile.in" (((string-append "\\$\\(mkdir_p\\) \\$\\(DESTDIR\\)" "\\$\\(localstatedir\\)/run/spice-vdagentd")) - "-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd")) - #t)) + "-$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd")))) (add-after 'unpack 'patch-spice-vdagent.desktop (lambda* (#:key outputs #:allow-other-keys) (substitute* "data/spice-vdagent.desktop" (("Exec=/usr/bin/spice-vdagent") (string-append "Exec=" (assoc-ref outputs "out") - "/bin/spice-vdagent"))) - #t))))) + "/bin/spice-vdagent"))))) + (add-after 'unpack 'fix-test-termination + (lambda _ + ;; The termination tests depend on finding the socket file name + ;; in the spice-vdagent command line it launched, but by default + ;; ps truncates its output, which causes the test to fail (see: + ;; https://gitlab.freedesktop.org/spice/linux/vd_agent/-/merge_requests/36). + (substitute* "tests/test-termination.c" + (("ps -ef") + "ps -efww"))))))) (inputs `(("alsa-lib" ,alsa-lib) ("dbus" ,dbus) ("glib" ,glib) + ("gtk+" ,gtk+) ("libdrm" ,libdrm) ("libpciaccess" ,libpciaccess) ("libx11" ,libx11) @@ -303,7 +314,8 @@ Internet and from a wide variety of machine architectures.") ("libxrandr" ,libxrandr) ("spice-protocol" ,spice-protocol))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("procps" ,procps))) ;tests use 'ps' (synopsis "Spice agent for Linux") (description "Spice-vdagent enables sharing the clipboard and guest display resolution scaling on graphical console window resize.") -- 2.31.1