On Sat, 19 Sep 2020 21:28:53 +0200 Paul Gevers <elb...@debian.org> wrote: > Source: barrier > Version: 2.3.2+dfsg-1 > Severity: serious > Tags: sid bullseye > User: release.debian....@packages.debian.org > Usertags: out-of-sync > > Dear maintainer(s), > > As recently announced [1], the Release Team now considers packages that > are out-of-sync between testing and unstable for more than 60 days as > having a Release Critical bug in testing. Your package src:barrier in > its current version in unstable has been trying to migrate for 61 days > [2]. Hence, I am filing this bug. >
Attaching the fix I'm uploading to DELAYED/0. Cheers, Balint
diff --git a/debian/changelog b/debian/changelog index e631bb07..f8a6fb4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +barrier (2.3.3+dfsg-1.1) unstable; urgency=medium + + * Non maintainer upload. + * lib/ipc: Introduce writef_void(void*, ...) to fix ambiguity with + writef(barrier::IStream*, ...) and thus fix FTBFS + (Closes: #970611) + + -- Balint Reczey <rbal...@ubuntu.com> Thu, 22 Oct 2020 22:09:11 +0200 + barrier (2.3.3+dfsg-1) unstable; urgency=medium * New upstream version 2.3.3+dfsg. diff --git a/debian/patches/0002-lib-ipc-Introduce-writef_void-void.patch b/debian/patches/0002-lib-ipc-Introduce-writef_void-void.patch new file mode 100644 index 00000000..ca8db99a --- /dev/null +++ b/debian/patches/0002-lib-ipc-Introduce-writef_void-void.patch @@ -0,0 +1,49 @@ +From bd0c671fcc9732c9d1ccf5216f34f4629640b9fb Mon Sep 17 00:00:00 2001 +From: Balint Reczey <balint.rec...@canonical.com> +Date: Thu, 22 Oct 2020 22:00:18 +0200 +Subject: [PATCH] lib/ipc: Introduce writef_void(void*, ...) + +to fix ambiguity with writef(barrier::IStream*, ...) +--- + src/lib/barrier/ProtocolUtil.cpp | 4 ++-- + src/lib/barrier/ProtocolUtil.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/lib/barrier/ProtocolUtil.cpp b/src/lib/barrier/ProtocolUtil.cpp +index e742687f..21ba38fc 100644 +--- a/src/lib/barrier/ProtocolUtil.cpp ++++ b/src/lib/barrier/ProtocolUtil.cpp +@@ -80,7 +80,7 @@ ProtocolUtil::vwritef(barrier::IStream* stream, + + // fill buffer + UInt8* buffer = new UInt8[size]; +- writef(buffer, fmt, args); ++ writef_void(buffer, fmt, args); + + try { + // write buffer +@@ -339,7 +339,7 @@ ProtocolUtil::getLength(const char* fmt, va_list args) + } + + void +-ProtocolUtil::writef(void* buffer, const char* fmt, va_list args) ++ProtocolUtil::writef_void(void* buffer, const char* fmt, va_list args) + { + UInt8* dst = static_cast<UInt8*>(buffer); + +diff --git a/src/lib/barrier/ProtocolUtil.h b/src/lib/barrier/ProtocolUtil.h +index 9930cfc0..e01a6e60 100644 +--- a/src/lib/barrier/ProtocolUtil.h ++++ b/src/lib/barrier/ProtocolUtil.h +@@ -79,7 +79,7 @@ private: + const char* fmt, va_list); + + static UInt32 getLength(const char* fmt, va_list); +- static void writef(void*, const char* fmt, va_list); ++ static void writef_void(void*, const char* fmt, va_list); + static UInt32 eatLength(const char** fmt); + static void read(barrier::IStream*, void*, UInt32); + }; +-- +2.25.1 + diff --git a/debian/patches/series b/debian/patches/series index 0635bdc7..fcd4e248 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ use-system-gtest.patch +0002-lib-ipc-Introduce-writef_void-void.patch