Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-shadertools for openSUSE:Factory
checked in at 2026-05-28 17:25:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-shadertools (Old)
and /work/SRC/openSUSE:Factory/.qt6-shadertools.new.1937 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-shadertools"
Thu May 28 17:25:14 2026 rev:45 rq:1355440 version:6.11.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-shadertools/qt6-shadertools.changes
2026-03-28 20:13:21.609445402 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-shadertools.new.1937/qt6-shadertools.changes
2026-05-28 17:26:11.761873320 +0200
@@ -1,0 +2,6 @@
+Thu May 14 14:55:55 UTC 2026 - Christophe Marin <[email protected]>
+
+- Update to 6.11.1
+ https://www.qt.io/blog/qt-6.11.1-released
+
+-------------------------------------------------------------------
Old:
----
qtshadertools-everywhere-src-6.11.0.tar.xz
New:
----
qtshadertools-everywhere-src-6.11.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-shadertools.spec ++++++
--- /var/tmp/diff_new_pack.YkTxRK/_old 2026-05-28 17:26:13.049926637 +0200
+++ /var/tmp/diff_new_pack.YkTxRK/_new 2026-05-28 17:26:13.049926637 +0200
@@ -16,7 +16,7 @@
#
-%define real_version 6.11.0
+%define real_version 6.11.1
%define short_version 6.11
%define tar_name qtshadertools-everywhere-src
%define tar_suffix %{nil}
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-shadertools%{?pkg_suffix}
-Version: 6.11.0
+Version: 6.11.1
Release: 0
Summary: Qt 6 ShaderTools library
License: GPL-3.0-only
++++++ qtshadertools-everywhere-src-6.11.0.tar.xz ->
qtshadertools-everywhere-src-6.11.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.11.0/.cmake.conf
new/qtshadertools-everywhere-src-6.11.1/.cmake.conf
--- old/qtshadertools-everywhere-src-6.11.0/.cmake.conf 2026-03-09
10:39:29.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.11.1/.cmake.conf 2026-05-07
21:59:30.000000000 +0200
@@ -1,9 +1,10 @@
-set(QT_REPO_MODULE_VERSION "6.11.0")
+set(QT_REPO_MODULE_VERSION "6.11.1")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES
- "QT_LEAN_HEADERS=1"
- "QT_NO_FOREACH=1"
- "QT_NO_QASCONST=1"
- "QT_NO_URL_CAST_FROM_STRING=1"
+ "QT_ENABLE_STRICT_MODE_UP_TO=QT_VERSION_CHECK(6,11,0)"
+ # not yet in strict mode:
+ "QT_LEAN_HEADERS=2"
+ "QT_NO_SINGLE_ARGUMENT_QHASH_OVERLOAD=1"
+ "QT_NO_QPAIR=1"
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.11.0/.tag
new/qtshadertools-everywhere-src-6.11.1/.tag
--- old/qtshadertools-everywhere-src-6.11.0/.tag 2026-03-09
10:39:29.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.11.1/.tag 2026-05-07
21:59:30.000000000 +0200
@@ -1 +1 @@
-1c7a78fd7480f11a49eb8135b44d138edb0f0df8
+b3b8537b3c5ab01919e30b87d48d2f1ba1f2a3fe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.11.0/dependencies.yaml
new/qtshadertools-everywhere-src-6.11.1/dependencies.yaml
--- old/qtshadertools-everywhere-src-6.11.0/dependencies.yaml 2026-03-09
10:39:29.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.11.1/dependencies.yaml 2026-05-07
21:59:30.000000000 +0200
@@ -1,4 +1,4 @@
dependencies:
../qtbase:
- ref: 8ba7ea4b77a4b8f1948760221e264917ddc9e1c8
+ ref: 59c81a3c2247b821b9b84b4eb8d939b77e07e276
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.11.0/src/shadertools/qshaderbaker.cpp
new/qtshadertools-everywhere-src-6.11.1/src/shadertools/qshaderbaker.cpp
--- old/qtshadertools-everywhere-src-6.11.0/src/shadertools/qshaderbaker.cpp
2026-03-09 10:39:29.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.11.1/src/shadertools/qshaderbaker.cpp
2026-05-07 21:59:30.000000000 +0200
@@ -125,7 +125,7 @@
struct QShaderBakerPrivate
{
bool readFile(const QString &fn);
- QPair<QByteArray, QByteArray> compile();
+ std::pair<QByteArray, QByteArray> compile();
QByteArray perTargetDefines(const QShaderBaker::GeneratedShader &key);
QString sourceFileName;
@@ -279,7 +279,7 @@
/*!
\typedef QShaderBaker::GeneratedShader
- Synonym for QPair<QShader::Source, QShaderVersion>.
+ Synonym for std::pair<QShader::Source, QShaderVersion>.
*/
/*!
@@ -535,12 +535,14 @@
d->glslOptions = options;
}
+#ifndef Q_OS_INTEGRITY // QTBUG-145990
inline size_t qHash(const QShaderBaker::GeneratedShader &k, size_t seed = 0)
{
return qHash(k.first, seed) ^ k.second.version();
}
+#endif
-QPair<QByteArray, QByteArray> QShaderBakerPrivate::compile()
+std::pair<QByteArray, QByteArray> QShaderBakerPrivate::compile()
{
QSpirvCompiler::Flags flags;
if
(spirvOptions.testFlag(QShaderBaker::SpirvOption::GenerateFullDebugInfo))
@@ -628,7 +630,7 @@
QHash<GeneratedShader, QByteArray> spirv;
QHash<GeneratedShader, QByteArray> batchableSpirv;
const auto compileSpirvAndBatchable = [this, &spirv,
&batchableSpirv](const GeneratedShader &key) {
- const QPair<QByteArray, QByteArray> bin = d->compile();
+ const std::pair<QByteArray, QByteArray> bin = d->compile();
if (bin.first.isEmpty())
return false;
spirv.insert(key, bin.first);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.11.0/src/shadertools/qshaderbaker.h
new/qtshadertools-everywhere-src-6.11.1/src/shadertools/qshaderbaker.h
--- old/qtshadertools-everywhere-src-6.11.0/src/shadertools/qshaderbaker.h
2026-03-09 10:39:29.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.11.1/src/shadertools/qshaderbaker.h
2026-05-07 21:59:30.000000000 +0200
@@ -49,7 +49,7 @@
void setSourceString(const QByteArray &sourceString, QShader::Stage stage,
const QString &fileName = QString());
- typedef QPair<QShader::Source, QShaderVersion> GeneratedShader;
+ using GeneratedShader = std::pair<QShader::Source, QShaderVersion>;
void setGeneratedShaders(const QList<GeneratedShader> &v);
void setGeneratedShaderVariants(const QList<QShader::Variant> &v);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.11.0/tests/auto/qshaderbaker/tst_qshaderbaker.cpp
new/qtshadertools-everywhere-src-6.11.1/tests/auto/qshaderbaker/tst_qshaderbaker.cpp
---
old/qtshadertools-everywhere-src-6.11.0/tests/auto/qshaderbaker/tst_qshaderbaker.cpp
2026-03-09 10:39:29.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.11.1/tests/auto/qshaderbaker/tst_qshaderbaker.cpp
2026-05-07 21:59:30.000000000 +0200
@@ -671,7 +671,7 @@
QVERIFY(nativeBindingMap.contains(2)); // same
// MSL has per-resource namespaces
- QPair<int, int> nativeBindingPair = nativeBindingMap.value(0);
+ std::pair<int, int> nativeBindingPair = nativeBindingMap.value(0);
QCOMPARE(nativeBindingPair.first, 0); // uniform buffer
nativeBindingPair = nativeBindingMap.value(1);
@@ -1171,7 +1171,7 @@
// the uniform buffer binding -> Metal buffer index mapping
QCOMPARE(s.nativeResourceBindingMap(QShaderKey(QShader::MslShader,
QShaderVersion(12))).size(), 1);
- QCOMPARE(s.nativeResourceBindingMap(QShaderKey(QShader::MslShader,
QShaderVersion(12))).value(0), qMakePair(0, -1));
+ QCOMPARE(s.nativeResourceBindingMap(QShaderKey(QShader::MslShader,
QShaderVersion(12))).value(0), std::make_pair(0, -1));
QVERIFY(s.shader(QShaderKey(QShader::MslShader,
QShaderVersion(12))).shader().contains(QByteArrayLiteral("[[ patch(triangle, 3)
]]")));
}
