From patchwork Wed Jun 23 21:32:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 30654 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 E04A227BC83; Wed, 23 Jun 2021 23:27:17 +0100 (BST) 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, FREEMAIL_FROM,MAILING_LIST_MULTI,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 6A71927BC78 for ; Wed, 23 Jun 2021 23:27:17 +0100 (BST) Received: from localhost ([::1]:44550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwBL2-0004FO-GI for patchwork@mira.cbaines.net; Wed, 23 Jun 2021 18:27:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwAUY-0005LI-HL for guix-patches@gnu.org; Wed, 23 Jun 2021 17:33:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwAUY-0005XZ-AQ for guix-patches@gnu.org; Wed, 23 Jun 2021 17:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwAUY-0006PW-7a for guix-patches@gnu.org; Wed, 23 Jun 2021 17:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49198] [PATCH core-updates] fix gobject-introspection cairo library path Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Jun 2021 21:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49198 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49198@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.162448394024590 (code B ref -1); Wed, 23 Jun 2021 21:33:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jun 2021 21:32:20 +0000 Received: from localhost ([127.0.0.1]:41982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwATr-0006OY-Qd for submit@debbugs.gnu.org; Wed, 23 Jun 2021 17:32:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:53566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwATq-0006OQ-2v for submit@debbugs.gnu.org; Wed, 23 Jun 2021 17:32:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwATp-0005Ia-Rc for guix-patches@gnu.org; Wed, 23 Jun 2021 17:32:17 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:36806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwATn-0004tZ-5O for guix-patches@gnu.org; Wed, 23 Jun 2021 17:32:17 -0400 Date: Wed, 23 Jun 2021 21:32:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1624483924; bh=bg/pWDLzlEA9MohdS+j/ExByUS3opnOR1TV/6Y2LOg8=; h=Date:To:From:Reply-To:Subject:From; b=J8DNhRDFUANIUhH05JRX29klewYTGJQCghlc/0mDJfdTRA8opqyRnu33RUTABWWxj o4p5W0TrFJZTEsKsgn1m7H8QH7F7wSJM3HjaHVvEfGtCgxzR6ELyT5r+KLhPJVA0JQ NR5JbLZxfTRUabSNqNfWaAHgu6zJ4sYc+BpxHZ74= Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.18; envelope-from=john.kehayias@protonmail.com; helo=mail1.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 23 Jun 2021 18:26:58 -0400 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Hello, This is a patch to fix issue #49122 (gobject-introspection and not finding cairo). The patch changes the cairo typelib file to include the absolute path to the cairo patch (as required by libraries that use introspection via gir) by modifying the input file. I believe this is exactly what is done in nix to solve the same issue, see https://github.com/NixOS/nixpkgs/issues/34080 for their discussion and fix. I believe this necessitates building with a cairo dependency to have the library path available, but correct me if I'm wrong as I'm new to guix. I've used cairo-sans-poppler to avoid the dependency cycle. I've tested this builds and solves issue #49122 for me. Thanks! John diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 206222b578..3434e699d2 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -496,6 +496,14 @@ dynamic loading, and an object system.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + ;; Patch for cairo library location + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gir/cairo-1.0.gir.in" + (("shared-library=\"@CAIRO_SHARED_LIBRARY@\"") + (string-append "shared-library=\"" + (assoc-ref inputs "cairo") + "/lib/@CAIRO_SHARED_LIBRARY@\""))))) (add-after 'unpack 'do-not-use-/usr/bin/env (lambda _ (substitute* "tools/g-ir-tool-template.in" @@ -507,6 +515,7 @@ dynamic loading, and an object system.") ("pkg-config" ,pkg-config))) (inputs `(("bison" ,bison) + ("cairo" ,cairo-sans-poppler) ; break dependency loop via poppler ("flex" ,flex) ("glib" ,glib) ("python" ,python-wrapper) -- 2.32.0