Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-tools for openSUSE:Factory
checked in at 2025-05-26 18:32:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-tools (Old)
and /work/SRC/openSUSE:Factory/.qt6-tools.new.2732 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-tools"
Mon May 26 18:32:01 2025 rev:49 rq:1279420 version:6.9.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-tools/qt6-tools.changes 2025-04-09
21:49:09.147293834 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-tools.new.2732/qt6-tools.changes
2025-05-26 18:32:56.612885737 +0200
@@ -1,0 +2,7 @@
+Thu May 22 16:12:43 UTC 2025 - Antonio Larrosa <alarr...@suse.com>
+
+- Add patch from upstream to fix qdoc reproducibility issues
+ (bsc#1243434):
+ * 0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch
+
+-------------------------------------------------------------------
New:
----
0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch
BETA DEBUG BEGIN:
New: (bsc#1243434):
* 0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-tools.spec ++++++
--- /var/tmp/diff_new_pack.4jqTDC/_old 2025-05-26 18:32:57.120907037 +0200
+++ /var/tmp/diff_new_pack.4jqTDC/_new 2025-05-26 18:32:57.120907037 +0200
@@ -45,6 +45,8 @@
# The 48x48 icon was removed from qttools
Source14: linguist6.png
Source99: qt6-tools-rpmlintrc
+# PATCH-FIX-UPSTREAM
0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch
alarr...@suse.com -- Fix reproducibility bsc#1243434
+Patch0:
0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch
# clang-devel in Leap 15 points to clang7...
%if 0%{?suse_version} == 1500
# Leap 15.6 has llvm 19 since 2025-02-12, we need to use it to avoid doc build
issues
++++++ 0001-QDoc-Sort-non-function-nodes-by-name-then-erase-duplicates.patch
++++++
>From cc7a2141ff50d9826f13bb794d26479af0ab4492 Mon Sep 17 00:00:00 2001
From: David Boddie <david.bod...@qt.io>
Date: Wed, 14 May 2025 14:39:54 +0200
Subject: [PATCH] QDoc: Sort non-function nodes by name then erase duplicates
The order of node information in index files could change between runs
of QDoc. This appears to be due to the sorting method used before
erasing duplicate non-function nodes.
Task-number: QTBUG-136483
Change-Id: Ia58585c19e1c22172ee4c58c3ba054ec5d14a0d5
---
diff --git a/src/qdoc/qdoc/src/qdoc/aggregate.cpp
b/src/qdoc/qdoc/src/qdoc/aggregate.cpp
index df4600d..4cdafc2 100644
--- a/src/qdoc/qdoc/src/qdoc/aggregate.cpp
+++ b/src/qdoc/qdoc/src/qdoc/aggregate.cpp
@@ -303,13 +303,11 @@
const NodeList &Aggregate::nonfunctionList()
{
m_nonfunctionList = m_nonfunctionMap.values();
- // Erase duplicates
- std::sort(m_nonfunctionList.begin(), m_nonfunctionList.end());
- m_nonfunctionList.erase(std::unique(m_nonfunctionList.begin(),
m_nonfunctionList.end()),
- m_nonfunctionList.end());
-
// Sort based on node name
std::sort(m_nonfunctionList.begin(), m_nonfunctionList.end(),
Node::nodeNameLessThan);
+ // Erase duplicates
+ m_nonfunctionList.erase(std::unique(m_nonfunctionList.begin(),
m_nonfunctionList.end()),
+ m_nonfunctionList.end());
return m_nonfunctionList;
}
