From patchwork Tue Jul 18 14:40:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51832 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 1D2A427BBEC; Tue, 18 Jul 2023 15:45:23 +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=ham 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 9F8D227BBEA for ; Tue, 18 Jul 2023 15:45:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlvm-0001ZX-SF; Tue, 18 Jul 2023 10:44:03 -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 1qLluw-0000l6-BS for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:11 -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 1qLlut-000191-29 for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlus-0006lY-UF; Tue, 18 Jul 2023 10:43:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 39/43] gnu: harfbuzz: Support build 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:43:06 +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.168969136425855 (code B ref 64711); Tue, 18 Jul 2023 14:43:06 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:44 +0000 Received: from localhost ([127.0.0.1]:53909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluW-0006ir-GS for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLluR-0006hc-Bs for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:40 -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 1qLluM-00011N-0m; Tue, 18 Jul 2023 10:42:34 -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=skzliisRpA04QCpm1mB0exnCRGZx+Sx4KQbKZIwRxtE=; b=O8Py1PDy1KcLREkKRRle Mbi6HBbf6EYrCTKlPYn5+UcUT0NcVh1mEyQMBwvCflKBMwNBs2LA8dYRZvyj8y4dFAbuismpHhFIW +EuU+JcgYYKY+9NAUBwaINDNSD1Lr6uQmt1ioDjZUhcNii/KyBWPfxbE1jajjr6u7rwgdukDd9NlJ h9sYwAsL9I/eClph6JCcNjmXd3PcStU+vDLF/Gm7OY0VeNdMpF5VFrr1CPzdca9D8y+992pC34Tc0 TozzRHQ943Q9MiEC3qNT0qWLgK90sDYk3RYx6RMDGoBugCBHc0RBjBPCApxYurbbe9PPEVQEeStO7 giMu6M56qbSxZA==; 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 1qLluL-0004hp-IQ; Tue, 18 Jul 2023 10:42:33 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:32 +0200 Message-Id: <9fc9a0ae11de8c4484558c0cbac047330ca909f6.1689690897.git.janneke@gnu.org> 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 * gnu/packages/gtk.scm (harfbuzz)[native-inputs]: Do not include gobject-introspection when building for the Hurd. --- gnu/packages/gtk.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index eb69a88221..853696c7f5 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -276,11 +276,13 @@ (define-public harfbuzz ;; There are all in the Requires or Requires.private field of '.pc'. (list glib graphite2 icu4c)) (native-inputs - (list `(,glib "bin") ;for glib-mkenums - gobject-introspection - pkg-config - python-wrapper - which)) + `((,glib "bin") ;for glib-mkenums + ,@(if (target-hurd?) + '() + (list gobject-introspection)) + ,pkg-config + ,python-wrapper + ,which)) (arguments (list #:configure-flags #~(list "--with-graphite2"