From patchwork Tue Jul 18 14:40:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51807 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 AD72927BBE9; Tue, 18 Jul 2023 15:43:19 +0100 (BST) 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_INVALID, DKIM_SIGNED,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 4750127BBE2 for ; Tue, 18 Jul 2023 15:43:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlu1-0007qq-Hy; Tue, 18 Jul 2023 10:42:13 -0400 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 1qLlty-0007jt-TD for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qLlty-0000wW-Km for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlty-0006fD-FX; Tue, 18 Jul 2023 10:42:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 26/43] gnu: cairo: Support building for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64711@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969131225427 (code B ref 64711); Tue, 18 Jul 2023 14:42:10 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:52 +0000 Received: from localhost ([127.0.0.1]:53816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltg-0006c3-4g for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlta-0006b5-CV for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:47 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLltV-0000lo-5Q; Tue, 18 Jul 2023 10:41:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=8w2E8wlxCE08Q6KPeOVzxChQEzOq/9cvmcLzPrJ8oNg=; b=CqxcqOTCjhNItj16d4kC miEa+qljdLVkL2IppkvGZNIuRXzc9CznDIIFyPk4FytngxyCayFSqyKPgqcsYLT3z7Aq12KcFs0vY nrLtz256705nb0f/h4J5ygDW9nHDB8ZbQT+RCmpT/UnKhhpS4DshyPQ9xgXr+3FBVykbgkC3nD/Yt 5RGWPhV62J4rsWdzDQa+mp6LCiAdCyZlnHp0Tpylrj97Pk5b+P/Onzf0AS3qCl77XRSm6oyp1A5uO YgC8XAnFCzpWoKukVq4rSJwj+38umV5ABVSQPlhAylO8dkRN+wV1Bb1bJN/a5n1HTxhXagekrv276 TpJPRcynMN9wXQ==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1qLltS-0004hp-D7; Tue, 18 Jul 2023 10:41:40 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:19 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 Gobject-introspection and libdrm does not build for the Hurd. Poppler depends on nss, which does not build for the Hurd. * gnu/packages/gtk.scm (cairo)[native-inputs]: When building for the Hurd, do not include gobject-introspection. [inputs]: Likewise, do not include libdrm, poppler. --- gnu/packages/gtk.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9621357b99..eb69a88221 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Sergiu Ivanov ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -194,15 +195,21 @@ (define-public cairo (assoc-ref %outputs "doc") "/share/gtk-doc/html")))) (native-inputs - `(("gobject-introspection" ,gobject-introspection) + `(,@(if (target-hurd?) + '() + `(("gobject-introspection" ,gobject-introspection))) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs `(("bash-minimal" ,bash-minimal) ;for glib-or-gtk-wrap - ("drm" ,libdrm) + ,@(if (target-hurd?) + '() + `(("drm" ,libdrm))) ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) - ("poppler" ,poppler))) + ,@(if (target-hurd?) + '() + `(("poppler" ,poppler))))) (propagated-inputs `( ;; ("cogl" ,cogl) ;; ("directfb" ,directfb)