From patchwork Fri Oct 25 09:17:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 15819 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 E920B175CB; Fri, 25 Oct 2019 10:18:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8DA2517582 for ; Fri, 25 Oct 2019 10:18:13 +0100 (BST) Received: from localhost ([::1]:57972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNvjY-0007RF-VT for patchwork@mira.cbaines.net; Fri, 25 Oct 2019 05:18:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56355) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNvjR-0007Jc-LR for guix-patches@gnu.org; Fri, 25 Oct 2019 05:18:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNvjQ-0007NX-Eg for guix-patches@gnu.org; Fri, 25 Oct 2019 05:18:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56689) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iNvjQ-0007NS-Ba for guix-patches@gnu.org; Fri, 25 Oct 2019 05:18:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iNvjQ-0000q2-5Q for guix-patches@gnu.org; Fri, 25 Oct 2019 05:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37918] gnu: meld: Fix startup Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Oct 2019 09:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37918 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 37918@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15719950613190 (code B ref -1); Fri, 25 Oct 2019 09:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Oct 2019 09:17:41 +0000 Received: from localhost ([127.0.0.1]:37277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iNvj3-0000pN-7n for submit@debbugs.gnu.org; Fri, 25 Oct 2019 05:17:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:49055) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iNvj1-0000pE-JY for submit@debbugs.gnu.org; Fri, 25 Oct 2019 05:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56318) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iNviz-0006T9-W6 for guix-patches@gnu.org; Fri, 25 Oct 2019 05:17:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iNviy-0007EO-BA for guix-patches@gnu.org; Fri, 25 Oct 2019 05:17:37 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:43058) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iNvix-0007D3-FY for guix-patches@gnu.org; Fri, 25 Oct 2019 05:17:36 -0400 Received: from nijino.local (194-118-175-91.hdsl.highway.telekom.at [194.118.175.91]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 46zz5y4Drrz3wGN for ; Fri, 25 Oct 2019 11:17:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1571995046; bh=xqutmPwO8DvB/6PWMGYt76KtkiDC/wZPZUdkgxSQ+4w=; h=Subject:From:To:Date; b=oI8OXNlEe4bizYOj0DM+x7KA+FIB3SSA5r0NYUWGIoHmb9w6+2dKBhkynV4eB6zG9 0bpl5QnLFkXVvjap1IquumikDv5L7d1765qmLye4R8KIih4jKYcXyHV/MbyIo9FIx9 /pZdqj8xgtodA0JVraNEOWf+OI0/pX3uMeXAXCZQ= Message-ID: <3b9ad3a65c0b37c02e7d54131d0d683195276119.camel@student.tugraz.at> From: Leo Prikler Date: Fri, 25 Oct 2019 11:17:26 +0200 User-Agent: Evolution 3.30.5 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 It was reported in IRC, that Meld is having troubles starting up. After some building on my own I've decided to fix it. Caveat: Running `guix build meld` followed by `/gnu/store/.../bin/meld` will lead to a crash -- it seems GSettings is having some trouble. `guix environment --ad-hoc meld` should work, though. Regards, Leo From d0b647ac2b038e8bed5b99fa8dd4a70b4b4be357 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 25 Oct 2019 11:01:50 +0200 Subject: [PATCH] gnu: meld: Fix startup. * /gnu/packages/patchutils.scm: (meld)[inputs]: Use gtksourceview-3. [arguments]<#:phases>: Add 'wrap-typelib'. --- gnu/packages/patchutils.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index a63d889cff..4cd6bbbf48 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -265,7 +265,7 @@ GiB).") (inputs `(("python-cairo" ,python-pycairo) ("python-gobject" ,python-pygobject) - ("gtksourceview" ,gtksourceview))) + ("gtksourceview" ,gtksourceview-3))) (propagated-inputs `(("dconf" ,dconf))) (arguments @@ -292,7 +292,14 @@ GiB).") (setenv "HOME" "/tmp") (invoke "py.test" "-v" "-k" ;; TODO: Those tests fail, why? - "not test_classify_change_actions")))))) + "not test_classify_change_actions"))) + (add-after 'wrap 'wrap-typelib + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/meld") + `("GI_TYPELIB_PATH" prefix + ,(search-path-as-string->list (getenv "GI_TYPELIB_PATH")))) + #t)))))) (home-page "https://meldmerge.org/") (synopsis "Compare files, directories and working copies") (description "Meld is a visual diff and merge tool targeted at -- 2.23.0