Hello community, here is the log from the commit of package doxygen for openSUSE:Factory checked in at 2020-01-27 00:20:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/doxygen (Old) and /work/SRC/openSUSE:Factory/.doxygen.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "doxygen" Mon Jan 27 00:20:20 2020 rev:77 rq:766491 version:1.8.16 Changes: -------- --- /work/SRC/openSUSE:Factory/doxygen/doxygen.changes 2020-01-12 23:18:40.258689350 +0100 +++ /work/SRC/openSUSE:Factory/.doxygen.new.26092/doxygen.changes 2020-01-27 00:20:23.193401202 +0100 @@ -1,0 +2,6 @@ +Wed Jan 22 17:31:41 UTC 2020 - Bernhard Wiedemann <bwiedem...@suse.com> + +- Add reproducible-sort.patch to make html output reproducible + in spite of ASLR (boo#1062303) + +------------------------------------------------------------------- New: ---- reproducible-sort.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ doxygen.spec ++++++ --- /var/tmp/diff_new_pack.M1JRwh/_old 2020-01-27 00:20:25.881403496 +0100 +++ /var/tmp/diff_new_pack.M1JRwh/_new 2020-01-27 00:20:25.885403500 +0100 @@ -40,6 +40,7 @@ Patch7: PR_7193_fix_blank_file_patterns.patch # PATCH-FIX-UPSTREAM Including external tag files with TOC produces a broken index.qhp Patch8: 0001-issue-7248-Including-external-tag-files-with-TOC-pro.patch +Patch9: reproducible-sort.patch BuildRequires: bison BuildRequires: cmake >= 2.8.12 BuildRequires: flex @@ -72,6 +73,7 @@ %endif %patch7 -p1 %patch8 -p1 +%patch9 -p1 %build %cmake \ ++++++ reproducible-sort.patch ++++++ >From dc67dbe5bd5a48756c591ad02b9f68fbd2a57687 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch <doxy...@gmail.com> Date: Sun, 19 Jan 2020 20:31:52 +0100 Subject: [PATCH] issue #7474: [1.8.16 regression] HTML output varies from ASLR --- src/memberlist.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/memberlist.cpp b/src/memberlist.cpp index 278023bb6..edd164bec 100644 --- a/src/memberlist.cpp +++ b/src/memberlist.cpp @@ -75,8 +75,15 @@ int MemberList::compareValues(const MemberDef *c1, const MemberDef *c2) const return 1; } int cmp = qstricmp(c1->name(),c2->name()); - if (cmp==0) cmp = qstricmp(c1->argsString(),c2->argsString()); - return cmp!=0 ? cmp : c1->getDefLine()-c2->getDefLine(); + if (cmp==0 && c1->argsString() && c2->argsString()) + { + cmp = qstricmp(c1->argsString(),c2->argsString()); + } + if (cmp==0) + { + cmp = c1->getDefLine()-c2->getDefLine(); + } + return cmp; } int MemberList::countInheritableMembers(const ClassDef *inheritedFrom) const