From: Marius Bakke <mbakke@fastmail.com>
To: 32953@debbugs.gnu.org
Subject: [bug#32953] [PATCH core-updates-next 8/8] gnu: cppunit: Update to 1.14.0.
Date: Sat, 6 Oct 2018 15:16:39 +0200 [thread overview]
Message-ID: <20181006131639.8424-8-mbakke@fastmail.com> (raw)
In-Reply-To: <20181006131639.8424-1-mbakke@fastmail.com>
* 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 1373f1786..9ba85045f 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -124,14 +124,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
@@ -146,23 +146,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 18edfcd35..4a1d3187a 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -951,7 +951,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(build-system gnu-build-system)
(native-inputs
`(("bison" ,bison)
- ("cppunit" ,cppunit-1.14)
+ ("cppunit" ,cppunit)
("flex" ,flex)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
--
2.19.0
next prev parent reply other threads:[~2018-10-06 13:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-06 13:14 [bug#32953] [PATCH core-updates-next 0/8] Use GCC7 as the default compiler Marius Bakke
2018-10-06 13:16 ` [bug#32953] [PATCH core-updates-next 1/8] gnu: Remove gcc-for-libstdc++ Marius Bakke
2018-10-06 13:16 ` [bug#32953] [PATCH core-updates-next 2/8] gnu: libstdc++-boot0: Improve gcc-wrapper workaround Marius Bakke
2018-10-11 8:08 ` Danny Milosavljevic
2018-10-06 13:16 ` [bug#32953] [PATCH core-updates-next 3/8] gnu: gcc-boot0: Improve gcc-wrapper workarounds Marius Bakke
2018-10-11 8:08 ` Danny Milosavljevic
2018-10-06 13:16 ` [bug#32953] [PATCH core-updates-next 4/8] gnu: Remove duplicate linux-libre-headers package from bootstrap inputs Marius Bakke
2018-10-11 8:09 ` Danny Milosavljevic
2018-10-06 13:16 ` [bug#32953] [PATCH core-updates-next 5/8] gnu: Use GCC 7 as the default compiler Marius Bakke
2018-10-11 8:05 ` Danny Milosavljevic
2018-10-06 13:16 ` [bug#32953] [PATCH core-updates-next 6/8] gnu: python: Fix FTBFS with GCC >= 6 Marius Bakke
2018-10-06 13:16 ` [bug#32953] [PATCH core-updates-next 7/8] gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries Marius Bakke
2018-10-11 8:06 ` Danny Milosavljevic
2018-10-06 13:16 ` Marius Bakke [this message]
2018-10-11 8:17 ` [bug#32953] [PATCH core-updates-next 8/8] gnu: cppunit: Update to 1.14.0 Danny Milosavljevic
2018-10-06 17:00 ` [bug#32953] [PATCH core-updates-next 0/8] Use GCC7 as the default compiler Marius Bakke
2018-12-27 10:59 ` Ludovic Courtès
2018-12-29 17:58 ` Efraim Flashner
2019-01-16 13:53 ` Marius Bakke
2019-01-19 17:09 ` Efraim Flashner
2019-01-19 20:01 ` Efraim Flashner
2019-02-06 20:23 ` Marius Bakke
2019-02-06 22:35 ` Ricardo Wurmus
2019-02-06 23:03 ` Marius Bakke
2019-02-08 12:28 ` Ricardo Wurmus
2019-02-09 15:00 ` Ludovic Courtès
2019-02-09 20:57 ` bug#32953: " Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181006131639.8424-8-mbakke@fastmail.com \
--to=mbakke@fastmail.com \
--cc=32953@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).