me/guix
Archived
1
0
Fork 0
Code Activity

gnu: cppunit: Update to 1.14.0.

Browse source 
* gnu/packages/check.scm (cppunit): Update to 1.14.0.
(cppunit-1.14): Remove variable.
* gnu/packages/libreoffice.scm (libreoffice)[inputs]: Change CPPUNIT-1.14 to CPPUNIT.
This commit is contained in:
Marius Bakke 2018-10-06 14:50:02 +02:00
parent 546bee4002
commit 7f81f8bccc
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 3 additions and 20 deletions

21
gnu/packages/check.scm
View file

@ -132,14 +132,14 @@ with a flexible variety of user interfaces.")
(define-public cppunit (define-public cppunit
(package (package
(name "cppunit") (name "cppunit")
(version "1.13.2") (version "1.14.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/" (uri (string-append "http://dev-www.libreoffice.org/src/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"17s2kzmkw3kfjhpp72rfppyd7syr7bdq5s69syj2nvrlwd3d4irz")))) "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"))))
;; Explicitly link with libdl. This is expected to be done by packages ;; Explicitly link with libdl. This is expected to be done by packages
;; relying on cppunit for their tests. However, not all of them do. ;; relying on cppunit for their tests. However, not all of them do.
;; If we added the linker flag to such packages, we would pollute all ;; If we added the linker flag to such packages, we would pollute all
@ -154,23 +154,6 @@ unit testing. Test output is in XML for automatic testing and GUI based for
supervised tests.") supervised tests.")
(license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball (license license:lgpl2.1))) ; no copyright notices. LGPL2.1 is in the tarball
;; Some packages require this newer version of cppunit. However, it needs
;; C++11 support, which is not enabled by default in our current GCC, and
;; updating in-place would require adding CXXFLAGS to many dependent packages.
;; Thus, keep as a separate variable for now.
;; TODO: Remove this when our default GCC is updated to 6 or higher.
(define-public cppunit-1.14
(package
(inherit cppunit)
(version "1.14.0")
(source (origin
(method url-fetch)
(uri (string-append "https://dev-www.libreoffice.org/src/"
"cppunit-" version ".tar.gz"))
(sha256
(base32
"1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"))))))
;; When dependent packages upgraded to use newer version of catch, this one should ;; When dependent packages upgraded to use newer version of catch, this one should
;; be removed. ;; be removed.
(define-public catch-framework (define-public catch-framework

2
gnu/packages/libreoffice.scm
View file

@ -1011,7 +1011,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("cppunit" ,cppunit-1.14) ("cppunit" ,cppunit)
("flex" ,flex) ("flex" ,flex)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-wrapper) ("python" ,python-wrapper)