From 69ce8f3ce14ff2e8094cce16d03df748dd68f11f Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Mon, 26 Jul 2021 10:42:44 +0200
Subject: gnu: xournalpp: Update to 1.1.0.

* gnu/packages/pdf.scm (xournalpp): Update to 1.1.0.
---
 gnu/packages/pdf.scm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'gnu/packages/pdf.scm')

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 4d1b8cddfe..d6e87c0923 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)
@@ -897,7 +898,7 @@ using a stylus.")
 (define-public xournalpp
   (package
     (name "xournalpp")
-    (version "1.0.20")
+    (version "1.1.0")
     (source
      (origin
        (method git-fetch)
@@ -906,7 +907,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
@@ -920,31 +921,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)))
-- 
cgit v1.2.3