From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8mSB-0006K6-Sn for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8mS9-0002Ay-NU for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34142) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g8mS9-0002Am-Hk for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g8mS9-0002s9-Ci for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:05 -0400 Subject: [bug#32953] [PATCH core-updates-next 8/8] gnu: cppunit: Update to 1.14.0. Resent-Message-ID: From: Marius Bakke Date: Sat, 6 Oct 2018 15:16:39 +0200 Message-Id: <20181006131639.8424-8-mbakke@fastmail.com> In-Reply-To: <20181006131639.8424-1-mbakke@fastmail.com> References: <20181006131639.8424-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32953@debbugs.gnu.org * 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