From 0d7be93ce7ed2553820f97940e08580c77add2b2656d3757e7886d37ccf5dd5e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 2 Aug 2018 09:58:48 +0000 Subject: [PATCH] Accepting request 626475 from home:bmwiedemann:branches:graphics Extend reproducible.patch to make build reproducible (boo#1041534) also: did the previous patch really go upstream? => marking as OPENSUSE for now OBS-URL: https://build.opensuse.org/request/show/626475 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=130 --- graphviz-addons.changes | 5 +++++ graphviz-addons.spec | 2 +- graphviz.changes | 5 +++++ graphviz.spec | 2 +- reproducible.patch | 27 ++++++++++++++++++++++++++- 5 files changed, 38 insertions(+), 3 deletions(-) diff --git a/graphviz-addons.changes b/graphviz-addons.changes index 65e508f..2848a60 100644 --- a/graphviz-addons.changes +++ b/graphviz-addons.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 30 11:24:20 UTC 2018 - bwiedemann@suse.com + +- Extend reproducible.patch to make build reproducible (boo#1041534) + ------------------------------------------------------------------- Tue Mar 27 20:12:49 UTC 2018 - stefan.bruens@rwth-aachen.de diff --git a/graphviz-addons.spec b/graphviz-addons.spec index e69e220..49b6267 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -48,7 +48,7 @@ Patch1: graphviz-smyrna-link_against_glu.patch Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM Off-by-one bug Patch3: graphviz-array_overflow.patch -#PATCH-FIX-UPSTREAM Make build reproducible - merged in next release +#PATCH-FIX-OPENSUSE Make build reproducible (boo#1041534) Patch4: reproducible.patch Patch6: graphviz-2.20.2-interpreter_names.patch #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code diff --git a/graphviz.changes b/graphviz.changes index 65e508f..2848a60 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 30 11:24:20 UTC 2018 - bwiedemann@suse.com + +- Extend reproducible.patch to make build reproducible (boo#1041534) + ------------------------------------------------------------------- Tue Mar 27 20:12:49 UTC 2018 - stefan.bruens@rwth-aachen.de diff --git a/graphviz.spec b/graphviz.spec index 779d1c6..c537ee2 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -48,7 +48,7 @@ Patch1: graphviz-smyrna-link_against_glu.patch Patch2: graphviz-fix-pkgIndex.patch #PATCH-FIX-UPSTREAM Off-by-one bug Patch3: graphviz-array_overflow.patch -#PATCH-FIX-UPSTREAM Make build reproducible - merged in next release +#PATCH-FIX-OPENSUSE Make build reproducible (boo#1041534) Patch4: reproducible.patch Patch6: graphviz-2.20.2-interpreter_names.patch #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code diff --git a/reproducible.patch b/reproducible.patch index a42ed0a..7feaaea 100644 --- a/reproducible.patch +++ b/reproducible.patch @@ -1,12 +1,37 @@ +Author: Bernhard M. Wiedemann +Date: 2018-07-30 + +https://bugzilla.opensuse.org/show_bug.cgi?id=1041534 + Do not have binaries depend on build system timings because we are building in VMs anyway and users might have different hardware +Will always use the system's memchr and memccpy functions. + Index: graphviz-2.38.0/lib/sfio/features/sfio =================================================================== --- graphviz-2.38.0.orig/lib/sfio/features/sfio +++ graphviz-2.38.0/lib/sfio/features/sfio -@@ -260,9 +260,7 @@ tst output{ +@@ -79,7 +79,7 @@ lib memchr note{ see if memchr is fast } + t2 = (etm2.tms_utime - stm2.tms_utime) + + (etm2.tms_stime - stm2.tms_stime); + +- return t1 < t2 ? 0 : 1; ++ return 0; + } + }end + +@@ -120,7 +120,7 @@ lib memccpy note{ see if memccpy is fast + t2 = (etm2.tms_utime - stm2.tms_utime) + + (etm2.tms_stime - stm2.tms_stime); + +- return t1 < t2 ? 0 : 1; ++ return 0; + } + }end + +@@ -250,9 +250,7 @@ tst output{ unlink(file);