04/09: gnu: bear: Update to 3.0.17.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit de01d08bdfca8533285da16941bfcade49a7070d
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Dec 19 00:22:19 2021 +0100

    gnu: bear: Update to 3.0.17.
    
    * gnu/packages/build-tools.scm (bear): Update to 3.0.17.
    [source]: Remove patch, and…
    [arguments]: …replace it with a new 'disable-TEST_BEFORE_INSTALL phase.
    Don't explicitly return #t from other phases.
    * gnu/packages/patches/bear-disable-preinstall-tests.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/build-tools.scm                       | 32 ++++++++++++----------
 .../patches/bear-disable-preinstall-tests.patch    | 26 ------------------
 3 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6ef4278..0bae6ff 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -885,7 +885,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/bazaar-CVE-2017-14176.patch             \
   %D%/packages/patches/bc-fix-cross-compilation.patch          \
   %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch          \
-  %D%/packages/patches/bear-disable-preinstall-tests.patch     \
   %D%/packages/patches/bind-re-add-attr-constructor-priority.patch     \
   %D%/packages/patches/brightnessctl-elogind-support.patch     \
   %D%/packages/patches/bsd-games-2.17-64bit.patch              \
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index d36f7d6..eb6c32d 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Corentin Bocquillon <corentin@nybble.fr>
-;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com>
 ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
 ;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
@@ -102,25 +102,27 @@ makes a few sacrifices to acquire fast full and 
incremental build times.")
 (define-public bear
   (package
     (name "bear")
-    (version "3.0.16")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/rizsotto/Bear";)
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (patches (search-patches
-                        "bear-disable-preinstall-tests.patch"))
-              (sha256
-               (base32
-                "01giv11nhjp4pvw8ssf8bxf503pabwnwnvfzmrxyxixnairwmykg"))))
+    (version "3.0.17")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rizsotto/Bear";)
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0klbk99qphibrp2944w8gn6x1dwwgrbm7f2bh530wjp5h3bpkr45"))))
     (build-system cmake-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'disable-TEST_BEFORE_INSTALL
+                    (lambda _
+                      (substitute* "CMakeLists.txt"
+                        ;; Delete the matching line—and comment out the next.
+                        ((".*TEST_(BEFORE_INSTALL|COMMAND).*") "#"))))
                   (add-before 'check 'set-build-environment
                     (lambda _
-                      (setenv "CC" "gcc")
-                      #t))
+                      (setenv "CC" "gcc")))
                   ;; TODO: Test Configuration is Incomplete
                   (replace 'check
                     (lambda _
diff --git a/gnu/packages/patches/bear-disable-preinstall-tests.patch 
b/gnu/packages/patches/bear-disable-preinstall-tests.patch
deleted file mode 100644
index ffb31c2..0000000
--- a/gnu/packages/patches/bear-disable-preinstall-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,10 +60,6 @@ ExternalProject_Add(BearSource
-             -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-             -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS}
-             -DENABLE_FUNC_TESTS:BOOL=${ENABLE_FUNC_TESTS}
--        TEST_BEFORE_INSTALL
--            1
--        TEST_COMMAND
--            ctest # or `ctest -T memcheck`
-         )
- 
- # Run the functional tests
-@@ -77,12 +73,8 @@ if (ENABLE_FUNC_TESTS)
-                 -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
-                 -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
-                 -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}
--            TEST_BEFORE_INSTALL
--                1
-             INSTALL_COMMAND
-                 ""
--            TEST_COMMAND
--                ctest --verbose
-             )
- endif ()
-