From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:57373) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j0WGq-0001NP-Sl for guix-patches@gnu.org; Sat, 08 Feb 2020 15:00:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j0WGp-00017A-B3 for guix-patches@gnu.org; Sat, 08 Feb 2020 15:00:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45887) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j0WGo-00013p-EO for guix-patches@gnu.org; Sat, 08 Feb 2020 15:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j0WGo-0005W0-C4 for guix-patches@gnu.org; Sat, 08 Feb 2020 15:00:02 -0500 Subject: [bug#38767] [PATCH] Add Xournal++ Resent-Message-ID: From: Nicolas Goaziou References: <87woah1h8w.fsf@nicolasgoaziou.fr> Date: Sat, 08 Feb 2020 20:59:33 +0100 In-Reply-To: <87woah1h8w.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Sat, 28 Dec 2019 00:27:43 +0100") Message-ID: <8736bkzw7u.fsf@nicolasgoaziou.fr> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: 38767@debbugs.gnu.org --=-=-= Content-Type: text/plain Nicolas Goaziou writes: > The following patch add Xournal++. There are a few caveats: > > - it requires applying my patch at bug#38765; > > - it cannot find Lua even though "lua" is included in the inputs. > I left a "fixme" about it; > > - it crashes when trying to insert an image. I fixed the crash and updated xournalpp to 1.0.17. The Lua part is still open. I attach the new patch for further feedback. Thank you. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-xournalpp.patch Content-Transfer-Encoding: quoted-printable >From 2bf2def9d291492e393512bf463b9f3cd4bf20e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Dec 2019 22:43:25 +0100 Subject: [PATCH] gnu: Add xournalpp. * gnu/packages/pdf.scm (xournalpp): New variable. --- gnu/packages/pdf.scm | 94 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 368b2ce69e..6bb0402a59 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -17,6 +17,7 @@ ;;; Copyright =C2=A9 2019 Alex Griffin ;;; Copyright =C2=A9 2019 Ben Sturmfels ;;; Copyright =C2=A9 2019 Hartmut Goebel +;;; Copyright =C2=A9 2020 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) @@ -55,6 +57,7 @@ #:use-module (gnu packages djvu) #:use-module (gnu packages fontutils) #:use-module (gnu packages game-development) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -74,6 +77,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-check) #:use-module (gnu packages python-web) @@ -82,8 +86,10 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tex) #:use-module (gnu packages tls) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) =20 @@ -752,6 +758,94 @@ program capable of converting PDF into other formats.") using a stylus.") (license license:gpl2+))) =20 +(define-public xournalpp + (package + (name "xournalpp") + (version "1.0.17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xournalpp/xournalpp.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DENABLE_CPPUNIT=3DON") ;enable tests + #:imported-modules ((guix build glib-or-gtk-build-system) + ,@%cmake-build-system-modules) + #:modules (((guix build glib-or-gtk-build-system) #:prefix glib-or-= gtk:) + (guix build cmake-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-permissions-on-po-files + (lambda _ + ;; Always generate translations. A recent upstream patch + ;; disabled it. + (substitute* "po/CMakeLists.txt" + (("gettext_create_translations \\(\"\\$\\{potfile\\}\"\\)") + "gettext_create_translations (\"${potfile}\" ALL)")) + ;; Make sure 'msgmerge' can modify the PO files. + (for-each (lambda (po) (chmod po #o666)) + (find-files "." "\\.po$")) + #t)) + (add-after 'install 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs + `(("cppunit" ,cppunit) + ("gcc" ,gcc-8) ;requires gcc 8+ + ("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("libsndfile" ,libsndfile) + ("libxml2" ,libxml2) + ("libzip" ,libzip) + ("lua" ,lua) ;FIXME: It cannot find the Lua libr= ary. + ("poppler" ,poppler) + ("portaudio" ,portaudio) + ("texlive-bin" ,texlive-bin))) + (home-page "https://github.com/xournalpp/xournalpp") + (synopsis "handwriting notetaking software with PDF annotation support= ") + (description "Xournal++ is a hand note taking software written in +C++ with the target of flexibility, functionality and speed. Stroke +recognizer and other parts are based on Xournal code. + +Xournal++ features: + +@itemize +@item Support for Pen pressure, e.g., Wacom Tablet +@item Support for annotating PDFs +@item Fill shape functionality +@item PDF Export (with and without paper style) +@item PNG Export (with and without transparent background) +@item Allow to map different tools / colors etc. to stylus buttons / +mouse buttons +@item Sidebar with Page Previews with advanced page sorting, PDF +Bookmarks and Layers (can be individually hidden, editing layer can be +selected) +@item enhanced support for image insertion +@item Eraser with multiple configurations +@item LaTeX support +@item bug reporting, autosave, and auto backup tools +@item Customizeable toolbar, with multiple configurations, e.g., to +optimize toolbar for portrait / landscape +@item Page Template definitions +@item Shape drawing (line, arrow, circle, rectangle) +@item Shape resizing and rotation +@item Rotation snapping every 45 degrees +@item Rect snapping to grid +@item Audio recording and playback alongside with handwritten notes +@item Multi Language Support, Like English, German, Italian... +@item Plugins using LUA Scripting +@end itemize") + (license license:gpl2+))) + (define-public python-reportlab (package (name "python-reportlab") --=20 2.25.0 --=-=-=--