From patchwork Tue Sep 8 13:05:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 23951 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 DF47827BBE8; Tue, 8 Sep 2020 14:06:09 +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, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 5DD7E27BBE7 for ; Tue, 8 Sep 2020 14:06:09 +0100 (BST) Received: from localhost ([::1]:58872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFdK4-0006rD-EY for patchwork@mira.cbaines.net; Tue, 08 Sep 2020 09:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFdJy-0006pq-Vi for guix-patches@gnu.org; Tue, 08 Sep 2020 09:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFdJy-0004WO-Mn for guix-patches@gnu.org; Tue, 08 Sep 2020 09:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kFdJy-0005Lr-F3 for guix-patches@gnu.org; Tue, 08 Sep 2020 09:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43279] [PATCH] glade: Search for catalogues and modules Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Sep 2020 13:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43279 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43279@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159957033520524 (code B ref -1); Tue, 08 Sep 2020 13:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Sep 2020 13:05:35 +0000 Received: from localhost ([127.0.0.1]:52408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFdJX-0005Kx-Cl for submit@debbugs.gnu.org; Tue, 08 Sep 2020 09:05:35 -0400 Received: from lists.gnu.org ([209.51.188.17]:52566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kFdJV-0005Kp-3E for submit@debbugs.gnu.org; Tue, 08 Sep 2020 09:05:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFdJU-0006Rl-24 for guix-patches@gnu.org; Tue, 08 Sep 2020 09:05:32 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:45596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFdJP-0004Ns-FJ for guix-patches@gnu.org; Tue, 08 Sep 2020 09:05:30 -0400 Received: from nijino.local (193-81-157-44.hdsl.highway.telekom.at [193.81.157.44]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4Bm53b0Z4Jz1LWp5 for ; Tue, 8 Sep 2020 15:05:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4Bm53b0Z4Jz1LWp5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1599570315; bh=RrTHj/e7w3hMgPq07eb+blkERjlc7+Sw+6My+XLrX9Y=; h=Subject:From:To:Date:From; b=fWnsxfvgo/n6MSETfbVr774nPmhHrm4SIXhG0x0NC2aBA8LOs8PVWlZPlTTFJqSCQ Ci+juYtz28ZTxkyeMFaZKcYJIBQJFdAgf5vRGb2K0LTjFyLEVhVZL4Nuep2srVLSOf 4a/uKYsPlMPrgGWov4UCq2XpcivU/mBcGZhwk6/Y= Message-ID: <97c8db1a352cd9f53c9e17407656e7734ae769e5.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 08 Sep 2020 15:05:20 +0200 User-Agent: Evolution 3.34.2 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/08 09:05:20 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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-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 Hi Guix, I noticed, that libhandy still has the glade catalog disabled even if the module builds fine (although the 0.0 version appears to be broken). To actually get glade to load them correctly, I had to define some search paths, which is the actual functionality added by this patch set. I'm not sure, if other gtk+-based libraries would also add their catalogs, so for now it's just these two patches. Regards, Leo From c54baafc4b97e89c241ee3fff765ee84aa2e6e54 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 8 Sep 2020 14:08:33 +0200 Subject: [PATCH 2/2] gnu: libhandy: Enable glade_catalog. * gnu/packages/gnome.scm (libhandy)[configure-flags]: Add glade_catalog. [inputs]: Add glade and libxml2. (libhandy-0.0)[configure-flags]: Keep glade_catalog disabled. --- gnu/packages/gnome.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1092065069..31c5b0319c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10508,7 +10508,7 @@ advanced image management tool") (build-system meson-build-system) (arguments `(#:configure-flags - '("-Dglade_catalog=disabled" + '("-Dglade_catalog=enabled" "-Dgtk_doc=true") #:phases (modify-phases %standard-phases @@ -10519,7 +10519,9 @@ advanced image management tool") (setenv "DISPLAY" ":1") #t))))) (inputs - `(("gtk+" ,gtk+))) + `(("gtk+" ,gtk+) + ("glade" ,glade3) + ("libxml2" ,libxml2))) (native-inputs `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ; for g-ir-scanner @@ -10550,7 +10552,11 @@ for usage on small and big screens.") (commit (string-append "v" version)))) (file-name (git-file-name "libhandy" version)) (sha256 - (base32 "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5")))))) + (base32 "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5")))) + (arguments + (substitute-keyword-arguments (package-arguments libhandy) + ((#:configure-flags flags) + '(list "-Dglade_catalog=disabled" "-Dgtk_doc=true")))))) (define-public libgit2-glib (package -- 2.28.0