gnu: libfossil: Update to 0.6.0.

* gnu/packages/patches/libfossil-skip-amalgamation.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister patch.
* gnu/packages/version-control.scm (libfossil)[source]: Remove patch.
  Update to 0.6.0.

Change-Id: I3e75eea767c582325fa4a6b62d093a40964cfaeb
Reviewed-by: Thanos Apollo <public@thanosapollo.org>

3 files changed, 4 insertions, 51 deletions

diff --git a/gnu/local.mk b/gnu/local.mk
index 56bc457ca8..361ced31d6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1699,7 +1699,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/libcss-check-format.patch		\
   %D%/packages/patches/libeb-gcc-14.patch			\
   %D%/packages/patches/libextractor-tidy-support.patch		\
-  %D%/packages/patches/libfossil-skip-amalgamation.patch	\
   %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch	\
   %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch	\
   %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch	\
diff --git a/gnu/packages/patches/libfossil-skip-amalgamation.patch b/gnu/packages/patches/libfossil-skip-amalgamation.patch
deleted file mode 100644
index f4d6432ddd..0000000000
--- a/gnu/packages/patches/libfossil-skip-amalgamation.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -265,15 +265,11 @@
- amal.flags     = -nc
- amal.run       = TOPDIR="$(DIR.top)" $(SHELL.bash) $(bin.make-amal) --quiet
- 
- libfossil.c: $(amal.deps)
- 	$(amal.run) $(amal.flags)
--libfossil.h: libfossil.c
--all: libfossil.c
- @if ENABLE_CXX
--libfossil.hpp: libfossil.c
--libfossil.c++: libfossil.c
- amal.flags += -c++
- @endif
- 
- .PHONY: amal
- amal: libfossil.c
-@@ -287,19 +283,16 @@
- 	fossil uv sync
- @endif
- @endif
- 
- install: install-headers
--install-headers: libfossil.h $(install-dir.include)
--	$(INSTALL.noexec) libfossil.h $(install-dir.include)
-+install-headers: include/libfossil.h $(install-dir.include)
-+	$(INSTALL.noexec) $< $(install-dir.include)
- @if ENABLE_CXX
--libfossil++.hpp: libfossil.h
--libfossil++.cpp: libfossil++.hpp
--all: libfossil++.cpp
- install-headers: install-headers++
--install-headers++: libfossil++.hpp $(install-dir.include)
--	$(INSTALL.noexec) libfossil++.hpp $(install-dir.include)
-+install-headers++: include/libfossil.hpp $(install-dir.include)
-+	$(INSTALL.noexec) $< $(install-dir.include)
- @endif # ENABLE_CXX
- clean: clean-amalgamation
- clean-amalgamation:
- 	rm -f libfossil.c libfossil.h libfossil++.cpp libfossil++.hpp
- 	rm -f libfossil-config.h libfossil-amalgamation.zip VERSION.h
-
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 2a669e1795..2ccaefeea7 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3522,21 +3522,18 @@ modification time.")
     (license license:bsd-2)))
 
 (define-public libfossil
-  (let ((ci "914ed6dcaff13bf7209c9f27ccfb77c2d8fdf36b8d2133aa1590258b0708f035")
-        (revision "0"))
     (package
       (name "libfossil")
-      (version (fossil-version "0.6.0" revision ci))
+      (version "0.6.0")
       (source
        (origin
          (method fossil-fetch)
          (uri (fossil-reference
                (uri "https://fossil.wanderinghorse.net/r/libfossil")
-               (check-in ci)))
+               (check-in version)))
          (file-name (fossil-file-name name version))
          (sha256
-          (base32 "0a0ycnnba2izmiqjj8hgvjgjdwhpn0x36lhy3vmw4j7bhny0df52"))
-         (patches (search-patches "libfossil-skip-amalgamation.patch"))
+          (base32 "0haaczpjnjpkiikf0q70nfabm2csdk6dl9rh80j0sh90wfvkyqwm"))
          (modules '((guix build utils)
                     (ice-9 ftw)
                     (srfi srfi-26)))
@@ -3587,7 +3584,7 @@ modification time.")
        "@code{libfossil} is an alternative interface into Fossil repositories,
 as opposed to a replacement for the core fossil application,
 intended for new ways to access and manipulate fossil repositories.")
-      (license license:bsd-2))))
+      (license license:bsd-2)))
 
 (define-public fnc
   (package