From patchwork Wed Oct 30 12:56:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 15900 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 037421768F; Wed, 30 Oct 2019 12:57:12 +0000 (GMT) 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 A78B817676 for ; Wed, 30 Oct 2019 12:57:11 +0000 (GMT) Received: from localhost ([::1]:40194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPnXD-00079U-1g for patchwork@mira.cbaines.net; Wed, 30 Oct 2019 08:57:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41423) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPnX6-00079I-Te for guix-patches@gnu.org; Wed, 30 Oct 2019 08:57:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPnX5-0000Vy-GX for guix-patches@gnu.org; Wed, 30 Oct 2019 08:57:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40654) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iPnX5-0000V0-1T for guix-patches@gnu.org; Wed, 30 Oct 2019 08:57:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iPnX4-0000MA-Tw for guix-patches@gnu.org; Wed, 30 Oct 2019 08:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37987] Add gitg References: Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Oct 2019 12:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37987 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: m.othacehe@gmail.com Cc: 37987@debbugs.gnu.org Received: via spool by 37987-submit@debbugs.gnu.org id=B37987.15724402181360 (code B ref 37987); Wed, 30 Oct 2019 12:57:02 +0000 Received: (at 37987) by debbugs.gnu.org; 30 Oct 2019 12:56:58 +0000 Received: from localhost ([127.0.0.1]:49475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPnX0-0000Lq-85 for submit@debbugs.gnu.org; Wed, 30 Oct 2019 08:56:58 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:27514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iPnWv-0000Lf-Qc for 37987@debbugs.gnu.org; Wed, 30 Oct 2019 08:56:57 -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 4737km3pwHz1LXt1; Wed, 30 Oct 2019 13:56:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4737km3pwHz1LXt1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1572440209; bh=aSYetcKfVm6oUC98S7APULouhBinQavGP63173foi1o=; h=Subject:From:To:Cc:Date:In-Reply-To:From; b=muMlEm8vX+8x4Neyx4cZAptaU6nkc94GIYrrq3HiGSZSPM/FHtM2528Xm121DYHH8 B/M3qgMVo7Qar+7N7aDT17Laos7/J+LVHLmVcYWQ6OQEelIHdn75nRMG/+PaexAx5G MOJFgeEcVmd+zYjqmyK8lSR122UnAAe4+Y6iwwrw= Message-ID: From: Leo Prikler Date: Wed, 30 Oct 2019 13:56:51 +0100 In-Reply-To: 87tv7qbljo.fsf@gmail.com 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.117 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 > Your patch LGTM. About failing test, I see that nix runs them and has > a > small fix to substitute bash path: > > --8<---------------cut here---------------start------------->8--- > substituteInPlace tests/libgitg/test-commit.vala --replace > "/bin/bash" > "${bash}/bin/bash" > --8<---------------cut here---------------end--------------->8--- > > Have you tried something like that? That does seem to work. I've updated the patch. Regards, Leo From 3915d6a47381cb835599e9fd6744f733144f0f30 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 29 Oct 2019 23:30:16 +0100 Subject: [PATCH] gnu: Add gitg. * gnu/packages/gnome.scm: (gitg): New variable. --- gnu/packages/gnome.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 276fa56..05ff728 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8400,6 +8400,73 @@ higher level porcelain stuff.") (home-page "https://wiki.gnome.org/Projects/Libgit2-glib") (license license:gpl2+))) +(define-public gitg + (package + (name "gitg") + (version "3.32.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-post-install-partially + (lambda _ + (substitute* "meson_post_install.py" + (("'python'") ; there are no python sources to compile + (string-append "'" (which "true") "'")) + (("gtk-update-icon-cache") (which "true"))) + #t)) + (add-after 'unpack 'fix-test-sources + (lambda _ + (substitute* "tests/libgitg/test-commit.vala" + (("/bin/bash") (which "bash"))) + #t)) + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/gitg"))) + (wrap-program prog + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (inputs + `(("glib" ,glib) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("gtkspell3" ,gtkspell3) + ("gtksourceview" ,gtksourceview-3) + ("json-glib" ,json-glib) + ("libdazzle" ,libdazzle) + ("libgee" ,libgee) + ("libgit2" ,libgit2) ; propagated by libgit2-glib + ("libgit2-glib" ,libgit2-glib) + ("libpeas" ,libpeas) + ("libsecret" ,libsecret) + ("libsoup" ,libsoup) + ("libxml2" ,libxml2))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gtk+:bin" ,gtk+ "bin") + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (synopsis "Graphical user interface for git") + (description + "gitg is a graphical user interface for git. It aims at being a small, +fast and convenient tool to visualize the history of git repositories. +Besides visualization, gitg also provides several utilities to manage your +repository and commit your work.") + (home-page "https://wiki.gnome.org/Apps/gitg") + (license license:gpl2+))) + (define-public gnome-mahjongg (package (name "gnome-mahjongg") -- libgit2 0.28.2