* [bug#38767] [PATCH] Add Xournal++
@ 2019-12-27 23:27 Nicolas Goaziou
2020-02-08 19:59 ` Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Goaziou @ 2019-12-27 23:27 UTC (permalink / raw)
To: 38767
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
Hello,
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.
Feedback welcome.
Regards,
--
Nicolas Goaziou
[-- Attachment #2: Add Xournal++ --]
[-- Type: text/x-diff, Size: 5294 bytes --]
From 83ff0917427a13739ec2c65add1f1361c8406ff4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
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 | 83 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index ebe0168ff2..799e977a36 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; 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))
@@ -752,6 +758,83 @@ program capable of converting PDF into other formats.")
using a stylus.")
(license license:gpl2+)))
+(define-public xournalpp
+ (package
+ (name "xournalpp")
+ (version "1.0.16")
+ (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 "1bdmxxkcqpjvkckizmrz2839b4yspw4xv69bqkrrgkcyvxsr804w"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags (list "-DENABLE_CPPUNIT=ON") ;enable tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'fix-permissions-on-po-files
+ ;; Make sure 'msgmerge' can modify the PO files.
+ (lambda _
+ (for-each (lambda (po) (chmod po #o666))
+ (find-files "." "\\.po$"))
+ #t)))))
+ (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)
+ ;; FIXME: It cannot find the Lua library.
+ ("lua" ,lua)
+ ("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")
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#38767] [PATCH] Add Xournal++
2019-12-27 23:27 [bug#38767] [PATCH] Add Xournal++ Nicolas Goaziou
@ 2020-02-08 19:59 ` Nicolas Goaziou
2020-02-09 9:52 ` Christopher Baines
0 siblings, 1 reply; 4+ messages in thread
From: Nicolas Goaziou @ 2020-02-08 19:59 UTC (permalink / raw)
To: 38767
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
Nicolas Goaziou <mail@nicolasgoaziou.fr> 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.
[-- Attachment #2: 0001-gnu-Add-xournalpp.patch --]
[-- Type: text/x-diff, Size: 6027 bytes --]
From 2bf2def9d291492e393512bf463b9f3cd4bf20e4 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
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 © 2019 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;;
;;; 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))
@@ -752,6 +758,94 @@ program capable of converting PDF into other formats.")
using a stylus.")
(license license:gpl2+)))
+(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=ON") ;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 library.
+ ("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")
--
2.25.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#38767] [PATCH] Add Xournal++
2020-02-08 19:59 ` Nicolas Goaziou
@ 2020-02-09 9:52 ` Christopher Baines
2020-02-09 16:37 ` bug#38767: " Nicolas Goaziou
0 siblings, 1 reply; 4+ messages in thread
From: Christopher Baines @ 2020-02-09 9:52 UTC (permalink / raw)
To: mail; +Cc: 38767
[-- Attachment #1: Type: text/plain, Size: 652 bytes --]
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> Nicolas Goaziou <mail@nicolasgoaziou.fr> 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.
Maybe start the synopsis with a capital letter (so "Handwriting
notetaking ..."), but apart from that this looks good to me :)
Thanks,
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#38767: [PATCH] Add Xournal++
2020-02-09 9:52 ` Christopher Baines
@ 2020-02-09 16:37 ` Nicolas Goaziou
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2020-02-09 16:37 UTC (permalink / raw)
To: Christopher Baines; +Cc: 38767-done
Hello,
Christopher Baines <mail@cbaines.net> writes:
> Maybe start the synopsis with a capital letter (so "Handwriting
> notetaking ..."), but apart from that this looks good to me :)
Indeed, fixed.
Applied as ebbd30ff399e1194dafbf7f1c58dd07272f18624.
Thank you for the feedback.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-09 16:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-27 23:27 [bug#38767] [PATCH] Add Xournal++ Nicolas Goaziou
2020-02-08 19:59 ` Nicolas Goaziou
2020-02-09 9:52 ` Christopher Baines
2020-02-09 16:37 ` bug#38767: " Nicolas Goaziou
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.