diff --git a/doxygen-doc.spec b/doxygen-doc.spec index 8af19b1..a185947 100644 --- a/doxygen-doc.spec +++ b/doxygen-doc.spec @@ -1,7 +1,7 @@ # # spec file for package doxygen-doc # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/doxygen.changes b/doxygen.changes index 2cc9f50..1f431f7 100644 --- a/doxygen.changes +++ b/doxygen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 24 12:28:25 UTC 2017 - stefan.bruens@rwth-aachen.de + +- Added res2cc_sort_resources.diff, sort template files in + generated resources.cpp for reproducible build, fixes bgo#777672 + ------------------------------------------------------------------- Wed Nov 30 11:32:31 UTC 2016 - pgajdos@suse.com diff --git a/doxygen.spec b/doxygen.spec index 98f2265..194323c 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,7 +1,7 @@ # # spec file for package doxygen # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,8 @@ Patch3: vhdlparser-no-return.patch Patch4: doxygen-dot-one-thread.patch # is upstreamed, bnc#1011331 Patch5: doxygen-fix-QCH-files.patch +# Submitted upstream, fix for https://bugzilla.gnome.org/show_bug.cgi?id=777672 +Patch6: res2cc_sort_resources.diff BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex @@ -59,6 +61,7 @@ as well. %patch4 -p1 %endif %patch5 -p1 +%patch6 -p0 %build export CFLAGS="%{optflags} -fPIC" diff --git a/doxywizard.spec b/doxywizard.spec index ac6b3d7..a1f17ce 100644 --- a/doxywizard.spec +++ b/doxywizard.spec @@ -1,7 +1,7 @@ # # spec file for package doxywizard # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/res2cc_sort_resources.diff b/res2cc_sort_resources.diff new file mode 100644 index 0000000..b3fa197 --- /dev/null +++ b/res2cc_sort_resources.diff @@ -0,0 +1,15 @@ +--- src/res2cc_cmd.py_orig 2016-05-10 21:51:52.000000000 +0200 ++++ src/res2cc_cmd.py 2017-01-23 23:54:53.499507342 +0100 +@@ -98,10 +98,11 @@ + directory = sys.argv[1] + files = [] + for dirName, subdirList, fileList in walk(directory): +- for fname in sorted(fileList): ++ for fname in fileList: + subdir = dirName[len(directory)+1:] if dirName.startswith(directory) else dirName + if subdir: + files.append(File.factory(directory,subdir,fname)) ++ files.sort(key=lambda f: f.subdir + "/" + f.fileName) + outputFile = open(sys.argv[2],"w") + print("#include \"resourcemgr.h\"\n",file=outputFile) + for f in files: