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 2023-03-12 16:22:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Sun Mar 12 16:22:39 2023 rev:111 rq:1070858 version:5.104.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2023-02-13 16:39:31.582849252 +0100
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.31432/extra-cmake-modules.changes
2023-03-12 16:24:21.564794754 +0100
@@ -1,0 +2,12 @@
+Mon Mar 6 09:07:35 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 5.104.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.104.0
+- Changes since 5.103.0:
+ * Load translations for application-specific language also on Win and Mac
+ * ECMGenerateExportHeader: fix duplicated addition of deprecation macros code
+ * Find wayland.xml from wayland-scanner.pc
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.103.0.tar.xz
extra-cmake-modules-5.103.0.tar.xz.sig
New:
----
extra-cmake-modules-5.104.0.tar.xz
extra-cmake-modules-5.104.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.IStMcz/_old 2023-03-12 16:24:22.032796815 +0100
+++ /var/tmp/diff_new_pack.IStMcz/_new 2023-03-12 16:24:22.036796832 +0100
@@ -21,7 +21,7 @@
%global pkg_suffix -doc
%endif
-%define _tar_path 5.103
+%define _tar_path 5.104
# 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,7 +30,7 @@
# Only needed for the package signature condition
%bcond_without released
Name: extra-cmake-modules%{?pkg_suffix}
-Version: 5.103.0
+Version: 5.104.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.103.0.tar.xz -> extra-cmake-modules-5.104.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.103.0/CMakeLists.txt
new/extra-cmake-modules-5.104.0/CMakeLists.txt
--- old/extra-cmake-modules-5.103.0/CMakeLists.txt 2023-01-23
13:24:05.000000000 +0100
+++ new/extra-cmake-modules-5.104.0/CMakeLists.txt 2023-02-27
09:19:38.000000000 +0100
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.103.0") # handled by release scripts
+set(VERSION "5.104.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.103.0/find-modules/FindWayland.cmake
new/extra-cmake-modules-5.104.0/find-modules/FindWayland.cmake
--- old/extra-cmake-modules-5.103.0/find-modules/FindWayland.cmake
2023-01-23 13:24:05.000000000 +0100
+++ new/extra-cmake-modules-5.104.0/find-modules/FindWayland.cmake
2023-02-27 09:19:38.000000000 +0100
@@ -117,7 +117,7 @@
HANDLE_COMPONENTS
)
-pkg_get_variable(Wayland_DATADIR wayland-server pkgdatadir)
+pkg_get_variable(Wayland_DATADIR wayland-scanner pkgdatadir)
if (CMAKE_CROSSCOMPILING AND (NOT EXISTS "${Wayland_DATADIR}/wayland.xml"))
# PKG_CONFIG_SYSROOT_DIR only applies to -I and -L flags, so pkg-config
# does not prepend CMAKE_SYSROOT when cross-compiling unless you pass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.103.0/modules/ECMGenerateExportHeader.cmake
new/extra-cmake-modules-5.104.0/modules/ECMGenerateExportHeader.cmake
--- old/extra-cmake-modules-5.103.0/modules/ECMGenerateExportHeader.cmake
2023-01-23 13:24:05.000000000 +0100
+++ new/extra-cmake-modules-5.104.0/modules/ECMGenerateExportHeader.cmake
2023-02-27 09:19:38.000000000 +0100
@@ -749,9 +749,6 @@
endif()
endif()
- set(_header_file "${ARGS_EXPORT_FILE_NAME}")
- set(_header_work_file "${_header_file}.work")
-
# prepare optional arguments to pass through to generate_export_header
set(_include_guard_name_args)
if (ARGS_INCLUDE_GUARD_NAME)
@@ -773,10 +770,6 @@
if (ARGS_STATIC_DEFINE)
set(_static_define_args STATIC_DEFINE "${ARGS_STATIC_DEFINE}")
endif()
- # for older cmake versions we have to manually append our generated content
- # for newer we use CUSTOM_CONTENT_FROM_VARIABLE
- set(_custom_content_args)
- set(_custom_content_args CUSTOM_CONTENT_FROM_VARIABLE _output)
generate_export_header(${target}
BASE_NAME ${ARGS_BASE_NAME}
DEPRECATED_MACRO_NAME "${_macro_base_name}_DECL_DEPRECATED"
@@ -784,31 +777,8 @@
${_export_macro_name_args}
${_no_export_macro_name_args}
${_static_define_args}
- EXPORT_FILE_NAME "${_header_work_file}"
+ EXPORT_FILE_NAME "${ARGS_EXPORT_FILE_NAME}"
${_include_guard_name_args}
- ${_custom_content_args}
- )
-
- if (ARGS_INCLUDE_GUARD_NAME)
- set(_include_guard
"ECM_GENERATEEXPORTHEADER_${ARGS_INCLUDE_GUARD_NAME}")
- else()
- set(_include_guard
"ECM_GENERATEEXPORTHEADER_${_upper_base_name}_EXPORT_H")
- endif()
-
- file(APPEND ${_header_work_file} "
-
-#ifndef ${_include_guard}
-#define ${_include_guard}
-
-${_output}
-
-#endif /* ${_include_guard} */
-"
- )
-
- # avoid rebuilding if there was no change
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E copy_if_different "${_header_work_file}"
"${_header_file}"
+ CUSTOM_CONTENT_FROM_VARIABLE _output
)
- file(REMOVE "${_header_work_file}")
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.103.0/modules/ECMQmLoader.cpp.in
new/extra-cmake-modules-5.104.0/modules/ECMQmLoader.cpp.in
--- old/extra-cmake-modules-5.103.0/modules/ECMQmLoader.cpp.in 2023-01-23
13:24:05.000000000 +0100
+++ new/extra-cmake-modules-5.104.0/modules/ECMQmLoader.cpp.in 2023-02-27
09:19:38.000000000 +0100
@@ -6,6 +6,7 @@
*
* SPDX-FileCopyrightText: 2014 Aurélien Gâteau <[email protected]>
* SPDX-FileCopyrightText: 2015 Alex Merry <[email protected]>
+ * SPDX-FileCopyrightText: 2023 Ingo Klöcker <[email protected]>
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -18,6 +19,24 @@
namespace {
+ static QLocale getSystemLocale()
+ {
+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+ // On Windows and Apple OSs, we cannot use QLocale::system() if an
application-specific
+ // language was set by kxmlgui because Qt ignores LANGUAGE on Windows
and Apple OSs.
+ // The following code is a simplified variant of
QSystemLocale::fallbackUiLocale()
+ // (in qlocale_unix.cpp) ignoring LC_ALL, LC_MESSAGES, and LANG.
+ QString language = qEnvironmentVariable("LANGUAGE");
+ if (!language.isEmpty()) {
+ language = language.split(QLatin1Char{':'}).constFirst();
+ if (!language.isEmpty()) {
+ return QLocale{language};
+ }
+ }
+#endif
+ return QLocale::system();
+ }
+
enum class LoadOptions { CreateWatcher, DoNotCreateWatcher };
void load(LoadOptions options);
@@ -27,7 +46,7 @@
public:
LanguageChangeWatcher(QObject *parent) : QObject(parent)
{
- m_loadedLocale = QLocale::system().name();
+ m_loadedLocale = getSystemLocale().name();
QCoreApplication::instance()->installEventFilter(this);
}
@@ -35,8 +54,9 @@
bool eventFilter(QObject *obj, QEvent *event) override
{
if (event->type() == QEvent::LanguageChange) {
- if (m_loadedLocale != QLocale::system().name()) {
- m_loadedLocale = QLocale::system().name();
+ const auto systemLocaleName = getSystemLocale().name();
+ if (m_loadedLocale != systemLocaleName) {
+ m_loadedLocale = systemLocaleName;
load(LoadOptions::DoNotCreateWatcher);
}
}
@@ -79,7 +99,7 @@
// translation for the current locale to overload it.
loadTranslation(QStringLiteral("en"));
- QLocale locale = QLocale::system();
+ const QLocale locale = getSystemLocale();
if (locale.name() != QStringLiteral("en")) {
if (!loadTranslation(locale.name())) {
if (!loadTranslation(locale.bcp47Name())) {
