[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/10: gnu: cppunit: Update to 1.14.0.
From: |
guix-commits |
Subject: |
04/10: gnu: cppunit: Update to 1.14.0. |
Date: |
Wed, 16 Jan 2019 08:41:21 -0500 (EST) |
mbakke pushed a commit to branch wip-gcc7
in repository guix.
commit c85b9fe8ed99c9c045dceaa84b18eba42a51e97e
Author: Marius Bakke <address@hidden>
Date: Sat Oct 6 14:50:02 2018 +0200
gnu: cppunit: Update to 1.14.0.
* 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.
---
gnu/packages/check.scm | 21 ++-------------------
gnu/packages/libreoffice.scm | 2 +-
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 5bf849d..41e015a 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -125,14 +125,14 @@ with a flexible variety of user interfaces.")
(define-public cppunit
(package
(name "cppunit")
- (version "1.13.2")
+ (version "1.14.0")
(source (origin
(method url-fetch)
(uri (string-append "http://dev-www.libreoffice.org/src/"
name "-" version ".tar.gz"))
(sha256
(base32
- "17s2kzmkw3kfjhpp72rfppyd7syr7bdq5s69syj2nvrlwd3d4irz"))))
+ "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix"))))
;; Explicitly link with libdl. This is expected to be done by packages
;; 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
@@ -147,23 +147,6 @@ unit testing. Test output is in XML for automatic testing
and GUI based for
supervised tests.")
(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
;; be removed.
(define-public catch-framework
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 45e2f63..c185e86 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -990,7 +990,7 @@ converting QuarkXPress file format. It supports versions
3.1 to 4.1.")
(build-system glib-or-gtk-build-system)
(native-inputs
`(("bison" ,bison)
- ("cppunit" ,cppunit-1.14)
+ ("cppunit" ,cppunit)
("flex" ,flex)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
- branch wip-gcc7 created (now 2e48ea5), guix-commits, 2019/01/16
- 03/10: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries., guix-commits, 2019/01/16
- 04/10: gnu: cppunit: Update to 1.14.0.,
guix-commits <=
- 01/10: gnu: Use GCC 7 as the default compiler., guix-commits, 2019/01/16
- 02/10: gnu: python: Fix FTBFS with GCC >= 6., guix-commits, 2019/01/16
- 06/10: gnu: texlive-bin: Remove explicit C++11 flag., guix-commits, 2019/01/16
- 05/10: gnu: swig: Fix FTBFS with GCC >= 6., guix-commits, 2019/01/16
- 10/10: gnu: inkscape: Fix FTBFS with GCC >= 6., guix-commits, 2019/01/16
- 08/10: gnu: libevdev: Fix FTBFS with GCC7., guix-commits, 2019/01/16
- 09/10: gnu: hyperrogue: Fix FTBFS with GCC7., guix-commits, 2019/01/16
- 07/10: gnu: aspell: Fix FTBFS with GCC7., guix-commits, 2019/01/16