From 2c9c47c6b298c3c553e1d2672ec1aaa29f9c163b Mon Sep 17 00:00:00 2001 From: Marcus Folkesson Date: Tue, 26 Jun 2018 11:09:41 +0200 Subject: libostree: bump to version 2018.6 Also, add upstream patch for not fail builds on 32bit architectures. The patch will be removed when bumping to v2018.7. Signed-off-by: Marcus Folkesson Signed-off-by: Thomas Petazzoni --- ...1-lib-repo-Fix-32-bit-format-string-error.patch | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch (limited to 'package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch') diff --git a/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch b/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch new file mode 100644 index 0000000000..d74afcd412 --- /dev/null +++ b/package/libostree/0001-lib-repo-Fix-32-bit-format-string-error.patch @@ -0,0 +1,35 @@ +From 1174d9f5ba537562c67084caf0214544fbb14ffc Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 21 Jun 2018 14:17:28 +0000 +Subject: [PATCH] lib/repo: Fix 32 bit format string error + +Signed-off-by: Marcus Folkesson +--- + src/libostree/ostree-repo-commit.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c +index 37be748b..7e1d707b 100644 +--- a/src/libostree/ostree-repo-commit.c ++++ b/src/libostree/ostree-repo-commit.c +@@ -903,7 +903,7 @@ write_content_object (OstreeRepo *self, + return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s more required", + self->min_free_space_percent, formatted_required); + else +- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s more required", ++ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s more required", + self->min_free_space_mb, formatted_required); + } + /* This is the main bit that needs mutex protection */ +@@ -1617,7 +1617,7 @@ ostree_repo_prepare_transaction (OstreeRepo *self, + return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s available", + self->min_free_space_percent, formatted_free); + else +- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s available", ++ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s available", + self->min_free_space_mb, formatted_free); + } + g_mutex_unlock (&self->txn_lock); +-- +2.18.0 + -- cgit v1.2.3