Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2022-12-12 17:37:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Mon Dec 12 17:37:36 2022 rev:108 rq:1042095 version:5.101.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2022-11-15 13:18:45.260357282 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1835/extra-cmake-modules.changes
2022-12-12 17:39:15.189044917 +0100
@@ -1,0 +2,13 @@
+Tue Dec 6 20:10:19 UTC 2022 - Christophe Marin <[email protected]>
+
+- Update to 5.101.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.101.0
+- Changes since 5.100.0:
+ * KDEInstallDirsCommon.cmake http://www.x86-64.org/documentation/abi.pdf
does not work
+ * Add ZSHAUTOCOMPLETEDIR to KDEInstallDirs
+ * Fix ECMQmlModule for static plugins
+ * Watch for language changes to load the new appropiate qm files
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.100.0.tar.xz
extra-cmake-modules-5.100.0.tar.xz.sig
New:
----
extra-cmake-modules-5.101.0.tar.xz
extra-cmake-modules-5.101.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.rl5LyI/_old 2022-12-12 17:39:15.689047440 +0100
+++ /var/tmp/diff_new_pack.rl5LyI/_new 2022-12-12 17:39:15.697047479 +0100
@@ -21,7 +21,7 @@
%global pkg_suffix -doc
%endif
-%define _tar_path 5.100
+%define _tar_path 5.101
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -30,11 +30,10 @@
# Only needed for the package signature condition
%bcond_without released
Name: extra-cmake-modules%{?pkg_suffix}
-Version: 5.100.0
+Version: 5.101.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
-Group: Development/Tools/Other
URL: https://www.kde.org
Source: extra-cmake-modules-%{version}.tar.xz
%if %{with released}
++++++ extra-cmake-modules-5.100.0.tar.xz -> extra-cmake-modules-5.101.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.100.0/CMakeLists.txt
new/extra-cmake-modules-5.101.0/CMakeLists.txt
--- old/extra-cmake-modules-5.100.0/CMakeLists.txt 2022-11-05
16:07:16.000000000 +0100
+++ new/extra-cmake-modules-5.101.0/CMakeLists.txt 2022-11-27
08:38:55.000000000 +0100
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.100.0") # handled by release scripts
+set(VERSION "5.101.0") # handled by release scripts
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.100.0/find-modules/FindCanberra.cmake
new/extra-cmake-modules-5.101.0/find-modules/FindCanberra.cmake
--- old/extra-cmake-modules-5.100.0/find-modules/FindCanberra.cmake
2022-11-05 16:07:16.000000000 +0100
+++ new/extra-cmake-modules-5.101.0/find-modules/FindCanberra.cmake
2022-11-27 08:38:55.000000000 +0100
@@ -73,7 +73,7 @@
include(FeatureSummary)
set_package_properties(Canberra PROPERTIES
DESCRIPTION "Event sound library"
- URL "http://0pointer.de/lennart/projects/libcanberra";
+ URL "https://0pointer.de/lennart/projects/libcanberra";
)
# Compatibility variables. In a previous life FindCanberra lived
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
new/extra-cmake-modules-5.101.0/kde-modules/KDEInstallDirs5.cmake
--- old/extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
2022-11-05 16:07:16.000000000 +0100
+++ new/extra-cmake-modules-5.101.0/kde-modules/KDEInstallDirs5.cmake
2022-11-27 08:38:55.000000000 +0100
@@ -154,6 +154,9 @@
``SYSTEMDUSERUNITDIR``
Systemd User Units (``lib/systemd/user``)
[``SYSTEMD_USER_UNIT_INSTALL_DIR``]. Since 5.65
+``ZSHAUTOCOMPLETEDIR``
+ Zsh functions and autocompletion definitions (``zsh/site-functions``)
+ Since 5.101
If ``KDE_INSTALL_USE_QT_SYS_PATHS`` is set to ``TRUE`` before including this
module, the default values for some variables are instead queried from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
new/extra-cmake-modules-5.101.0/kde-modules/KDEInstallDirsCommon.cmake
--- old/extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
2022-11-05 16:07:16.000000000 +0100
+++ new/extra-cmake-modules-5.101.0/kde-modules/KDEInstallDirsCommon.cmake
2022-11-27 08:38:55.000000000 +0100
@@ -21,7 +21,7 @@
# - we are NOT on flatpak
# - we are NOT on NixOS
# - we are on a 64 bits system
-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+# reason is: amd64 ABI:
https://gitlab.com/x86-psABIs/x86-64-ABI/-/jobs/artifacts/master/raw/x86-64-ABI/abi.pdf?job=build
# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
# See https://wiki.debian.org/Multiarch
@@ -352,7 +352,8 @@
_define_relative(SYSTEMDUSERUNITDIR SYSTEMDUNITDIR "user"
"Systemd user units"
SYSTEMD_USER_UNIT_INSTALL_DIR)
-
+_define_relative(ZSHAUTOCOMPLETEDIR DATAROOTDIR "zsh/site-functions"
+ "Zsh functions and autocompletion definitions")
set(_default_sysconf_dir "etc")
if (CMAKE_INSTALL_PREFIX STREQUAL "/usr")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.100.0/modules/ECMQmLoader.cpp.in
new/extra-cmake-modules-5.101.0/modules/ECMQmLoader.cpp.in
--- old/extra-cmake-modules-5.100.0/modules/ECMQmLoader.cpp.in 2022-11-05
16:07:16.000000000 +0100
+++ new/extra-cmake-modules-5.101.0/modules/ECMQmLoader.cpp.in 2022-11-27
08:38:55.000000000 +0100
@@ -18,6 +18,35 @@
namespace {
+ enum class LoadOptions { CreateWatcher, DoNotCreateWatcher };
+
+ void load(LoadOptions options);
+
+ class LanguageChangeWatcher : public QObject
+ {
+ public:
+ LanguageChangeWatcher(QObject *parent) : QObject(parent)
+ {
+ m_loadedLocale = QLocale::system().name();
+ QCoreApplication::instance()->installEventFilter(this);
+ }
+
+ private:
+ bool eventFilter(QObject *obj, QEvent *event) override
+ {
+ if (event->type() == QEvent::LanguageChange) {
+ if (m_loadedLocale != QLocale::system().name()) {
+ m_loadedLocale = QLocale::system().name();
+ load(LoadOptions::DoNotCreateWatcher);
+ }
+ }
+ return QObject::eventFilter(obj, event);
+ }
+
+
+ QString m_loadedLocale;
+ };
+
bool loadTranslation(const QString &localeDirName)
{
QString subPath = QStringLiteral("locale/") + localeDirName +
QStringLiteral("/LC_MESSAGES/@[email protected]");
@@ -42,7 +71,7 @@
return true;
}
- void load()
+ void load(LoadOptions options)
{
// The way Qt translation system handles plural forms makes it
necessary to
// have a translation file which contains only plural forms for `en`.
That's
@@ -61,6 +90,10 @@
}
}
}
+
+ if (options == LoadOptions::CreateWatcher) {
+ new LanguageChangeWatcher(QCoreApplication::instance());
+ }
}
// Helper to call load() on the main thread.
@@ -80,7 +113,7 @@
protected:
void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE
{
- load();
+ load(LoadOptions::CreateWatcher);
this->deleteLater();
}
};
@@ -93,7 +126,7 @@
// QCoreApplication::installTranslator needs to be called on the main
// thread, because it uses QCoreApplication::sendEvent.
if (QThread::currentThread() ==
QCoreApplication::instance()->thread()) {
- load();
+ load(LoadOptions::CreateWatcher);
} else {
// QObjects inherit their parent object's thread
Loader *loader = new Loader();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.100.0/modules/ECMQmlModule.cmake
new/extra-cmake-modules-5.101.0/modules/ECMQmlModule.cmake
--- old/extra-cmake-modules-5.100.0/modules/ECMQmlModule.cmake 2022-11-05
16:07:16.000000000 +0100
+++ new/extra-cmake-modules-5.101.0/modules/ECMQmlModule.cmake 2022-11-27
08:38:55.000000000 +0100
@@ -205,7 +205,7 @@
set(_qrc_template "<!-- This file was automatically generated by
ECMQmlModule and should not be modified -->")
- string(APPEND _qrc_template "\n<RCC>\n<qresource
prefix=\"/${_qml_prefix}\">")
+ string(APPEND _qrc_template "\n<RCC>\n<qresource
prefix=\"/qt-project.org/imports/${_qml_prefix}\">")
string(APPEND _qrc_template "\n<file
alias=\"qmldir\">${_qmldir_file}</file>")
foreach(_file ${_qml_files})
@@ -359,6 +359,10 @@
if (NOT BUILD_SHARED_LIBS)
_ecm_qmlmodule_generate_qrc(${ARG_TARGET})
+ set(CPP_RESOURCE_INIT "#include <qglobal.h> \n#include <QDebug> \n
void initQmlResource${ARG_TARGET}() {Q_INIT_RESOURCE(${ARG_TARGET});
qWarning()<<Q_FUNC_INFO;};")
+ file(WRITE ${ARGS_TARGET}_init.cpp "${CPP_RESOURCE_INIT}")
+ target_sources(${ARG_TARGET} PRIVATE ${ARGS_TARGET}_init.cpp)
+ target_compile_definitions(${ARG_TARGET} PRIVATE
-DQT_PLUGIN_RESOURCE_INIT_FUNCTION=initQmlResource${ARG_TARGET}
-DQT_STATICPLUGIN=1)
if (${_qml_only})
# If we do not have any C++ sources for the target, we need a way
to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.100.0/modules/ECMQmlModule.cpp.in
new/extra-cmake-modules-5.101.0/modules/ECMQmlModule.cpp.in
--- old/extra-cmake-modules-5.100.0/modules/ECMQmlModule.cpp.in 2022-11-05
16:07:16.000000000 +0100
+++ new/extra-cmake-modules-5.101.0/modules/ECMQmlModule.cpp.in 2022-11-27
08:38:55.000000000 +0100
@@ -7,6 +7,4 @@
void QmlModule::registerTypes(const char* uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("@_qml_uri@"));
-
- Q_INIT_RESOURCE(@ARG_TARGET@);
}
