From patchwork Fri Feb 17 17:00:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 47047 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 4D708168B3; Fri, 17 Feb 2023 17:03:16 +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 6FEE716793 for ; Fri, 17 Feb 2023 17:03:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pT47v-0006xu-Gx; Fri, 17 Feb 2023 12:02:27 -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-0006iB-9g 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 1pT47W-0000K2-Q9 for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pT47W-00081Y-2M for guix-patches@gnu.org; Fri, 17 Feb 2023 12:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61576] [PATCH 01/21] gnu: spice-gtk: Fix indentation and normalize field order. References: <20230217165145.9631-1-maxim.cournoyer@gmail.com> In-Reply-To: <20230217165145.9631-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 17 Feb 2023 17:02:02 +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.167665328230546 (code B ref 61576); Fri, 17 Feb 2023 17:02:02 +0000 Received: (at 61576) by debbugs.gnu.org; 17 Feb 2023 17:01:22 +0000 Received: from localhost ([127.0.0.1]:41326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT46r-0007wV-MX for submit@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:22 -0500 Received: from mail-qt1-f173.google.com ([209.85.160.173]:35472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pT46p-0007w4-GY for 61576@debbugs.gnu.org; Fri, 17 Feb 2023 12:01:20 -0500 Received: by mail-qt1-f173.google.com with SMTP id v3so1370619qta.2 for <61576@debbugs.gnu.org>; Fri, 17 Feb 2023 09:01:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RoHSpLxNkXmZOMEi75q9KUCr6Z6PRN0KvvbzA0AH9k4=; b=qyIrzNwheIhP/2nrQrumwrNfCiSGGxbD001xyZfKWBYfHhrlC6JkZWfePv/3dXcR/r PmzO+1kOA2VWMZQC35C+PsbopfQu6jOWdoteUw0iWUz4PSQhYm11prCTMgQVf1iUYqi1 sj+GaVO/S9g6OK3//RzMhDi7RP/2z+USKrmIQP6dBL4TB1tkAYXO6k23GVOxUCnu8Rm/ 8Rsapy2YwqfrTIDGuWc3/7LC02grQkoIyM9SbtCFqLtk7V24072wY9/lBsOxclTU7LtU EF4IdC/vKbv+TZzmVJQuc2WG83gur11z0YNe/1bC3txkSw87q4IOEB7Kz5OoCmGP9qhI nBxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RoHSpLxNkXmZOMEi75q9KUCr6Z6PRN0KvvbzA0AH9k4=; b=3WfrhoNY4Ude2Bd3R9bAWqEMPF+Bw+ovpn2SxKj9i8edMTe2a7GOUa+6dHGtFzG5AV KvawaXqAfe2Xc1XMyh/nl09e/Nc5xidfyw+nF2iXC0MLOjjUNjuaA5sHwVtoinQMcPv9 Qsuh+U+uKlGZEHW/UKUhoT8Y8j944cduvwsccaI/MNWKJPGmLs5HvPwEorHf/M8sIk6+ LOswzjP0xoGzXjT8UVSTostFbg0QQu3Zayij7NW20JstkFIXXmK9UbjpBCbs3EblAwos yva7Y0vTg3uF+uHrlH5yT+qaFgNyTsfzEijzQT/M9HDHbsv4ljLTzpUZkIrARjt5DTRY Srkw== X-Gm-Message-State: AO0yUKVSHd+mhSpSQy9Y6fD+022cBmgZG8Rrl6xQcphL5xKWyG39QZRw uCayrjJsLY9Ijo+0A3VhlMGVlvs7+RFo4AyQ X-Google-Smtp-Source: AK7set/7Al8/2m6b8K0H3XPkyq9kAb37TvdY5K2ZGknL0hSmM10hl/RHmbw6hD1/WV7yTcK3X/Lnsg== X-Received: by 2002:a05:622a:11d0:b0:3b8:4951:57b7 with SMTP id n16-20020a05622a11d000b003b8495157b7mr1436456qtk.20.1676653273351; Fri, 17 Feb 2023 09:01:13 -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.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 09:01:12 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Feb 2023 12:00:42 -0500 Message-Id: <20230217170103.10147-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 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): Fix indentation. Move and re-order inputs below arguments. --- gnu/packages/spice.scm | 120 ++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 2be724c455..139ef4867e 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -141,73 +141,69 @@ (define-public spice-gtk (source (origin (method url-fetch) (uri (string-append - "https://spice-space.org/download/gtk/" - "spice-gtk-" version ".tar.bz2")) + "https://spice-space.org/download/gtk/" + "spice-gtk-" version ".tar.bz2")) (sha256 (base32 "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z")))) (build-system gnu-build-system) - (propagated-inputs - (list gstreamer - gst-plugins-base - gst-plugins-good - spice-protocol - ;; These are required by the pkg-config files. - gtk+ - pixman - openssl-1.1)) - (inputs - `(("glib-networking" ,glib-networking) - ("gobject-introspection" ,gobject-introspection) - ("json-glib" ,json-glib) - ("libepoxy" ,libepoxy) - ("libjpeg" ,libjpeg-turbo) - ("libxcb" ,libxcb) - ("lz4" ,lz4) - ("mesa" ,mesa) - ("pulseaudio" ,pulseaudio) - ("python" ,python) - ("opus" ,opus) - ("usbredir" ,usbredir))) - (native-inputs - `(("glib:bin" ,glib "bin") - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("vala" ,vala))) (arguments - `(#:configure-flags - '("--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\\) ") "")) - #t)) - (add-after 'install 'patch-la-files - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (libjpeg (assoc-ref inputs "libjpeg"))) - ;; Add an absolute reference for libjpeg in the .la files - ;; so it does not have to be propagated. - (substitute* (find-files (string-append out "/lib") "\\.la$") - (("-ljpeg") - (string-append "-L" libjpeg "/lib -ljpeg"))) - #t))) - (add-after - 'install 'wrap-spicy - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) - (wrap-program (string-append out "/bin/spicy") - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)))) - #t))))) + `(#:configure-flags '("--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 + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (libjpeg (assoc-ref inputs "libjpeg"))) + ;; Add an absolute reference for libjpeg in the .la files + ;; so it does not have to be propagated. + (substitute* (find-files (string-append out "/lib") "\\.la$") + (("-ljpeg") + (string-append "-L" libjpeg "/lib -ljpeg")))))) + (add-after 'install 'wrap-spicy + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/spicy") + `("GST_PLUGIN_SYSTEM_PATH" ":" + prefix (,gst-plugin-path))))))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (inputs + `(("glib-networking" ,glib-networking) + ("gobject-introspection" ,gobject-introspection) + ("json-glib" ,json-glib) + ("libepoxy" ,libepoxy) + ("libjpeg" ,libjpeg-turbo) + ("libxcb" ,libxcb) + ("lz4" ,lz4) + ("mesa" ,mesa) + ("pulseaudio" ,pulseaudio) + ("python" ,python) + ("opus" ,opus) + ("usbredir" ,usbredir))) + (propagated-inputs + (list gstreamer + gst-plugins-base + gst-plugins-good + spice-protocol + ;; These are required by the pkg-config files. + gtk+ + pixman + openssl-1.1)) (synopsis "Gtk client and libraries for SPICE remote desktop servers") (description "Gtk client and libraries for SPICE remote desktop servers.") (home-page "https://www.spice-space.org")