Hello community, here is the log from the commit of package doxygen for openSUSE:Factory checked in at 2017-01-28 11:03:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/doxygen (Old) and /work/SRC/openSUSE:Factory/.doxygen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "doxygen" Changes: -------- --- /work/SRC/openSUSE:Factory/doxygen/doxygen.changes 2016-12-03 18:25:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.doxygen.new/doxygen.changes 2017-02-03 17:35:58.223399047 +0100 @@ -1,0 +2,6 @@ +Tue Jan 24 12:28:25 UTC 2017 - stefan.bru...@rwth-aachen.de + +- Added res2cc_sort_resources.diff, sort template files in + generated resources.cpp for reproducible build, fixes bgo#777672 + +------------------------------------------------------------------- New: ---- res2cc_sort_resources.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doxygen-doc.spec ++++++ --- /var/tmp/diff_new_pack.7oMKjk/_old 2017-02-03 17:35:59.227256964 +0100 +++ /var/tmp/diff_new_pack.7oMKjk/_new 2017-02-03 17:35:59.231256397 +0100 @@ -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 ++++++ doxygen.spec ++++++ --- /var/tmp/diff_new_pack.7oMKjk/_old 2017-02-03 17:35:59.259252435 +0100 +++ /var/tmp/diff_new_pack.7oMKjk/_new 2017-02-03 17:35:59.263251869 +0100 @@ -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 @@ 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 @@ %patch4 -p1 %endif %patch5 -p1 +%patch6 -p0 %build export CFLAGS="%{optflags} -fPIC" ++++++ doxywizard.spec ++++++ --- /var/tmp/diff_new_pack.7oMKjk/_old 2017-02-03 17:35:59.283249039 +0100 +++ /var/tmp/diff_new_pack.7oMKjk/_new 2017-02-03 17:35:59.287248472 +0100 @@ -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 ++++++ res2cc_sort_resources.diff ++++++ --- 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:
