pool/graphviz
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 626475 from home:bmwiedemann:branches:graphics

Browse Source 
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
This commit is contained in:
Marcus Meissner 2018-08-02 09:58:48 +00:00 committed by Git OBS Bridge
parent a6af48d842
commit 0d7be93ce7
5 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphviz-addons.changes
View File

@ -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 Tue Mar 27 20:12:49 UTC 2018 - stefan.bruens@rwth-aachen.de

2
graphviz-addons.spec
View File

@ -48,7 +48,7 @@ Patch1: graphviz-smyrna-link_against_glu.patch
Patch2: graphviz-fix-pkgIndex.patch Patch2: graphviz-fix-pkgIndex.patch
#PATCH-FIX-UPSTREAM Off-by-one bug #PATCH-FIX-UPSTREAM Off-by-one bug
Patch3: graphviz-array_overflow.patch 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 Patch4: reproducible.patch
Patch6: graphviz-2.20.2-interpreter_names.patch Patch6: graphviz-2.20.2-interpreter_names.patch
#PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code

5
graphviz.changes
View File

@ -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 Tue Mar 27 20:12:49 UTC 2018 - stefan.bruens@rwth-aachen.de

2
graphviz.spec
View File

@ -48,7 +48,7 @@ Patch1: graphviz-smyrna-link_against_glu.patch
Patch2: graphviz-fix-pkgIndex.patch Patch2: graphviz-fix-pkgIndex.patch
#PATCH-FIX-UPSTREAM Off-by-one bug #PATCH-FIX-UPSTREAM Off-by-one bug
Patch3: graphviz-array_overflow.patch 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 Patch4: reproducible.patch
Patch6: graphviz-2.20.2-interpreter_names.patch Patch6: graphviz-2.20.2-interpreter_names.patch
#PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code

27
reproducible.patch
View File

@ -1,12 +1,37 @@
Author: Bernhard M. Wiedemann <bwiedemann suse de>
Date: 2018-07-30
https://bugzilla.opensuse.org/show_bug.cgi?id=1041534
Do not have binaries depend on build system timings Do not have binaries depend on build system timings
because we are building in VMs anyway because we are building in VMs anyway
and users might have different hardware 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 Index: graphviz-2.38.0/lib/sfio/features/sfio
=================================================================== ===================================================================
--- graphviz-2.38.0.orig/lib/sfio/features/sfio --- graphviz-2.38.0.orig/lib/sfio/features/sfio
+++ graphviz-2.38.0/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); unlink(file);