From cc6374ebe1737588024c0fd295b8c96dad133b69 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 10 Aug 2025 22:03:32 +0200 Subject: [PATCH] ostree: update to 2025.4. --- ...9753e5227c97bda737e00a00451d361449f3.patch | 30 ------------------- srcpkgs/ostree/template | 8 ++--- 2 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/ostree/patches/bd2a9753e5227c97bda737e00a00451d361449f3.patch diff --git a/srcpkgs/ostree/patches/bd2a9753e5227c97bda737e00a00451d361449f3.patch b/srcpkgs/ostree/patches/bd2a9753e5227c97bda737e00a00451d361449f3.patch deleted file mode 100644 index 51e736f7bf9..00000000000 --- a/srcpkgs/ostree/patches/bd2a9753e5227c97bda737e00a00451d361449f3.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bd2a9753e5227c97bda737e00a00451d361449f3 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Mon, 24 Mar 2025 21:25:12 +0900 -Subject: [PATCH] Fix build error with --with-ed25519-libsodium and - --with-openssl - -While libotcore can be configured with those options individually, the -latter is always required for OpenSSL's EVP functions. This splits the -ifdefs to accommodate that. - -Signed-off-by: Daiki Ueno ---- - src/libotcore/otcore.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/libotcore/otcore.h b/src/libotcore/otcore.h -index ceeb1a9265..3ce8f2a39f 100644 ---- a/src/libotcore/otcore.h -+++ b/src/libotcore/otcore.h -@@ -25,7 +25,9 @@ - #ifdef HAVE_LIBSODIUM - #include - #define USE_LIBSODIUM --#elif defined(HAVE_OPENSSL) -+#endif -+ -+#if defined(HAVE_OPENSSL) - #include - #include - #define USE_OPENSSL diff --git a/srcpkgs/ostree/template b/srcpkgs/ostree/template index 788910e1c40..44e16b3a1e5 100644 --- a/srcpkgs/ostree/template +++ b/srcpkgs/ostree/template @@ -1,7 +1,7 @@ # Template file for 'ostree' pkgname=ostree -version=2025.2 -revision=4 +version=2025.4 +revision=1 build_style=gnu-configure build_helper="gir" configure_args=" @@ -13,14 +13,14 @@ configure_args=" hostmakedepends="bison docbook-xsl glib-devel libxslt pkg-config" makedepends="e2fsprogs-devel fuse-devel glib-devel gpgme-devel libarchive-devel libcurl-devel libsodium-devel $(vopt_if gir 'gobject-introspection') libsoup3-devel" -checkdepends="attr-progs cpio elfutils gnupg python3-yaml tar which xz" +checkdepends="attr-progs cpio elfutils gnupg python3-yaml tar which xz jq" short_desc="Operating system and container binary deployment and upgrades" maintainer="Duncaen " license="LGPL-2.0-or-later" homepage="https://ostreedev.github.io/ostree/" changelog="https://github.com/ostreedev/ostree/releases" distfiles="https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz" -checksum=f244a408c909998a778e127fcc22c1b502b4d013f15f26948f47cc72ffe2eef4 +checksum=014d12d19ea664fae53fe147d3d2c0b7465a3c37e099c87d289df908adeb5669 build_options="gir" build_options_default="gir"