Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kf6-ktexttemplate for
openSUSE:Factory checked in at 2025-11-17 12:12:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-ktexttemplate (Old)
and /work/SRC/openSUSE:Factory/.kf6-ktexttemplate.new.2061 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-ktexttemplate"
Mon Nov 17 12:12:04 2025 rev:21 rq:1317914 version:6.20.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kf6-ktexttemplate/kf6-ktexttemplate.changes
2025-10-12 22:23:56.240650300 +0200
+++
/work/SRC/openSUSE:Factory/.kf6-ktexttemplate.new.2061/kf6-ktexttemplate.changes
2025-11-17 12:19:03.566842338 +0100
@@ -1,0 +2,13 @@
+Thu Nov 13 20:58:59 UTC 2025 - Christophe Marin <[email protected]>
+
+- Update to 6.20.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/6/6.20.0
+- Changes since 6.19.0:
+ * Update dependency version to 6.20.0
+ * Use QCOMPARE vs QVERIFY
+ * Update test expectation. Qt time formatting has changed
+ * Update version to 6.20.0
+
+-------------------------------------------------------------------
Old:
----
ktexttemplate-6.19.0.tar.xz
ktexttemplate-6.19.0.tar.xz.sig
New:
----
ktexttemplate-6.20.0.tar.xz
ktexttemplate-6.20.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-ktexttemplate.spec ++++++
--- /var/tmp/diff_new_pack.sAjNOR/_old 2025-11-17 12:19:04.706890411 +0100
+++ /var/tmp/diff_new_pack.sAjNOR/_new 2025-11-17 12:19:04.710890580 +0100
@@ -19,11 +19,11 @@
%define qt6_version 6.8.0
%define rname ktexttemplate
-# Full KF6 version (e.g. 6.19.0)
+# Full KF6 version (e.g. 6.20.0)
%{!?_kf6_version: %global _kf6_version %{version}}
%bcond_without released
Name: kf6-ktexttemplate
-Version: 6.19.0
+Version: 6.20.0
Release: 0
Summary: String template library
License: LGPL-2.1-or-later
++++++ ktexttemplate-6.19.0.tar.xz -> ktexttemplate-6.20.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ktexttemplate-6.19.0/CMakeLists.txt
new/ktexttemplate-6.20.0/CMakeLists.txt
--- old/ktexttemplate-6.19.0/CMakeLists.txt 2025-10-05 14:39:44.000000000
+0200
+++ new/ktexttemplate-6.20.0/CMakeLists.txt 2025-11-07 20:03:34.000000000
+0100
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "6.19.0") # handled by release scripts
+set(KF_VERSION "6.20.0") # handled by release scripts
project(KTextTemplate VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 6.19.0 CONFIG)
+find_package(ECM 6.20.0 CONFIG)
set_package_properties(ECM PROPERTIES
TYPE REQUIRED
DESCRIPTION "Extra CMake Modules."
@@ -20,7 +20,7 @@
include(KDEGitCommitHooks)
include(ECMGenerateQDoc)
-set(REQUIRED_QT_VERSION 6.7.0)
+set(REQUIRED_QT_VERSION 6.8.0)
find_package(Qt6Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
find_package(Qt6Qml ${REQUIRED_QT_VERSION} NO_MODULE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ktexttemplate-6.19.0/autotests/testbuiltins.cpp
new/ktexttemplate-6.20.0/autotests/testbuiltins.cpp
--- old/ktexttemplate-6.19.0/autotests/testbuiltins.cpp 2025-10-05
14:39:44.000000000 +0200
+++ new/ktexttemplate-6.20.0/autotests/testbuiltins.cpp 2025-11-07
20:03:34.000000000 +0100
@@ -430,7 +430,7 @@
QFETCH(QVariant, input);
QFETCH(bool, expected);
- QVERIFY(variantIsTrue(input) == expected);
+ QCOMPARE(variantIsTrue(input), expected);
}
void TestBuiltinSyntax::testRenderAfterError()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/ktexttemplate-6.19.0/autotests/testinternationalization.cpp
new/ktexttemplate-6.20.0/autotests/testinternationalization.cpp
--- old/ktexttemplate-6.19.0/autotests/testinternationalization.cpp
2025-10-05 14:39:44.000000000 +0200
+++ new/ktexttemplate-6.20.0/autotests/testinternationalization.cpp
2025-11-07 20:03:34.000000000 +0100
@@ -292,9 +292,15 @@
QTest::newRow("fragment-01") << QStringLiteral(
"{% i18n '%1 messages at %2, fraction of total: %3. "
"Rating : %4' _(1000) _(date) _(0.6) _(4.8) %}")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral(
+ "1000 messages at 7 05 2005, fraction
of total: 0.60. "
+ "Rating : 4.80")
+#else
<< QStringLiteral(
"1000 messages at 7 May 2005, fraction
of total: 0.60. "
"Rating : 4.80")
+#endif
<< QStringLiteral("1,000 messages at 5/7/05,
fraction of total: 0.60. Rating : 4.80")
<< QStringLiteral(
"1,000 messages at 07/05/2005,
fraction of total: "
@@ -312,9 +318,15 @@
QTest::newRow("fragment-02") << QStringLiteral(
"{% i18n '%1 messages at %2, fraction of total: %3. Rating : %4' "
"_(integer) _(date) _(smallFloat) _(largeFloat) %}")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral(
+ "1000 messages at 7 05 2005, fraction
of total: 0.60. "
+ "Rating : 4.80")
+#else
<< QStringLiteral(
"1000 messages at 7 May 2005, fraction
of total: 0.60. "
"Rating : 4.80")
+#endif
<< QStringLiteral("1,000 messages at 5/7/05,
fraction of total: 0.60. Rating : 4.80")
<< QStringLiteral(
"1,000 messages at 07/05/2005,
fraction of total: "
@@ -331,9 +343,15 @@
QTest::newRow("fragment-03") << QStringLiteral(
"{{ _(integer) }} -- {{ _(date) }} -- {{ _(smallFloat) }} -- {{ "
"_(largeFloat) }} -- {{ _(time) }} -- {{ _(dateTime) }}")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral(
+ "1000 -- 7 05 2005 -- 0.60 -- 4.80 --
04:05 -- 7 "
+ "05 2005 04:05")
+#else
<< QStringLiteral(
"1000 -- 7 May 2005 -- 0.60 -- 4.80 --
04:05:06 -- 7 "
"May 2005 04:05:06")
+#endif
<< QStringLiteral("1,000 -- 5/7/05 -- 0.60 --
4.80 -- 4:05 AM -- 5/7/05 4:05 AM")
<< QStringLiteral("1,000 -- 07/05/2005 --
0.60 -- 4.80 -- 04:05 -- 07/05/2005 04:05")
<< QStringLiteral("1.000 -- 07.05.05 -- 0,60
-- 4,80 -- 04:05 -- 07.05.05 04:05")
@@ -356,6 +374,21 @@
"_(smallFloat) }} -- {{ _(largeFloat) }} -- {{ _(time) }} -- {{ "
"_(dateTime) }}"
"{% endwith_locale %}")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QString::fromUtf8(
+ "Today"
+ " -- 1000 -- 7 05 2005 -- 0.60 -- 4.80
-- 04:05 -- 7 05 "
+ "2005 "
+ "04:05"
+ "Heute"
+ " -- 1.000 -- 07.05.05 -- 0,60 -- 4,80
-- 04:05 -- 07.05.05 "
+ "04:05"
+ "Aujourd'hui"
+ " -- 1" FR_THOUSAND_SEPARATOR
+ "000 -- 07/05/2005 -- 0,60 -- 4,80 --
04:05 -- "
+ "07/05/2005 "
+ "04:05")
+#else
<< QString::fromUtf8(
"Today"
" -- 1000 -- 7 May 2005 -- 0.60 --
4.80 -- 04:05:06 -- 7 May "
@@ -369,6 +402,7 @@
"000 -- 07/05/2005 -- 0,60 -- 4,80 --
04:05 -- "
"07/05/2005 "
"04:05")
+#endif
<< QString::fromUtf8(
"Today"
" -- 1,000 -- 5/7/05 -- 0.60 -- 4.80
-- 4:05 AM -- 5/7/05 4:05 "
@@ -438,6 +472,24 @@
"_(smallFloat) }} -- {{ _(largeFloat) }} -- {{ _(time) }} -- {{ "
"_(dateTime) }}"
"{% endwith_locale %}")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QString::fromUtf8(
+ "Today"
+ " -- 1000 -- 7 05 2005 -- 0.60 -- 4.80
-- 04:05 -- 7 05 "
+ "2005 "
+ "04:05"
+ "Heute"
+ " -- 1.000 -- 07.05.05 -- 0,60 -- 4,80
-- 04:05 -- 07.05.05 "
+ "04:05"
+ "Aujourd'hui"
+ " -- 1" FR_THOUSAND_SEPARATOR
+ "000 -- 07/05/2005 -- 0,60 -- 4,80 --
04:05 -- "
+ "07/05/2005 "
+ "04:05"
+ "Heute"
+ " -- 1.000 -- 07.05.05 -- 0,60 -- 4,80
-- 04:05 -- 07.05.05 "
+ "04:05")
+#else
<< QString::fromUtf8(
"Today"
" -- 1000 -- 7 May 2005 -- 0.60 --
4.80 -- 04:05:06 -- 7 May "
@@ -454,6 +506,7 @@
"Heute"
" -- 1.000 -- 07.05.05 -- 0,60 -- 4,80
-- 04:05 -- 07.05.05 "
"04:05")
+#endif
<< QString::fromUtf8(
"Today"
" -- 1,000 -- 5/7/05 -- 0.60 -- 4.80
-- 4:05 AM -- 5/7/05 4:05 "
@@ -614,21 +667,41 @@
Dict dict;
dict.insert(QStringLiteral("date"), QDate(2005, 5, 7));
- QTest::newRow("safe-01") << QStringLiteral("{% i18n 'Today is %1' _(date)
%}") << QStringLiteral("Today is 7 May 2005")
+ QTest::newRow("safe-01") << QStringLiteral("{% i18n 'Today is %1' _(date)
%}")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("Today is 7 05 2005")
+#else
+ << QStringLiteral("Today is 7 May 2005")
+#endif
<< QStringLiteral("Aujourd'hui est
07/05/2005") << dict;
QTest::newRow("safe-02") << QStringLiteral("{% autoescape off %}{% i18n
'Today is %1' _(date) %}{% endautoescape %}")
- << QStringLiteral("Today is 7 May 2005") <<
QStringLiteral("Aujourd'hui est 07/05/2005") << dict;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("Today is 7 05 2005")
+#else
+ << QStringLiteral("Today is 7 May 2005")
+#endif
+ << QStringLiteral("Aujourd'hui est 07/05/2005")
<< dict;
QTest::newRow("safe-03") << QStringLiteral(
"{% i18n_var 'Today is %1' _(date) as today_greeting %}-{{ "
- "today_greeting }}-") << QStringLiteral("-Today is 7 May 2005-")
+ "today_greeting }}-")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("-Today is 7 05 2005-")
+#else
+ << QStringLiteral("-Today is 7 May 2005-")
+#endif
<< QStringLiteral("-Aujourd'hui est
07/05/2005-") << dict;
QTest::newRow("safe-04") << QStringLiteral(
"{% autoescape off %}{% i18n_var 'Today is %1' _(date) as
today_greeting "
"%}-{{ today_greeting }}-{% endautoescape %}")
- << QStringLiteral("-Today is 7 May 2005-") <<
QStringLiteral("-Aujourd'hui est 07/05/2005-") << dict;
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("-Today is 7 05 2005-")
+#else
+ << QStringLiteral("-Today is 7 May 2005-")
+#endif
+ << QStringLiteral("-Aujourd'hui est 07/05/2005-")
<< dict;
QTest::newRow("safe-05") << QStringLiteral("{% with 'Today' as rawText
%}-{{ _(rawText) }}-{% endwith %}") << QStringLiteral("-Today-")
<< QStringLiteral("-Aujourd'hui-") << dict;
@@ -801,11 +874,21 @@
QTest::addColumn<QString>("deDate");
QTest::addColumn<QString>("frDate");
- QTest::newRow("date-01") << QDate(2010, 5, 9) << QStringLiteral("9 May
2010") << QStringLiteral("5/9/10") << QStringLiteral("09/05/2010")
- << QStringLiteral("09.05.10") <<
QStringLiteral("09/05/2010");
-
- QTest::newRow("date-02") << QDate(2010, 10, 11) << QStringLiteral("11 Oct
2010") << QStringLiteral("10/11/10") << QStringLiteral("11/10/2010")
- << QStringLiteral("11.10.10") <<
QStringLiteral("11/10/2010");
+ QTest::newRow("date-01") << QDate(2010, 5, 9)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("9 05 2010")
+#else
+ << QStringLiteral("9 May 2010")
+#endif
+ << QStringLiteral("5/9/10") <<
QStringLiteral("09/05/2010") << QStringLiteral("09.05.10") <<
QStringLiteral("09/05/2010");
+
+ QTest::newRow("date-02") << QDate(2010, 10, 11)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("11 10 2010")
+#else
+ << QStringLiteral("11 Oct 2010")
+#endif
+ << QStringLiteral("10/11/10") <<
QStringLiteral("11/10/2010") << QStringLiteral("11.10.10") <<
QStringLiteral("11/10/2010");
}
void TestInternationalization::testIntegers()
@@ -903,14 +986,29 @@
QTest::addColumn<QString>("deTime");
QTest::addColumn<QString>("frTime");
- QTest::newRow("time-01") << QTime(5, 6, 7) << QStringLiteral("05:06:07")
<< QStringLiteral("05:06:07") << QStringLiteral("5:06 AM")
- << QStringLiteral("05:06") <<
QStringLiteral("05:06") << QStringLiteral("05:06");
-
- QTest::newRow("time-02") << QTime(11, 12, 13) <<
QStringLiteral("11:12:13") << QStringLiteral("11:12:13") <<
QStringLiteral("11:12 AM")
- << QStringLiteral("11:12") <<
QStringLiteral("11:12") << QStringLiteral("11:12");
-
- QTest::newRow("time-03") << QTime(15, 12, 13) <<
QStringLiteral("15:12:13") << QStringLiteral("15:12:13") <<
QStringLiteral("3:12 PM")
- << QStringLiteral("15:12") <<
QStringLiteral("15:12") << QStringLiteral("15:12");
+ QTest::newRow("time-01") << QTime(5, 6, 7) << QStringLiteral("05:06:07")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("05:06")
+#else
+ << QStringLiteral("05:06:07")
+#endif
+ << QStringLiteral("5:06 AM") <<
QStringLiteral("05:06") << QStringLiteral("05:06") << QStringLiteral("05:06");
+
+ QTest::newRow("time-02") << QTime(11, 12, 13) << QStringLiteral("11:12:13")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("11:12")
+#else
+ << QStringLiteral("11:12:13")
+#endif
+ << QStringLiteral("11:12 AM") <<
QStringLiteral("11:12") << QStringLiteral("11:12") << QStringLiteral("11:12");
+
+ QTest::newRow("time-03") << QTime(15, 12, 13) << QStringLiteral("15:12:13")
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("15:12")
+#else
+ << QStringLiteral("15:12:13")
+#endif
+ << QStringLiteral("3:12 PM") <<
QStringLiteral("15:12") << QStringLiteral("15:12") << QStringLiteral("15:12");
}
void TestInternationalization::testDateTimes()
@@ -939,25 +1037,57 @@
QTest::addColumn<QString>("deDateTime");
QTest::addColumn<QString>("frDateTime");
- QTest::newRow("datetime-01") << QDateTime(QDate(2005, 6, 7), QTime(5, 6,
7)) << QStringLiteral("7 Jun 2005 05:06:07") << QStringLiteral("6/7/05 5:06 AM")
- << QStringLiteral("07/06/2005 05:06") <<
QStringLiteral("07.06.05 05:06") << QStringLiteral("07/06/2005 05:06");
-
- QTest::newRow("datetime-02") << QDateTime(QDate(2005, 6, 7), QTime(11, 12,
13)) << QStringLiteral("7 Jun 2005 11:12:13")
+ QTest::newRow("datetime-01") << QDateTime(QDate(2005, 6, 7), QTime(5, 6,
7))
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("7 06 2005 05:06")
+#else
+ << QStringLiteral("7 Jun 2005 05:06:07")
+#endif
+ << QStringLiteral("6/7/05 5:06 AM") <<
QStringLiteral("07/06/2005 05:06") << QStringLiteral("07.06.05 05:06")
+ << QStringLiteral("07/06/2005 05:06");
+
+ QTest::newRow("datetime-02") << QDateTime(QDate(2005, 6, 7), QTime(11, 12,
13))
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("7 06 2005 11:12")
+#else
+ << QStringLiteral("7 Jun 2005 11:12:13")
+#endif
<< QStringLiteral("6/7/05 11:12 AM") <<
QStringLiteral("07/06/2005 11:12") << QStringLiteral("07.06.05 11:12")
<< QStringLiteral("07/06/2005 11:12");
- QTest::newRow("datetime-03") << QDateTime(QDate(2005, 6, 7), QTime(15, 12,
13)) << QStringLiteral("7 Jun 2005 15:12:13") << QStringLiteral("6/7/05 3:12
PM")
- << QStringLiteral("07/06/2005 15:12") <<
QStringLiteral("07.06.05 15:12") << QStringLiteral("07/06/2005 15:12");
-
- QTest::newRow("datetime-04") << QDateTime(QDate(2005, 10, 11), QTime(5, 6,
7)) << QStringLiteral("11 Oct 2005 05:06:07")
+ QTest::newRow("datetime-03") << QDateTime(QDate(2005, 6, 7), QTime(15, 12,
13))
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("7 06 2005 15:12")
+#else
+ << QStringLiteral("7 Jun 2005 15:12:13")
+#endif
+ << QStringLiteral("6/7/05 3:12 PM") <<
QStringLiteral("07/06/2005 15:12") << QStringLiteral("07.06.05 15:12")
+ << QStringLiteral("07/06/2005 15:12");
+
+ QTest::newRow("datetime-04") << QDateTime(QDate(2005, 10, 11), QTime(5, 6,
7))
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("11 10 2005 05:06")
+#else
+ << QStringLiteral("11 Oct 2005 05:06:07")
+#endif
<< QStringLiteral("10/11/05 5:06 AM") <<
QStringLiteral("11/10/2005 05:06") << QStringLiteral("11.10.05 05:06")
<< QStringLiteral("11/10/2005 05:06");
- QTest::newRow("datetime-05") << QDateTime(QDate(2005, 10, 11), QTime(11,
12, 13)) << QStringLiteral("11 Oct 2005 11:12:13")
+ QTest::newRow("datetime-05") << QDateTime(QDate(2005, 10, 11), QTime(11,
12, 13))
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("11 10 2005 11:12")
+#else
+ << QStringLiteral("11 Oct 2005 11:12:13")
+#endif
<< QStringLiteral("10/11/05 11:12 AM") <<
QStringLiteral("11/10/2005 11:12") << QStringLiteral("11.10.05 11:12")
<< QStringLiteral("11/10/2005 11:12");
- QTest::newRow("datetime-06") << QDateTime(QDate(2005, 10, 11), QTime(15,
12, 13)) << QStringLiteral("11 Oct 2005 15:12:13")
+ QTest::newRow("datetime-06") << QDateTime(QDate(2005, 10, 11), QTime(15,
12, 13))
+#if QT_VERSION >= QT_VERSION_CHECK(6, 11, 0)
+ << QStringLiteral("11 10 2005 15:12")
+#else
+ << QStringLiteral("11 Oct 2005 15:12:13")
+#endif
<< QStringLiteral("10/11/05 3:12 PM") <<
QStringLiteral("11/10/2005 15:12") << QStringLiteral("11.10.05 15:12")
<< QStringLiteral("11/10/2005 15:12");
}
++++++ ktexttemplate-6.19.0.tar.xz.sig -> ktexttemplate-6.20.0.tar.xz.sig ++++++
---
/work/SRC/openSUSE:Factory/kf6-ktexttemplate/ktexttemplate-6.19.0.tar.xz.sig
2025-10-12 22:23:56.752671738 +0200
+++
/work/SRC/openSUSE:Factory/.kf6-ktexttemplate.new.2061/ktexttemplate-6.20.0.tar.xz.sig
2025-11-17 12:19:04.058863086 +0100
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNATURE-----
-iHUEABYKAB0WIQSQqWisqEU3zCe5nq8sjfWHptSqwQUCaOJnEgAKCRAsjfWHptSq
-wfStAP0eFZcww8kwMq/Ps8lq1zslRzR2udPt8y6O+SOndIvb2QEA8PqVBE0vHRXM
-eWXmEamhMvLfDJ90ZkdmXB24ysuKZQo=
-=gOxu
+iHUEABYKAB0WIQSQqWisqEU3zCe5nq8sjfWHptSqwQUCaQ5ChwAKCRAsjfWHptSq
+wRaiAQCsFFVc+SBGsqzhq9YslvESG6Ufnw9GJjMmF1gxx2TGtwEAu33042qL9nNx
+W+yjgbSzoDq1LcrzPnuWL3u7JU2CBwA=
+=lIRs
-----END PGP SIGNATURE-----
