From patchwork Fri Mar 19 19:58:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?L=C3=A9o_Le_Bouter?= X-Patchwork-Id: 27973 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 305FF27BC58; Fri, 19 Mar 2021 20:01:53 +0000 (GMT) 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,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 1DD2927BC57 for ; Fri, 19 Mar 2021 20:01:52 +0000 (GMT) Received: from localhost ([::1]:59088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNLJf-00084S-8a for patchwork@mira.cbaines.net; Fri, 19 Mar 2021 16:01:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNLIu-00083q-0F for guix-patches@gnu.org; Fri, 19 Mar 2021 16:01:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNLIs-0004u6-M1 for guix-patches@gnu.org; Fri, 19 Mar 2021 16:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lNLIs-0003Vk-LK for guix-patches@gnu.org; Fri, 19 Mar 2021 16:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47268] [PATCH v2 1/1] gnu: Add apostrophe. Resent-From: =?utf-8?q?L=C3=A9o?= Le Bouter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Mar 2021 20:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47268 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47268@debbugs.gnu.org Cc: =?utf-8?q?L=C3=A9o?= Le Bouter , Leo Prikler Received: via spool by 47268-submit@debbugs.gnu.org id=B47268.161618401213417 (code B ref 47268); Fri, 19 Mar 2021 20:01:02 +0000 Received: (at 47268) by debbugs.gnu.org; 19 Mar 2021 20:00:12 +0000 Received: from localhost ([127.0.0.1]:51040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNLI3-0003UL-M9 for submit@debbugs.gnu.org; Fri, 19 Mar 2021 16:00:11 -0400 Received: from mail.zaclys.net ([178.33.93.72]:36155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNLI0-0003Sp-54 for 47268@debbugs.gnu.org; Fri, 19 Mar 2021 16:00:08 -0400 Received: from localhost.localdomain (lsl43-1_migr-78-195-19-20.fbx.proxad.net [78.195.19.20] (may be forged)) (authenticated bits=0) by mail.zaclys.net (8.14.7/8.14.7) with ESMTP id 12JJwsip018240 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Fri, 19 Mar 2021 21:00:01 +0100 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.zaclys.net 12JJwsip018240 Authentication-Results: mail.zaclys.net; dmarc=fail (p=reject dis=none) header.from=zaclys.net Authentication-Results: mail.zaclys.net; spf=fail smtp.mailfrom=lle-bout@zaclys.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zaclys.net; s=default; t=1616184001; bh=rAPu56QRGvnTrvBLBR+aTjrBOaHYrEh0RvtpLYEhRbc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ev8gibtyIcwarCW+BL1W72gM8xJdT+Mn0YmGpXibkL6IER2J/eXo/LQG3GJJxZ7O5 XaTRCK9zfBegmI8DqpgQjWbHbHiGwZgSox3V9R2UbIGLVUX3oqd9KIA4y9f303S4p2 Fb2G5vwoUYGpkOS/wiZN/H9WjeZeySzw/npICRbA= Date: Fri, 19 Mar 2021 20:58:49 +0100 Message-Id: <20210319195849.19486-2-lle-bout@zaclys.net> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210319195849.19486-1-lle-bout@zaclys.net> References: <20210319195849.19486-1-lle-bout@zaclys.net> 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" Reply-to: =?utf-8?q?L=C3=A9o?= Le Bouter X-ACL-Warn: , =?utf-8?q?L=C3=A9o?= Le Bouter via Guix-patches X-Patchwork-Original-From: =?utf-8?q?L=C3=A9o?= Le Bouter via Guix-patches via From: =?utf-8?q?L=C3=A9o_Le_Bouter?= X-getmail-retrieved-from-mailbox: Patches From: Leo Prikler * gnu/packages/gnome.scm (apostrophe): New variable. Co-authored-by: Léo Le Bouter --- gnu/packages/gnome.scm | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 34cd0fa992..4153c3614c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -125,12 +125,14 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages ibus) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages inkscape) #:use-module (gnu packages iso-codes) + #:use-module (gnu packages javascript) #:use-module (gnu packages kerberos) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libffi) @@ -11569,6 +11571,72 @@ and toolbars.") GTK+. It integrates well with the GNOME desktop environment.") (license license:gpl3+))) +(define-public apostrophe + (package + (name "apostrophe") + (version "2.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/somas/apostrophe") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-meson + (lambda _ + (substitute* "build-aux/meson_post_install.py" + (("gtk-update-icon-cache") "true")) + #t)) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/apostrophe")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) + `("PATH" ":" + prefix (,(string-append (assoc-ref inputs "pandoc") + "/bin")))) + #t)))))) + (inputs + `(("glib" ,glib) + ("gobject-introspection" ,gobject-introspection) + ("gspell" ,gspell) + ("gtk+" ,gtk+) + ("libhandy" ,libhandy) + ("pandoc" ,pandoc) + ("python-chardet" ,python-chardet) + ("python-levenshtein" ,python-levenshtein) + ("python-regex" ,python-regex) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("python-pyenchant" ,python-pyenchant) + ("python-pypandoc" ,python-pypandoc) + ("webkitgtk" ,webkitgtk) + ("js-mathjax" ,js-mathjax))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (home-page "https://gitlab.gnome.org/somas/apostrophe") + (synopsis "Markdown editor written in Python with GTK+") + (description "Apostrophe is a GTK+ based distraction free Markdown editor. +It uses pandoc as back-end for parsing Markdown.") + (license (list license:gpl3 + license:expat)))) + (define-public libratbag (package (name "libratbag")