reivilibre/breeze-icons-for-docpond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sort generated qrc

Browse Source 
For reproducible builds (https://reproducible-builds.org)

Sadly I don't have a particularly strong reproducer for this problem, but testing manually with disorderfs and inspecting the results \_suggests\_ this does the trick.

BUG: 508718
This commit is contained in:
Arnout Engelen 2025-08-30 15:21:41 +00:00 committed by Christoph Cullmann
parent bf46b2777d
commit 0c7550acd8
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tools/qrcAlias.cpp
View File

@ -137,16 +137,10 @@ static QString resolveWindowsGitLink(const QString &path, const QString &fileNam
*/
static void generateQRCAndCheckInputs(const QStringList &indirs, const QString &outfile)
{
QFile out(outfile);
if (!out.open(QIODevice::WriteOnly)) {
qFatal() << "Failed to create" << outfile;
}
out.write("<!DOCTYPE RCC><RCC version=\"1.0\">\n");
out.write("<qresource>\n");
// loop over the inputs, remember if we do look at generated stuff for checks
bool generatedIcons = false;
QSet<QString> checkedFiles, filesInResource;
QList<QString> lines;
bool themeFileFound = false, icons24Seen = false;
for (const auto &indir : indirs) {
// go to input dir to have proper relative paths
@ -156,7 +150,7 @@ static void generateQRCAndCheckInputs(const QStringList &indirs, const QString &
// we look at all interesting files in the indir and create a qrc with resolved symlinks
// we need QDir::System to get broken links for checking
QDirIterator it(QStringLiteral("."), {QStringLiteral("*.theme"), QStringLiteral("*.svg")}, QDir::Files | QDir::System, QDirIterator::Subdirectories);
QDirIterator it(QStringLiteral("."), {QStringLiteral("*.theme"), QStringLiteral("*.svg")}, QDir::Files | QDir::System, QDirIterator::Subdirectories);
while (it.hasNext()) {
// ensure nice path without ./ and Co.
const auto file = QDir::current().relativeFilePath(it.next());
@ -220,8 +214,7 @@ static void generateQRCAndCheckInputs(const QStringList &indirs, const QString &
themeFileFound = true;
}
// write the one alias to file entry
out.write(QStringLiteral(" <file alias=\"%1\">%2</file>\n").arg(file, fullPath).toUtf8());
lines.append(QStringLiteral(" <file alias=\"%1\">%2</file>\n").arg(file, fullPath));
// remember for checks below
filesInResource.insert(file);
@ -234,6 +227,19 @@ static void generateQRCAndCheckInputs(const QStringList &indirs, const QString &
generatedIcons = true;
}
// Write the resource file
QFile out(outfile);
if (!out.open(QIODevice::WriteOnly)) {
qFatal() << "Failed to create" << outfile;
}
out.write("<!DOCTYPE RCC><RCC version=\"1.0\">\n");
out.write("<qresource>\n");
std::sort(lines.begin(), lines.end());
for (const auto &line : lines) {
out.write(line.toUtf8());
}
out.write("</qresource>\n");
out.write("</RCC>\n");