From f5154b48d3f8c3b9b2c4c76e1825a49324b2b581 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 23 Jun 2018 12:32:41 +0100 Subject: [PATCH] Apply patch from upstream to fix FTBFS on 32-bit architectures Closes: #902194 --- debian/changelog | 8 +++++ ...-repo-Fix-32-bit-format-string-error.patch | 31 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 40 insertions(+) create mode 100644 debian/patches/lib-repo-Fix-32-bit-format-string-error.patch diff --git a/debian/changelog b/debian/changelog index 36256de8..7a5107b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ostree (2018.6-2) UNRELEASED; urgency=medium + + * d/p/lib-repo-Fix-32-bit-format-string-error.patch: + Apply patch from upstream to fix FTBFS on 32-bit architectures + (Closes: #902194) + + -- Simon McVittie Sat, 23 Jun 2018 12:26:53 +0100 + ostree (2018.6-1) unstable; urgency=medium * New upstream release with support for peer-to-peer software diff --git a/debian/patches/lib-repo-Fix-32-bit-format-string-error.patch b/debian/patches/lib-repo-Fix-32-bit-format-string-error.patch new file mode 100644 index 00000000..28000a16 --- /dev/null +++ b/debian/patches/lib-repo-Fix-32-bit-format-string-error.patch @@ -0,0 +1,31 @@ +From: Colin Walters +Date: Thu, 21 Jun 2018 14:17:28 +0000 +Subject: lib/repo: Fix 32 bit format string error + +Origin: upstream, 2018.7, commit:1174d9f5ba537562c67084caf0214544fbb14ffc +--- + 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 37be748..7e1d707 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); diff --git a/debian/patches/series b/debian/patches/series index 264a601e..c46336dc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +lib-repo-Fix-32-bit-format-string-error.patch avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch