From patchwork Thu Nov 18 07:06:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Sample X-Patchwork-Id: 34607 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 97BD327BBE3; Thu, 18 Nov 2021 07:10:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5A9F127BBE1 for ; Thu, 18 Nov 2021 07:10:42 +0000 (GMT) Received: from localhost ([::1]:38456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnbZB-0002M4-JM for patchwork@mira.cbaines.net; Thu, 18 Nov 2021 02:10:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnbWf-0000IO-OC for guix-patches@gnu.org; Thu, 18 Nov 2021 02:08:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnbWf-0008Jl-FF for guix-patches@gnu.org; Thu, 18 Nov 2021 02:08:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnbWf-0002s7-AM for guix-patches@gnu.org; Thu, 18 Nov 2021 02:08:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51938] [PATCH core-updates-frozen 19/22] gnu: gnome-control-center: Fix build. Resent-From: Timothy Sample Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Nov 2021 07:08:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51938@debbugs.gnu.org Cc: Timothy Sample Received: via spool by 51938-submit@debbugs.gnu.org id=B51938.163721926710893 (code B ref 51938); Thu, 18 Nov 2021 07:08:05 +0000 Received: (at 51938) by debbugs.gnu.org; 18 Nov 2021 07:07:47 +0000 Received: from localhost ([127.0.0.1]:34457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnbWN-0002pW-Hz for submit@debbugs.gnu.org; Thu, 18 Nov 2021 02:07:47 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:55367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnbWJ-0002mt-Mk for 51938@debbugs.gnu.org; Thu, 18 Nov 2021 02:07:44 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 65B955C00D8; Thu, 18 Nov 2021 02:07:40 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 18 Nov 2021 02:07:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=OUxR9cN5bUdYeD38aCQZugFrKrytOqDpFlQM6BzV3Cw=; b=S2OZa0hM BKb4BwtRo7akObFBMmzQ3c2ZNHqIXaC+8iWh0mHDIndHiX5YtZFceWfkGUawpMCQ 29QxwW4iU2CF5jP38/wrfeB9z2HYt5AUR/mOwUWiy7nC7pgClekfydwUc97h4VWG JmvEDH+YDCPo5hoM1i+9PB5OJ1N/JNX+CStwg54LBuOQmI+AMnc2+U8af7aMSNE/ 6AXk882hLPaEtzqCUGQdCLVpAH8krJ1K2PalECLtL65FaJqowEGdC2oYCD0lhw4/ wxF4lGhv7mwp6aMOrFop5hc7bE9f775tAVTN7AnH4y5/0km2AyeRIE/+A9kZv+71 MUjph43ZPt2FZA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrfeehgddutdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhimhhothhhhicuufgrmhhplhgvuceoshgrmhhplhgvthes nhhghihrohdrtghomheqnecuggftrfgrthhtvghrnhepgeevvdetleduheekjeelheejhf dvhffhteefgefhhfefkeejteetffekheehjeeknecuffhomhgrihhnpehgihhthhhusgdr tghomhenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hsrghmphhlvghtsehnghihrhhordgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Nov 2021 02:07:40 -0500 (EST) From: Timothy Sample Date: Thu, 18 Nov 2021 02:06:32 -0500 Message-Id: <20211118070635.8259-19-samplet@ngyro.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <87ilwq9cia.fsf@ngyro.com> References: <87ilwq9cia.fsf@ngyro.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" X-getmail-retrieved-from-mailbox: Patches See . * gnu/packages/gnome.scm (gnome-control-center) [arguments]: Use meson-0.59. [inputs]: Replace libsoup with libsoup-minimal-2. --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 98d26ea920..9d409be7bf 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8563,7 +8563,8 @@ (define-public gnome-control-center "0rr4d5m2a72vrb31jgyx49dp0s2pwgyxsrk4hyw5ym66wq63c3v1")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t + `(#:meson ,meson-0.59 ;positional arguments error with meson 0.60 + #:glib-or-gtk? #t #:configure-flags (list "-Dcheese=false" (string-append "-Dgnome_session_libexecdir=" @@ -8639,7 +8640,7 @@ (define-public gnome-control-center ("libnma" ,libnma) ("libpwquality" ,libpwquality) ("libsecret" ,libsecret) - ("libsoup" ,libsoup) + ("libsoup" ,libsoup-minimal-2) ("libxml2" ,libxml2) ("libwacom" ,libwacom) ("mesa" ,mesa)