From ccf43b535a2a4e74e9301c421078de1acc49e37d Mon Sep 17 00:00:00 2001 From: dkwo Date: Sat, 6 Jan 2024 17:57:46 +0100 Subject: [PATCH] dqlite: update to 1.15.1 --- srcpkgs/dqlite/patches/musl.patch | 31 ------------------------------- srcpkgs/dqlite/template | 6 +++--- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/dqlite/patches/musl.patch diff --git a/srcpkgs/dqlite/patches/musl.patch b/srcpkgs/dqlite/patches/musl.patch deleted file mode 100644 index ab6a0395494..00000000000 --- a/srcpkgs/dqlite/patches/musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit dcc017a506a5d616d1ff511cfc590a7255f28de1 -Author: Cameron Nemo -Date: Wed Dec 14 15:41:15 2022 -0800 - - vfs: fix include on musl - - On musl, this fails to compile due to -Werror=cpp: - - CC src/vfs.lo - In file included from src/vfs.c:6: - /usr/include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include to [-Werror=cpp] - 1 | #warning redirecting incorrect #include to - | ^~~~~~~ - cc1: all warnings being treated as errors - make: *** [Makefile:1314: src/vfs.lo] Error 1 - - Signed-off-by: Cameron Nemo - -diff --git a/src/vfs.c b/src/vfs.c -index 03df980..1760c62 100644 ---- a/src/vfs.c -+++ b/src/vfs.c -@@ -3,7 +3,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/srcpkgs/dqlite/template b/srcpkgs/dqlite/template index f4539b9623d..411e8f2990a 100644 --- a/srcpkgs/dqlite/template +++ b/srcpkgs/dqlite/template @@ -1,7 +1,7 @@ # Template file for 'dqlite' pkgname=dqlite -version=1.13.0 -revision=2 +version=1.15.1 +revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake libtool" makedepends="sqlite-devel raft-devel" @@ -10,7 +10,7 @@ maintainer="Cameron Nemo " license="custom:LGPL-3.0-only-linking-exception" homepage="https://github.com/canonical/dqlite" distfiles="https://github.com/canonical/dqlite/archive/v${version}.tar.gz" -checksum=14334a72389322d047576697f112da4cd6e1a5257d652d6162f195f2855fcd12 +checksum=f5bb8bf2de732fe188bfcbb09c3c4fd02707d267734043dbb27d1215da68af4e pre_configure() { autoreconf -i