mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: clucene: Fix build with gcc-14.

Browse source 
* 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
This commit is contained in:
Janneke Nieuwenhuizen 2025-01-01 17:54:34 +01:00
parent ee271cd934
commit 727ab55b55
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1115,6 +1115,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 \

13
gnu/packages/patches/clucene-gcc-14.patch Normal file
View file

@ -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)

5
gnu/packages/rdf.scm
View file

@ -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 @@ (define-public clucene
(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