summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2026-02-08 22:30:29 +0100
committerDanny Milosavljevic <dannym@friendly-machines.com>2026-02-08 23:38:24 +0100
commitdaca67c56004bcf2fc7abb038384e2f97215f265 (patch)
treed44c288b7ac534209a8bc002af5f937b946cacf9
parent516a9fabc80d5459148d704abe285d44ab7b176b (diff)
gnu: xournalpp: Update to 1.3.2.
* gnu/packages/pdf.scm (xournalpp): Update to 1.3.2. [arguments]: Skip tests. [native-inputs]: Add ninja. [inputs]: Add qpdf. Change-Id: I10132c9725068aea1349b3e38ae40150e072f532 Signed-off-by: Danny Milosavljevic <dannym@friendly-machines.com>
-rw-r--r--gnu/packages/pdf.scm31
1 files changed, 23 insertions, 8 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 34147c69b06..63af78ec26c 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -17,7 +17,7 @@
17;;; Copyright © 2019 Alex Griffin <a@ajgrf.com> 17;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
18;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au> 18;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au>
19;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com> 19;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
20;;; Copyright © 2020-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr> 20;;; Copyright © 2020-2026 Nicolas Goaziou <mail@nicolasgoaziou.fr>
21;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de> 21;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
22;;; Copyright © 2020, 2024 Timotej Lazar <timotej.lazar@araneo.si> 22;;; Copyright © 2020, 2024 Timotej Lazar <timotej.lazar@araneo.si>
23;;; Copyright © 2020, 2022, 2023, 2024, 2025 Maxim Cournoyer <maxim@guixotic.coop> 23;;; Copyright © 2020, 2022, 2023, 2024, 2025 Maxim Cournoyer <maxim@guixotic.coop>
@@ -98,6 +98,7 @@
98 #:use-module (gnu packages lua) 98 #:use-module (gnu packages lua)
99 #:use-module (gnu packages man) 99 #:use-module (gnu packages man)
100 #:use-module (gnu packages markup) 100 #:use-module (gnu packages markup)
101 #:use-module (gnu packages ninja)
101 #:use-module (gnu packages nss) 102 #:use-module (gnu packages nss)
102 #:use-module (gnu packages ocaml) 103 #:use-module (gnu packages ocaml)
103 #:use-module (gnu packages ocr) 104 #:use-module (gnu packages ocr)
@@ -1344,7 +1345,7 @@ using a stylus.")
1344(define-public xournalpp 1345(define-public xournalpp
1345 (package 1346 (package
1346 (name "xournalpp") 1347 (name "xournalpp")
1347 (version "1.2.8") 1348 (version "1.3.2")
1348 (source 1349 (source
1349 (origin 1350 (origin
1350 (method git-fetch) 1351 (method git-fetch)
@@ -1353,11 +1354,17 @@ using a stylus.")
1353 (commit (string-append "v" version)))) 1354 (commit (string-append "v" version))))
1354 (file-name (git-file-name name version)) 1355 (file-name (git-file-name name version))
1355 (sha256 1356 (sha256
1356 (base32 "134qmx6nvxfpfbx3sb6ss0vc5jcxlhysk699aaklpid03p8ps0y9")))) 1357 (base32 "1bw6w7k0vz41ijr73vxg2ccv5cs2wh6asx7m0hhnx56hdkzwpp39"))))
1357 (build-system cmake-build-system) 1358 (build-system cmake-build-system)
1358 (arguments 1359 (arguments
1359 (list 1360 (list
1360 #:configure-flags #~(list "-DENABLE_GTEST=ON") 1361 #:generator "Ninja"
1362 ;; FIXME: Building the tests fails if DOWNLOAD_GTEST is off. Ignore
1363 ;; them for now.
1364 #:tests? #false
1365 #:configure-flags
1366 #~(list "-DENABLE_GTEST=ON"
1367 "-DENABLE_CPPTRACE=OFF") ;require unpackaged "cpp-trace"
1361 #:imported-modules `((guix build glib-or-gtk-build-system) 1368 #:imported-modules `((guix build glib-or-gtk-build-system)
1362 ,@%cmake-build-system-modules) 1369 ,@%cmake-build-system-modules)
1363 #:modules '(((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) 1370 #:modules '(((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
@@ -1375,8 +1382,9 @@ using a stylus.")
1375 (search-input-file inputs "/bin/addr2line") 1382 (search-input-file inputs "/bin/addr2line")
1376 " "))))) 1383 " ")))))
1377 (add-after 'build 'prepare-tests 1384 (add-after 'build 'prepare-tests
1378 (lambda _ 1385 (lambda* (#:key tests? #:allow-other-keys)
1379 (invoke "cmake" "--build" "." "--target" "test-units"))) 1386 (when tests?
1387 (invoke "cmake" "--build" "." "--target" "test-units"))))
1380 (add-after 'install 'glib-or-gtk-wrap 1388 (add-after 'install 'glib-or-gtk-wrap
1381 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) 1389 (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
1382 (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file 1390 (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
@@ -1389,7 +1397,13 @@ using a stylus.")
1389 (wrap-program (string-append #$output "/bin/xournalpp") 1397 (wrap-program (string-append #$output "/bin/xournalpp")
1390 `("GDK_PIXBUF_MODULE_FILE" = (,pixbuf-module-file))))))))) 1398 `("GDK_PIXBUF_MODULE_FILE" = (,pixbuf-module-file)))))))))
1391 (native-inputs 1399 (native-inputs
1392 (list cppunit gettext-minimal googletest help2man pkg-config)) 1400 (list cppunit
1401 gettext-minimal
1402 `(,glib "bin") ;for glib-compile-resources
1403 googletest
1404 help2man
1405 ninja
1406 pkg-config))
1393 (inputs 1407 (inputs
1394 (list adwaita-icon-theme 1408 (list adwaita-icon-theme
1395 alsa-lib 1409 alsa-lib
@@ -1401,7 +1415,8 @@ using a stylus.")
1401 libzip 1415 libzip
1402 lua 1416 lua
1403 poppler 1417 poppler
1404 portaudio)) 1418 portaudio
1419 qpdf))
1405 (home-page "https://github.com/xournalpp/xournalpp") 1420 (home-page "https://github.com/xournalpp/xournalpp")
1406 (synopsis "Handwriting notetaking software with PDF annotation support") 1421 (synopsis "Handwriting notetaking software with PDF annotation support")
1407 (description "Xournal++ is a hand note taking software written in 1422 (description "Xournal++ is a hand note taking software written in