me
/
guix
Archived
1
0
Fork 0

gnu: xournalpp: Update to 1.1.0.

* gnu/packages/pdf.scm (xournalpp): Update to 1.1.0.
master
Nicolas Goaziou 2021-07-26 10:42:44 +02:00
parent 4831f4e8c9
commit 69ce8f3ce1
No known key found for this signature in database
GPG Key ID: DA00B4F048E92F2D
1 changed files with 10 additions and 9 deletions

View File

@ -78,6 +78,7 @@
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lua) #:use-module (gnu packages lua)
#:use-module (gnu packages man)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages photo) #:use-module (gnu packages photo)
@ -897,7 +898,7 @@ using a stylus.")
(define-public xournalpp (define-public xournalpp
(package (package
(name "xournalpp") (name "xournalpp")
(version "1.0.20") (version "1.1.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -906,7 +907,7 @@ using a stylus.")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1c7n03xm3m4lwcwxgplkn25i8c6s3i7rijbkcx86br1j4jadcs3k")))) (base32 "0ldf58l5sqy52x5dqfpdjdh7ldjilj9mw42jzsl5paxg0md2k0hl"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DENABLE_CPPUNIT=ON") ;enable tests `(#:configure-flags (list "-DENABLE_CPPUNIT=ON") ;enable tests
@ -920,31 +921,31 @@ using a stylus.")
(add-after 'unpack 'fix-permissions-on-po-files (add-after 'unpack 'fix-permissions-on-po-files
(lambda _ (lambda _
;; Make sure 'msgmerge' can modify the PO files. ;; Make sure 'msgmerge' can modify the PO files.
(for-each (lambda (po) (chmod po #o666)) (for-each make-file-writable
(find-files "." "\\.po$")) (find-files "." "\\.po$"))))
#t))
;; Fix path to addr2line utility, which the crash reporter uses. ;; Fix path to addr2line utility, which the crash reporter uses.
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/util/Stacktrace.cpp" (substitute* "src/util/Stacktrace.cpp"
;; Match only the commandline. ;; Match only the commandline.
(("\"addr2line ") (("\"addr2line ")
(string-append "\"" (which "addr2line") " "))) (string-append "\"" (which "addr2line") " ")))))
#t))
(add-after 'install 'glib-or-gtk-wrap (add-after 'install 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(native-inputs (native-inputs
`(("cppunit" ,cppunit) `(("cppunit" ,cppunit)
("gcc" ,gcc-8)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("help2man" ,help2man)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("glib" ,glib)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("librsvg" ,librsvg)
("libsndfile" ,libsndfile) ("libsndfile" ,libsndfile)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libzip" ,libzip) ("libzip" ,libzip)
("lua" ,lua) ;FIXME: It cannot find the Lua library. ("lua" ,lua)
("poppler" ,poppler) ("poppler" ,poppler)
("portaudio" ,portaudio) ("portaudio" ,portaudio)
("texlive-bin" ,texlive-bin))) ("texlive-bin" ,texlive-bin)))