[Pkg-utopia-maintainers] Bug#826857: ostree: Fails to build from source on Ubuntu

[Jeremy Bicha]

Package: ostree
Version: 2016.5-3
Tags: patch


ostree doesn't build in Ubuntu:

https://launchpad.net/ubuntu/+source/ostree/2016.5-3/+build/9892035

The below patch works for me. I found it on ricotz' PPA; I'm not sure
where he got it from since I don't see it posted to git or GNOME's
bugzilla or https://github.com/ostreedev/ostree/ (which I guess is
where development is actually happening now)


Thanks,
Jeremy Bicha


diff -Nru ostree-2016.5/debian/patches/libtest-disable-LD_PRELOAD-readdir.patch
ostree-2016.5/debian/patches/libtest-disable-LD_PRELOAD-readdir.patch
--- ostree-2016.5/debian/patches/libtest-disable-LD_PRELOAD-readdir.patch
1970-01-01 00:00:00.000000000 +0000
+++ ostree-2016.5/debian/patches/libtest-disable-LD_PRELOAD-readdir.patch
2016-06-07 14:53:07.000000000 +0000
@@ -0,0 +1,26 @@
+From 1591465b0d1e80a991d922d92689098886c64eea Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexander.larsson at gmail.com>
+Date: Thu, 19 May 2016 12:29:49 +0200
+Subject: [PATCH] Disable the readdir LD_PRELOAD hack which was breaking make
+ check
+
+---
+ tests/libtest.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/libtest.sh b/tests/libtest.sh
+index 572f023..59e2205 100755
+--- a/tests/libtest.sh
++++ b/tests/libtest.sh
+@@ -79,7 +79,7 @@ fi
+ if test -n "${OT_TESTS_VALGRIND:-}"; then
+     CMD_PREFIX="env G_SLICE=always-malloc valgrind -q
--leak-check=full --num-callers=30
--suppressions=${test_srcdir}/ostree-valgrind.supp"
+ else
+-    CMD_PREFIX="env LD_PRELOAD=${test_builddir}/libreaddir-rand.so"
++    CMD_PREFIX=""
+ fi
+
+ assert_streq () {
+--
+2.7.4
+
diff -Nru ostree-2016.5/debian/patches/series
ostree-2016.5/debian/patches/series
--- ostree-2016.5/debian/patches/series 2016-04-25 11:51:45.000000000 +0000
+++ ostree-2016.5/debian/patches/series 2016-06-07 14:53:27.000000000 +0000
@@ -1,2 +1,3 @@
 libtest-show-files-contents-when-assertions-about-them-fa.patch
 test-parent-this-test-requires-user-xattrs.patch
+libtest-disable-LD_PRELOAD-readdir.patch