From 50671ed9878e125aa7245f42f1b3513caa6c2d38 Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Sun, 4 Mar 2018 17:31:03 +0100 Subject: [PATCH 1/2] scripts: explicitly set linker search path for libpulsecommon-8.0 --- scripts/snap-wrapper.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/snap-wrapper.sh b/scripts/snap-wrapper.sh index 0ca2d83..b1f1e3b 100755 --- a/scripts/snap-wrapper.sh +++ b/scripts/snap-wrapper.sh @@ -35,6 +35,11 @@ export LD_LIBRARY_PATH="$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH" # Ref.: https://bugs.launchpad.net/snappy/+bug/1588192 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/var/lib/snapd/lib/gl +# With recent builds on Ubuntu 16.04 the snap does not find the path to +# libpulsecommon-8.0.so anymore so we have to teach the linker manually +# where it can be found +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/usr/lib/$ARCH/pulseaudio + # We set XDG_DATA_HOME to SNAP_USER_COMMON here as this will be the location we will # create all our application launchers in. The system application launcher will # be configured by our installer to look into this directory for available From 5cc79d9782daf9bec13b3f67c6af5bb6efc6ce35 Mon Sep 17 00:00:00 2001 From: Ondra Pelech Date: Sun, 1 Apr 2018 16:19:28 +0200 Subject: [PATCH 2/2] Use the `z` as print format for `size_t` variable instead of `l` to make it platform independent `l` is a format for `long int`. It accidentally worked on 64 bit architectures, because `long int` has the same length as `size_t` there. It didn't work on 32 bit architectures, where `size_t` is shorter than `long int`. Let's use `z`, because that's the proper format for `size_t` -- it works on any platform. --- src/anbox/qemu/qemud_message_processor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/anbox/qemu/qemud_message_processor.cpp b/src/anbox/qemu/qemud_message_processor.cpp index d9ee009..b47f078 100644 --- a/src/anbox/qemu/qemud_message_processor.cpp +++ b/src/anbox/qemu/qemud_message_processor.cpp @@ -70,7 +70,7 @@ void QemudMessageProcessor::process_commands() { void QemudMessageProcessor::send_header(const size_t &size) { char header[header_size + 1]; - std::snprintf(header, header_size + 1, "%04lx", size); + std::snprintf(header, header_size + 1, "%04zx", size); messenger_->send(header, header_size); }