groonga: remove stdint.h patch for llama.cpp (#25828)

The patch was added to fix a compilation error with llama.cpp bundled
in Groonga. However, this issue was already fixed upstream in llama.cpp b4683.

ref: 19b392d58d

Since Groonga over v15.0.8 upgraded to llama.cpp b5129 on April 14 (which includes
the fix), the patch is no longer needed. Remove the patch file and the workaround build steps.
This commit is contained in:
takuya kodama 2025-10-07 14:54:02 +08:00 committed by GitHub
parent 96c4fa97b5
commit 2a400f36b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 24 deletions

View File

@ -1,11 +0,0 @@
--- a/src/llama-mmap.h
+++ b/src/llama-mmap.h
@@ -3,6 +3,8 @@
#include <memory>
#include <vector>
+#include <stdint.h>
+
struct llama_file;
struct llama_mmap;
struct llama_mlock;

View File

@ -4,15 +4,14 @@ _realname=groonga
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=15.1.7
pkgrel=1
pkgrel=2
pkgdesc="An opensource fulltext search engine (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
url="https://groonga.org/"
license=('spdx:LGPL-2.1-or-later')
source=(https://packages.groonga.org/source/${_realname}/${_realname}-${pkgver}.tar.gz{,.asc}
001-aarch64.patch
002-llama_cpp-add-stdint.patch)
001-aarch64.patch)
depends=("${MINGW_PACKAGE_PREFIX}-arrow"
"${MINGW_PACKAGE_PREFIX}-blosc2"
"${MINGW_PACKAGE_PREFIX}-lz4"
@ -32,8 +31,7 @@ makedepends=("git"
"${MINGW_PACKAGE_PREFIX}-xsimd")
sha256sums=('899a414a0636f7568d1a11845fe3dd75b701f72106a7a26f30bc950af5876616'
'SKIP'
'5fbb336487a6522e2f7bff01ea3cdd714d4c27de3cc65d5a6ecb2eedeb6fc2c4'
'823f83e2043fc4b98c5971a12a65c1c4cb472b49b0e812052746aa591b7cdf44')
'5fbb336487a6522e2f7bff01ea3cdd714d4c27de3cc65d5a6ecb2eedeb6fc2c4')
validpgpkeys=('2701F317CFCCCB975CADE9C2624CF77434839225') # Groonga Key <packages@groonga.org>
apply_patch_with_msg() {
@ -72,14 +70,6 @@ build() {
-DGRN_WITH_MRUBY=ON \
../${_realname}-${pkgver}
${MINGW_PREFIX}/bin/cmake --build . || true
# workaround: gcc-15 compiler error
(
cd _deps/llama_cpp-src
patch -p1 -i "${srcdir}"/002-llama_cpp-add-stdint.patch
)
${MINGW_PREFIX}/bin/cmake --build .
}