From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:38107) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkhek-0007EU-3E for guix-patches@gnu.org; Tue, 09 Jul 2019 00:23:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkhei-0001qS-56 for guix-patches@gnu.org; Tue, 09 Jul 2019 00:23:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkheg-0001p4-Gj for guix-patches@gnu.org; Tue, 09 Jul 2019 00:23:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkheg-0005uX-CE for guix-patches@gnu.org; Tue, 09 Jul 2019 00:23:02 -0400 Subject: [bug#36559] [PATCH] add rednotebook Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:37951) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkhdv-00073C-Bk for guix-patches@gnu.org; Tue, 09 Jul 2019 00:22:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkhdt-0001OO-SQ for guix-patches@gnu.org; Tue, 09 Jul 2019 00:22:15 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:36750) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkhdt-0001Ne-B7 for guix-patches@gnu.org; Tue, 09 Jul 2019 00:22:13 -0400 Received: by mail-pf1-x432.google.com with SMTP id r7so8634788pfl.3 for ; Mon, 08 Jul 2019 21:22:13 -0700 (PDT) Received: from localhost ([199.68.53.171]) by smtp.gmail.com with ESMTPSA id s11sm19483942pgv.13.2019.07.08.21.22.10 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 21:22:10 -0700 (PDT) Date: Mon, 8 Jul 2019 22:22:08 -0600 From: Jesse Gibbons Message-ID: <20190708222208.71c9d614@gmail.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/TEpKi2cHUMqGuf.NPAIvvbs" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36559@debbugs.gnu.org --MP_/TEpKi2cHUMqGuf.NPAIvvbs Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Patch is attached. As explained in the comment I had to correct a few problems: 1. Tests always fail, but (in my experience) the final application is stable. 2. rednotebook uses the GI_TYPELIB_PATH and LD_LIBRARY_PATH to find webkitgtk. Furthermore: - The commit message was killed/yanked from commit 072e986ec808690db991e018d6ceee868b5b5f4a and adjusted. - I made gnu/packages/journal.scm to add other similar journal/diary applications. Because I do not like naming sources for the only package defined within, especially when the package is simple, I recommend moving the jrnl package definition to it. Say the word and I will produce the patch to do this. Perhaps we should discuss the idea of organizing packages by function on the devel mailing list? - I also plan to define a package for other journal applications (like those listed between rednotebook and jrnl at and any other recommendations). Knowing I am likely to err, I expect you (whoever reviews this patch) to point out everything you don't like so I can fix it before you approve and commit to savannah ;) Thanks, -Jesse --MP_/TEpKi2cHUMqGuf.NPAIvvbs Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-Add-rednotebook.patch =46rom 0d93f764f3eefd248966bd3efaddc3e4c09b3cf6 Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Mon, 8 Jul 2019 21:31:31 -0600 Subject: [PATCH] gnu: Add rednotebook * gnu/packages/journal.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/journal.scm | 84 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 gnu/packages/journal.scm diff --git a/gnu/local.mk b/gnu/local.mk index 7dcac4f2bc..97f8d76e0a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -263,6 +263,7 @@ GNU_SYSTEM_MODULES =3D \ %D%/packages/jemalloc.scm \ %D%/packages/jrnl.scm \ %D%/packages/jose.scm \ + %D%/packages/journal.scm \ %D%/packages/julia.scm \ %D%/packages/kawa.scm \ %D%/packages/kde.scm \ diff --git a/gnu/packages/journal.scm b/gnu/packages/journal.scm new file mode 100644 index 0000000000..53fab9e591 --- /dev/null +++ b/gnu/packages/journal.scm @@ -0,0 +1,84 @@ +n;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2019 Jesse Gibbons +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages journal) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system python) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages python) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) + #:use-module (gnu packages webkit) + #:use-module (gnu packages python-xyz)) +(define-public rednotebook + (package + (name "rednotebook") + (version "2.11.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/jendrikseipp/rednotebook/archive/v" + version + ".tar.gz")) + (sha256 + (base32 + "15n1ziypfj3lzpvhha7r637zrb259l9yrcsvkic9cg5mndiaivs3")))) + (build-system python-build-system) + (arguments + ;;Tests fail to find the "_" function. + ;;It should be defined in rednotebook/info.py if '_' is not a member = of 'builtins'. + ;;It is either not defined or not exported during the check phase. + ;;The program does not have this problem after it is installed. + ;;TODO: Fix tests. + `(#:tests? #f + #:imported-modules ((guix build glib-or-gtk-build-system) + ,@%python-build-system-modules) + #:modules ((ice-9 match) + (guix build python-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-= gtk:) + (guix build utils)) + #:phases + (modify-phases %standard-phases + ;;Make sure rednotebook can find the typelibs and webkitgtk share= d libraries. + (add-before 'wrap 'wrap-with-library-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (webkitgtk-path (string-append + (assoc-ref inputs "webkitgtk") + "/lib"))) + (wrap-program (string-append out "/bin/rednotebook") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) + `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))) + #t)))))) + (inputs + `(("python" ,python-3) + ("python-pygobject" ,python-pygobject) + ("gtk+" ,gtk+) + ("gtksourceview" ,gtksourceview-3) + ("webkitgtk" ,webkitgtk) + ("python-pyyaml" ,python-pyyaml))) + (home-page "https://www.rednotebook.app") + (synopsis "journal") + (description + "RedNotebook is a modern desktop journal. It lets you format, tag and= search +your entries. You can also add pictures, links and customizable templates,= spell +check your notes, and export to plain text, HTML, Latex or PDF.") + (license license:gpl2+))) --=20 2.22.0 --MP_/TEpKi2cHUMqGuf.NPAIvvbs--