Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-ki18n for openSUSE:Factory checked in at 2024-10-12 13:25:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-ki18n (Old) and /work/SRC/openSUSE:Factory/.kf6-ki18n.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-ki18n" Sat Oct 12 13:25:27 2024 rev:8 rq:1207203 version:6.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-ki18n/kf6-ki18n.changes 2024-09-15 12:38:10.092952296 +0200 +++ /work/SRC/openSUSE:Factory/.kf6-ki18n.new.19354/kf6-ki18n.changes 2024-10-12 13:29:10.856870311 +0200 @@ -1,0 +2,13 @@ +Mon Oct 7 10:00:01 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.7.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.7.0 +- Changes since 6.6.0: + * Update dependency version to 6.7.0 + * Make KTranscript work in static builds + * Make QML API unit test work with static Qt builds + * Update version to 6.7.0 + +------------------------------------------------------------------- Old: ---- ki18n-6.6.0.tar.xz ki18n-6.6.0.tar.xz.sig New: ---- ki18n-6.7.0.tar.xz ki18n-6.7.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-ki18n.spec ++++++ --- /var/tmp/diff_new_pack.yt8UEK/_old 2024-10-12 13:29:11.348890704 +0200 +++ /var/tmp/diff_new_pack.yt8UEK/_new 2024-10-12 13:29:11.348890704 +0200 @@ -16,16 +16,16 @@ # -%define qt6_version 6.6.0 +%define qt6_version 6.7.0 %define rname ki18n -# Full KF6 version (e.g. 6.6.0) +# Full KF6 version (e.g. 6.7.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kf6-ki18n -Version: 6.6.0 +Version: 6.7.0 Release: 0 Summary: KDE Gettext-based UI text internationalization License: LGPL-2.1-or-later ++++++ ki18n-6.6.0.tar.xz -> ki18n-6.7.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/CMakeLists.txt new/ki18n-6.7.0/CMakeLists.txt --- old/ki18n-6.6.0/CMakeLists.txt 2024-09-06 13:37:46.000000000 +0200 +++ new/ki18n-6.7.0/CMakeLists.txt 2024-10-04 17:07:17.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "6.6.0") # handled by release scripts +set(KF_VERSION "6.7.0") # handled by release scripts project(KI18n VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 6.6.0 NO_MODULE) +find_package(ECM 6.7.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/autotests/CMakeLists.txt new/ki18n-6.7.0/autotests/CMakeLists.txt --- old/ki18n-6.6.0/autotests/CMakeLists.txt 2024-09-06 13:37:46.000000000 +0200 +++ new/ki18n-6.7.0/autotests/CMakeLists.txt 2024-10-04 17:07:17.000000000 +0200 @@ -5,10 +5,12 @@ find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Concurrent) if (BUILD_WITH_QML) -ecm_add_test(ki18ndeclarativetest.cpp - TEST_NAME "ki18n-declarativetest" - LINK_LIBRARIES Qt6::Test Qt6::Qml KF6::I18n -) + ecm_add_test(ki18ndeclarativetest.cpp) + target_link_libraries(ki18ndeclarativetest PRIVATE Qt6::Test Qt6::Qml KF6::I18n) + qt6_add_qml_module(ki18ndeclarativetest URI "org.kde.i18n.declarativetest" QML_FILES Test.qml) + if (NOT QT6_IS_SHARED_LIBS_BUILD) + qt6_import_qml_plugins(ki18ndeclarativetest) + endif() endif() ecm_add_test(klocalizedstringtest.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/autotests/Test.qml new/ki18n-6.7.0/autotests/Test.qml --- old/ki18n-6.6.0/autotests/Test.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/ki18n-6.7.0/autotests/Test.qml 2024-10-04 17:07:17.000000000 +0200 @@ -0,0 +1,14 @@ +import QtQml 2.1 + +QtObject +{ + readonly property real numOne: 1 + readonly property real numThree: 3 + property string nullString + readonly property string testString: i18n("Awesome") + readonly property string testStringSingular: i18np("and %1 other window", "and %1 other windows", numOne); + readonly property string testStringPlural: i18np("and %1 other window", "and %1 other windows", numThree); + readonly property string testStringPluralWithDomain: i18ndp("plasma_lookandfeel_org.kde.lookandfeel", "in 1 second", "in %1 seconds", 3); + readonly property string testNullStringArg: i18n("Awesome %1", nullString) + readonly property string testZero: i18n("I'm %1 years old", 0) +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/autotests/ki18ndeclarativetest.cpp new/ki18n-6.7.0/autotests/ki18ndeclarativetest.cpp --- old/ki18n-6.6.0/autotests/ki18ndeclarativetest.cpp 2024-09-06 13:37:46.000000000 +0200 +++ new/ki18n-6.7.0/autotests/ki18ndeclarativetest.cpp 2024-10-04 17:07:17.000000000 +0200 @@ -4,9 +4,8 @@ SPDX-License-Identifier: LGPL-2.0-or-later */ -#include <QQmlComponent> +#include <QQmlApplicationEngine> #include <QQmlContext> -#include <QQmlEngine> #include <QTest> #include <KLocalizedContext> @@ -37,17 +36,13 @@ KLocalizedContext ctx; QUrl input = QUrl::fromLocalFile(QFINDTESTDATA("test.qml")); - QQmlEngine engine; + QQmlApplicationEngine engine; engine.rootContext()->setContextObject(&ctx); - QQmlComponent component(&engine, input, QQmlComponent::PreferSynchronous); - QObject *object = component.create(); - - if (!object) { - qDebug() << "errors:" << component.errors(); - } - + engine.loadFromModule("org.kde.i18n.declarativetest", "Test"); + QVERIFY(!engine.hasError()); + QCOMPARE(engine.rootObjects().size(), 1); + QObject *object = engine.rootObjects().at(0); QVERIFY(object); - QVERIFY(!component.isLoading()); QCOMPARE(object->property(propertyName.toUtf8().constData()).toString(), value); } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/autotests/ktranscripttest.cpp new/ki18n-6.7.0/autotests/ktranscripttest.cpp --- old/ki18n-6.6.0/autotests/ktranscripttest.cpp 2024-09-06 13:37:46.000000000 +0200 +++ new/ki18n-6.7.0/autotests/ktranscripttest.cpp 2024-10-04 17:07:17.000000000 +0200 @@ -5,6 +5,9 @@ SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL */ + +#include "config.h" + #include "ktranscripttest.h" #include "testhelpers.h" @@ -18,7 +21,11 @@ QTEST_MAIN(KTranscriptTest) extern "C" { +#if HAVE_STATIC_KTRANSCRIPT +extern KTranscript *load_transcript(); +#else typedef KTranscript *(*InitFunc)(); +#endif } KTranscriptTest::KTranscriptTest() @@ -30,6 +37,9 @@ { QVERIFY2(deployTestConfig(), "Could not deploy test ktranscript.ini"); +#if HAVE_STATIC_KTRANSCRIPT + m_transcript = load_transcript(); +#else QString pluginPath = QStringLiteral(KTRANSCRIPT_PATH); QVERIFY2(QFile::exists(pluginPath), "Could not find ktranscript plugin"); @@ -39,6 +49,7 @@ InitFunc initf = (InitFunc)m_library.resolve("load_transcript"); QVERIFY(initf); m_transcript = initf(); +#endif QVERIFY(m_transcript); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/autotests/test.qml new/ki18n-6.7.0/autotests/test.qml --- old/ki18n-6.6.0/autotests/test.qml 2024-09-06 13:37:46.000000000 +0200 +++ new/ki18n-6.7.0/autotests/test.qml 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -import QtQml 2.1 - -QtObject -{ - readonly property real numOne: 1 - readonly property real numThree: 3 - property string nullString - readonly property string testString: i18n("Awesome") - readonly property string testStringSingular: i18np("and %1 other window", "and %1 other windows", numOne); - readonly property string testStringPlural: i18np("and %1 other window", "and %1 other windows", numThree); - readonly property string testStringPluralWithDomain: i18ndp("plasma_lookandfeel_org.kde.lookandfeel", "in 1 second", "in %1 seconds", 3); - readonly property string testNullStringArg: i18n("Awesome %1", nullString) - readonly property string testZero: i18n("I'm %1 years old", 0) -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/po/el/ki18n6.po new/ki18n-6.7.0/po/el/ki18n6.po --- old/ki18n-6.6.0/po/el/ki18n6.po 2024-09-06 13:37:46.000000000 +0200 +++ new/ki18n-6.7.0/po/el/ki18n6.po 2024-10-04 17:07:17.000000000 +0200 @@ -29,8 +29,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 20.04.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 20.04.2\n" #. i18n: Decide which string is used to delimit keys in a keyboard #. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/src/i18n/CMakeLists.txt new/ki18n-6.7.0/src/i18n/CMakeLists.txt --- old/ki18n-6.6.0/src/i18n/CMakeLists.txt 2024-09-06 13:37:46.000000000 +0200 +++ new/ki18n-6.7.0/src/i18n/CMakeLists.txt 2024-10-04 17:07:17.000000000 +0200 @@ -1,3 +1,8 @@ +if (NOT BUILD_SHARED_LIBS AND BUILD_WITH_QML) + set(HAVE_STATIC_KTRANSCRIPT ON) +else() + set(HAVE_STATIC_KTRANSCRIPT OFF) +endif() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h") add_library(KF6I18n) @@ -85,7 +90,11 @@ ### ktranscript plugin if (BUILD_WITH_QML) -add_library(ktranscript MODULE) +if (BUILD_SHARED_LIBS) + add_library(ktranscript MODULE) +else() + add_library(ktranscript) +endif() target_sources(ktranscript PRIVATE ktranscript.cpp @@ -94,7 +103,12 @@ generate_export_header(ktranscript BASE_NAME KTranscript) target_link_libraries(ktranscript PRIVATE Qt6::Qml Qt6::Core) -install(TARGETS ktranscript DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6) +if (BUILD_SHARED_LIBS) + install(TARGETS ktranscript DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6) +else() + target_link_libraries(KF6I18n PRIVATE ktranscript) + install(TARGETS ktranscript EXPORT KF6I18nTargets DESTINATION ${KF_INSTALL_TARGETS_DEFAULT_ARGS}) +endif() endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/src/i18n/config.h.in new/ki18n-6.7.0/src/i18n/config.h.in --- old/ki18n-6.6.0/src/i18n/config.h.in 2024-09-06 13:37:46.000000000 +0200 +++ new/ki18n-6.7.0/src/i18n/config.h.in 2024-10-04 17:07:17.000000000 +0200 @@ -11,4 +11,6 @@ #define INSTALLED_LOCALE_PREFIX "@IsoCodes_PREFIX@" +#cmakedefine01 HAVE_STATIC_KTRANSCRIPT + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ki18n-6.6.0/src/i18n/klocalizedstring.cpp new/ki18n-6.7.0/src/i18n/klocalizedstring.cpp --- old/ki18n-6.6.0/src/i18n/klocalizedstring.cpp 2024-09-06 13:37:46.000000000 +0200 +++ new/ki18n-6.7.0/src/i18n/klocalizedstring.cpp 2024-10-04 17:07:17.000000000 +0200 @@ -7,6 +7,8 @@ // We don't want i18n to be expanded to i18nd here #undef TRANSLATION_DOMAIN +#include "config.h" + #include <cstdlib> #include <QByteArray> @@ -1278,7 +1280,11 @@ } extern "C" { +#if HAVE_STATIC_KTRANSCRIPT +extern KTranscript *load_transcript(); +#else typedef KTranscript *(*InitFunc)(); +#endif } void KLocalizedStringPrivate::loadTranscript() @@ -1290,6 +1296,9 @@ s->loadTranscriptCalled = true; s->ktrs = nullptr; // null indicates that Transcript is not available +#if HAVE_STATIC_KTRANSCRIPT + s->ktrs = load_transcript(); +#else // QPluginLoader is just used to find the plugin QPluginLoader loader(QStringLiteral("kf6/ktranscript")); if (loader.fileName().isEmpty()) { @@ -1311,6 +1320,7 @@ } s->ktrs = initf(); +#endif } QString KLocalizedString::localizedFilePath(const QString &filePath)
