From df8dd9caedc894be74e6c3ed8dcb79c8fde774de Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 11 Oct 2023 15:07:51 +0200 Subject: [PATCH] gnu: xournalpp: Update to 1.2.1. * gnu/packages/pdf.scm (xournalpp): Update to 1.2.1. [arguments]<#:configure-flags>: Replace "ENABLE_CPPUNIT" with "ENABLE_GTEST". <#:phases>: Add a phase to build test files. [native-inputs]: Add GOOGLETEST. --- gnu/packages/pdf.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 029eafc010..d561f73dbd 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Ben Sturmfels ;;; Copyright © 2019,2020 Hartmut Goebel -;;; Copyright © 2020-2022 Nicolas Goaziou +;;; Copyright © 2020-2023 Nicolas Goaziou ;;; Copyright © 2020, 2022 Michael Rohleder ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer @@ -999,7 +999,7 @@ (define-public xournal (define-public xournalpp (package (name "xournalpp") - (version "1.1.3") + (version "1.2.1") (source (origin (method git-fetch) @@ -1008,11 +1008,11 @@ (define-public xournalpp (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "17qq3clfmiyrcah89h8c5r6pc58xcskm5z1czbasv67bfq7chzhy")))) + (base32 "18slm517yazysvd0ii0gi7kg4hzyf17d86w2bflgfaz9ccclswbn")))) (build-system cmake-build-system) (arguments (list - #:configure-flags #~(list "-DENABLE_CPPUNIT=ON") ;enable tests + #:configure-flags #~(list "-DENABLE_GTEST=ON") #: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:) @@ -1029,10 +1029,13 @@ (define-public xournalpp (string-append "\"" (search-input-file inputs "/bin/addr2line") " "))))) + (add-after 'build 'prepare-tests + (lambda _ + (invoke "cmake" "--build" "." "--target" "test-units"))) (add-after 'install 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (native-inputs - (list cppunit gettext-minimal help2man pkg-config)) + (list cppunit gettext-minimal googletest help2man pkg-config)) (inputs (list alsa-lib gtk+