~ruther/guix-local

f69553ba986913049e5fd8672b82f19256eba087 — Janneke Nieuwenhuizen 1 year, 10 months ago c32ee51
gnu: clucene: Fix build with gcc-14.

* gnu/packages/patches/clucene-gcc-14.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/rdf.scm (clucene)[source]: Use it.

Change-Id: Ief8de0cb52480dccdbcc1ac45c33a8767fdd4211
M gnu/local.mk => gnu/local.mk +1 -0
@@ 1141,6 1141,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/classpath-miscompilation.patch		\
  %D%/packages/patches/clitest-grep-compat.patch		\
  %D%/packages/patches/clog-fix-shared-build.patch		\
  %D%/packages/patches/clucene-gcc-14.patch			\
  %D%/packages/patches/clucene-pkgconfig.patch			\
  %D%/packages/patches/cmake-curl-certificates-3.24.patch	\
  %D%/packages/patches/coda-use-system-libs.patch		\

M gnu/packages/bootstrap.scm => gnu/packages/bootstrap.scm +3 -2
@@ 780,8 780,9 @@ $out/bin/guile --version~%"
              ;; Patch linker scripts so they refer to the right file-names.
              (substitute* ,(cond ((target-hurd64?)
                                   ''("lib/libc.so" "lib/libm.so"))
                                  ((or (target-x86?)
                                       (target-arm?))
                                  ((and (not (target-hurd?))
                                        (or (target-x86?)
                                            (target-arm?)))
                                   ''("lib/libc.so" "lib/libpthread.so"))
                                  (else
                                   ''("lib/libc.so")))

A gnu/packages/patches/clucene-gcc-14.patch => gnu/packages/patches/clucene-gcc-14.patch +13 -0
@@ 0,0 1,13 @@
Upstream-status: Not presented upstream.

--- clucene-core-2.3.3.4.orig/src/core/CLucene/document/DateTools.cpp	1970-01-01 01:00:01.000000000 +0100
+++ clucene-core-2.3.3.4/src/core/CLucene/document/DateTools.cpp	2025-01-01 17:41:36.055237798 +0100
@@ -9,6 +9,8 @@
 #include "DateTools.h"
 #include "CLucene/util/Misc.h"
 
+#include <ctime>
+
 CL_NS_USE(util)
 CL_NS_DEF(document)
 

M gnu/packages/rdf.scm => gnu/packages/rdf.scm +3 -2
@@ 10,7 10,7 @@
;;; Copyright © 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 108,7 108,8 @@ HTML and JSON.")
              (base32
               "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx"))
             (patches (search-patches "clucene-pkgconfig.patch"
                                      "clucene-contribs-lib.patch"))))
                                      "clucene-contribs-lib.patch"
                                      "clucene-gcc-14.patch"))))
    (build-system cmake-build-system)
    (inputs
     (list boost ; could also use bundled copy