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.
This commit is contained in:
		
							parent
							
								
									4de27da44f
								
							
						
					
					
						commit
						df8dd9caed
					
				
					 1 changed files with 8 additions and 5 deletions
				
			
		| 
						 | 
					@ -17,7 +17,7 @@
 | 
				
			||||||
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
 | 
					;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
 | 
				
			||||||
;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au>
 | 
					;;; Copyright © 2019 Ben Sturmfels <ben@sturm.com.au>
 | 
				
			||||||
;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 | 
					;;; Copyright © 2019,2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 | 
				
			||||||
;;; Copyright © 2020-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 | 
					;;; Copyright © 2020-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 | 
				
			||||||
;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
 | 
					;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
 | 
				
			||||||
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 | 
					;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
 | 
				
			||||||
;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 | 
					;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 | 
				
			||||||
| 
						 | 
					@ -999,7 +999,7 @@ using a stylus.")
 | 
				
			||||||
(define-public xournalpp
 | 
					(define-public xournalpp
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "xournalpp")
 | 
					    (name "xournalpp")
 | 
				
			||||||
    (version "1.1.3")
 | 
					    (version "1.2.1")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method git-fetch)
 | 
					       (method git-fetch)
 | 
				
			||||||
| 
						 | 
					@ -1008,11 +1008,11 @@ using a stylus.")
 | 
				
			||||||
             (commit (string-append "v" version))))
 | 
					             (commit (string-append "v" version))))
 | 
				
			||||||
       (file-name (git-file-name name version))
 | 
					       (file-name (git-file-name name version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32 "17qq3clfmiyrcah89h8c5r6pc58xcskm5z1czbasv67bfq7chzhy"))))
 | 
					        (base32 "18slm517yazysvd0ii0gi7kg4hzyf17d86w2bflgfaz9ccclswbn"))))
 | 
				
			||||||
    (build-system cmake-build-system)
 | 
					    (build-system cmake-build-system)
 | 
				
			||||||
    (arguments
 | 
					    (arguments
 | 
				
			||||||
     (list
 | 
					     (list
 | 
				
			||||||
      #:configure-flags #~(list "-DENABLE_CPPUNIT=ON") ;enable tests
 | 
					      #:configure-flags #~(list "-DENABLE_GTEST=ON")
 | 
				
			||||||
      #:imported-modules `((guix build glib-or-gtk-build-system)
 | 
					      #:imported-modules `((guix build glib-or-gtk-build-system)
 | 
				
			||||||
                           ,@%cmake-build-system-modules)
 | 
					                           ,@%cmake-build-system-modules)
 | 
				
			||||||
      #:modules '(((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
 | 
					      #:modules '(((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
 | 
				
			||||||
| 
						 | 
					@ -1029,10 +1029,13 @@ using a stylus.")
 | 
				
			||||||
                 (string-append "\""
 | 
					                 (string-append "\""
 | 
				
			||||||
                                (search-input-file inputs "/bin/addr2line")
 | 
					                                (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
 | 
					          (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
 | 
				
			||||||
     (list cppunit gettext-minimal help2man pkg-config))
 | 
					     (list cppunit gettext-minimal googletest help2man pkg-config))
 | 
				
			||||||
    (inputs
 | 
					    (inputs
 | 
				
			||||||
     (list alsa-lib
 | 
					     (list alsa-lib
 | 
				
			||||||
           gtk+
 | 
					           gtk+
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue