Hello community, here is the log from the commit of package mypaint for openSUSE:Factory checked in at 2019-06-12 13:17:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mypaint (Old) and /work/SRC/openSUSE:Factory/.mypaint.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mypaint" Wed Jun 12 13:17:35 2019 rev:8 rq:709122 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mypaint/mypaint.changes 2018-09-24 13:13:00.717733016 +0200 +++ /work/SRC/openSUSE:Factory/.mypaint.new.4811/mypaint.changes 2019-06-12 13:17:39.072605783 +0200 @@ -1,0 +2,6 @@ +Sun Jun 9 08:50:30 UTC 2019 - Bernhard Wiedemann <[email protected]> + +- Add reproducible.patch to sort file list to make build reproducible + (boo#1041090) + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mypaint.spec ++++++ --- /var/tmp/diff_new_pack.pPyAae/_old 2019-06-12 13:17:40.276604520 +0200 +++ /var/tmp/diff_new_pack.pPyAae/_new 2019-06-12 13:17:40.280604516 +0200 @@ -26,6 +26,8 @@ Source: https://github.com/mypaint/mypaint/releases/download/v1.1.0/mypaint-1.1.0.tar.bz2 # PATCH-FIX-UPSTREAM mypaint-scons-to-python3.patch [email protected] -- Convert SCons* to python3 for compatibility with openSUSE > 1320 where scons is python3 based Patch0: mypaint-scons-to-python3.patch +# PATCH-FIX-UPSTREAM +Patch1: reproducible.patch BuildRequires: ImageMagick BuildRequires: fdupes BuildRequires: gcc-c++ @@ -65,6 +67,7 @@ %if 0%{?suse_version} > 1320 %patch0 -p1 %endif +%patch1 -p1 #FIXME Set correct library path for build arch sed -i 's|lib/mypaint|%{_lib}/mypaint|g' SConscript SConstruct mypaint.py ++++++ reproducible.patch ++++++ https://github.com/mypaint/libmypaint/pull/108 >From 581de51c99cb50f4c553286e0233e49fbf1bbcb8 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" <[email protected]> Date: Sat, 23 Sep 2017 08:14:29 +0200 Subject: [PATCH] Sort input file list so that libmypaint builds in a reproducible way in spite of indeterministic filesystem readdir order because .c files become .o files that get linked into a .so and functions are ordered depending on that. See https://reproducible-builds.org/ for why this matters. Index: mypaint-1.1.0/brushlib/tests/SConscript =================================================================== --- mypaint-1.1.0.orig/brushlib/tests/SConscript +++ mypaint-1.1.0/brushlib/tests/SConscript @@ -10,8 +10,8 @@ def is_csource(fn): def is_test(fn): return fn.startswith('test-') -tests_sources = [fn for fn in os.listdir("./") if is_test(fn) and is_csource(fn)] -testlib_sources = [fn for fn in os.listdir("./") if not is_test(fn) and is_csource(fn)] +tests_sources = [fn for fn in sorted(os.listdir("./")) if is_test(fn) and is_csource(fn)] +testlib_sources = [fn for fn in sorted(os.listdir("./")) if not is_test(fn) and is_csource(fn)] testlib_env.Append(LIBS=['mypaint']) testlib_env.Append(CPPPATH=['../'], LIBPATH=['../..'])
