diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
| commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
| tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /gnu/packages/pdf.scm | |
| parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
| parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
Merge branch 'master' into core-updates-frozen
Conflicts:
gnu/packages/bioinformatics.scm
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/emacs-xyz.scm
gnu/packages/gpodder.scm
gnu/packages/music.scm
gnu/packages/patches/glibc-bootstrap-system.patch
gnu/packages/python-xyz.scm
gnu/packages/shells.scm
gnu/packages/statistics.scm
Diffstat (limited to 'gnu/packages/pdf.scm')
| -rw-r--r-- | gnu/packages/pdf.scm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index a447e24af0..d0ccb4ebce 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages man) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages photo) @@ -898,7 +899,7 @@ using a stylus.") (define-public xournalpp (package (name "xournalpp") - (version "1.0.20") + (version "1.1.0") (source (origin (method git-fetch) @@ -907,7 +908,7 @@ using a stylus.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1c7n03xm3m4lwcwxgplkn25i8c6s3i7rijbkcx86br1j4jadcs3k")))) + (base32 "0ldf58l5sqy52x5dqfpdjdh7ldjilj9mw42jzsl5paxg0md2k0hl")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DENABLE_CPPUNIT=ON") ;enable tests @@ -921,31 +922,31 @@ using a stylus.") (add-after 'unpack 'fix-permissions-on-po-files (lambda _ ;; Make sure 'msgmerge' can modify the PO files. - (for-each (lambda (po) (chmod po #o666)) - (find-files "." "\\.po$")) - #t)) + (for-each make-file-writable + (find-files "." "\\.po$")))) ;; Fix path to addr2line utility, which the crash reporter uses. (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/util/Stacktrace.cpp" ;; Match only the commandline. (("\"addr2line ") - (string-append "\"" (which "addr2line") " "))) - #t)) + (string-append "\"" (which "addr2line") " "))))) (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) ("gettext" ,gettext-minimal) + ("help2man" ,help2man) ("pkg-config" ,pkg-config))) (inputs `(("alsa-lib" ,alsa-lib) - ("glib" ,glib) ("gtk+" ,gtk+) + ("librsvg" ,librsvg) ("libsndfile" ,libsndfile) ("libxml2" ,libxml2) ("libzip" ,libzip) - ("lua" ,lua) ;FIXME: It cannot find the Lua library. + ("lua" ,lua) ("poppler" ,poppler) ("portaudio" ,portaudio) ("texlive-bin" ,texlive-bin))) |