Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-translations for
openSUSE:Factory checked in at 2025-02-03 21:43:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-translations (Old)
and /work/SRC/openSUSE:Factory/.qt6-translations.new.2316 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-translations"
Mon Feb 3 21:43:08 2025 rev:34 rq:1242072 version:6.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-translations/qt6-translations.changes
2024-12-05 17:07:53.571714053 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-translations.new.2316/qt6-translations.changes
2025-02-03 21:43:21.862112547 +0100
@@ -1,0 +2,6 @@
+Fri Jan 31 10:23:02 UTC 2025 - Christophe Marin <[email protected]>
+
+- Update to 6.8.2
+ https://www.qt.io/blog/qt-6.8.2-released
+
+-------------------------------------------------------------------
Old:
----
qttranslations-everywhere-src-6.8.1.tar.xz
New:
----
qttranslations-everywhere-src-6.8.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-translations.spec ++++++
--- /var/tmp/diff_new_pack.hP7lzW/_old 2025-02-03 21:43:22.834152669 +0100
+++ /var/tmp/diff_new_pack.hP7lzW/_new 2025-02-03 21:43:22.838152834 +0100
@@ -16,13 +16,13 @@
#
-%define real_version 6.8.1
+%define real_version 6.8.2
%define short_version 6.8
%define tar_name qttranslations-everywhere-src
%define tar_suffix %{nil}
#
Name: qt6-translations
-Version: 6.8.1
+Version: 6.8.2
Release: 0
Summary: Qt 6 Translations
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
@@ -40,7 +40,8 @@
%autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix}
%build
-%cmake_qt6
+%cmake_qt6 \
+ -DQT_GENERATE_SBOM:BOOL=FALSE
%{qt6_build}
++++++ qttranslations-everywhere-src-6.8.1.tar.xz ->
qttranslations-everywhere-src-6.8.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qttranslations-everywhere-src-6.8.1/.cmake.conf
new/qttranslations-everywhere-src-6.8.2/.cmake.conf
--- old/qttranslations-everywhere-src-6.8.1/.cmake.conf 2024-11-21
05:36:35.000000000 +0100
+++ new/qttranslations-everywhere-src-6.8.2/.cmake.conf 2025-01-24
11:26:57.000000000 +0100
@@ -1 +1 @@
-set(QT_REPO_MODULE_VERSION "6.8.1")
+set(QT_REPO_MODULE_VERSION "6.8.2")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qttranslations-everywhere-src-6.8.1/.tag
new/qttranslations-everywhere-src-6.8.2/.tag
--- old/qttranslations-everywhere-src-6.8.1/.tag 2024-11-21
05:36:35.000000000 +0100
+++ new/qttranslations-everywhere-src-6.8.2/.tag 2025-01-24
11:26:57.000000000 +0100
@@ -1 +1 @@
-50f37ffa46535e330e2d223b5d41ea0ca7d86b48
+6a47261ffdbf3a694e8867f984f61daded03d291
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qttranslations-everywhere-src-6.8.1/CMakeLists.txt
new/qttranslations-everywhere-src-6.8.2/CMakeLists.txt
--- old/qttranslations-everywhere-src-6.8.1/CMakeLists.txt 2024-11-21
05:36:35.000000000 +0100
+++ new/qttranslations-everywhere-src-6.8.2/CMakeLists.txt 2025-01-24
11:26:57.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2022 The Qt Company Ltd.
+# Copyright (C) 2024 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
cmake_minimum_required(VERSION 3.16)
@@ -6,7 +6,7 @@
include(.cmake.conf)
project(QtTranslations
VERSION "${QT_REPO_MODULE_VERSION}"
- DESCRIPTION "Qt Translations"
+ DESCRIPTION "QtTranslations"
HOMEPAGE_URL "https://qt.io/";
LANGUAGES CXX C
)
@@ -17,12 +17,5 @@
set(QT_REPO_NOT_WARNINGS_CLEAN TRUE)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals
Core)
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Linguist)
-qt_internal_project_setup()
-include(QtSetup) # for qt_install
-
-if(TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::lupdate AND TARGET
${QT_CMAKE_EXPORT_NAMESPACE}::lconvert)
- add_subdirectory(translations)
-else()
- message(STATUS "Skipping adding translation custom targets due to missing
lupdate or lconvert.")
-endif()
+qt_build_repo()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qttranslations-everywhere-src-6.8.1/dependencies.yaml
new/qttranslations-everywhere-src-6.8.2/dependencies.yaml
--- old/qttranslations-everywhere-src-6.8.1/dependencies.yaml 2024-11-21
05:36:35.000000000 +0100
+++ new/qttranslations-everywhere-src-6.8.2/dependencies.yaml 2025-01-24
11:26:57.000000000 +0100
@@ -1,4 +1,4 @@
dependencies:
../qttools:
- ref: b0d66c51cbda17b213bed73d379f0900c77f457c
+ ref: 8aa2456d4461516f54c98916fcd699557afb41ad
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qttranslations-everywhere-src-6.8.1/licenseRule.json
new/qttranslations-everywhere-src-6.8.2/licenseRule.json
--- old/qttranslations-everywhere-src-6.8.1/licenseRule.json 1970-01-01
01:00:00.000000000 +0100
+++ new/qttranslations-everywhere-src-6.8.2/licenseRule.json 2025-01-24
11:26:57.000000000 +0100
@@ -0,0 +1,47 @@
+[
+ {
+ "comment" : ["file_pattern_ending: strings matched against the end of
a file name.",
+ "location keys: regular expression matched against the
beginning of",
+ "the file path (relative to the git submodule root).",
+ "spdx: list of SPDX-License-Expression's allowed in the
matching files.",
+ "-------------------------------------------------------",
+ "Files with the following endings are Build System
licensed,",
+ "unless they are examples",
+ "Files with other endings can also be build system files"
+ ],
+ "file_pattern_ending" : ["CMakeLists.txt", ".cmake"],
+ "location" : {
+ "" : {
+ "comment" : "Default",
+ "file type" : "build system",
+ "spdx" : ["BSD-3-Clause"]
+ }
+ }
+ },
+ {
+ "comments" : ["Files with the following endings are Tool licensed,",
+ "unless they are examples.",
+ "Files with other endings can also be tool files."],
+ "file_pattern_ending" : [".pl"],
+ "location" :{
+ "" : {
+ "comment" : "Default",
+ "file type" : "tools and utils",
+ "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH
Qt-GPL-exception-1.0"]
+ }
+ }
+ },
+ {
+ "comment" : ["All other files",
+ "The licensing is defined only by the file location in
the Qt module repository.",
+ "NO <file_pattern_ending> key for this case!",
+ "This needs to be the last entry of the file."],
+ "location" : {
+ "" : {
+ "comment" : "Default",
+ "file type" : "module and plugin",
+ "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR
GPL-2.0-only OR GPL-3.0-only"]
+ }
+ }
+ }
+]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qttranslations-everywhere-src-6.8.1/src/CMakeLists.txt
new/qttranslations-everywhere-src-6.8.2/src/CMakeLists.txt
--- old/qttranslations-everywhere-src-6.8.1/src/CMakeLists.txt 1970-01-01
01:00:00.000000000 +0100
+++ new/qttranslations-everywhere-src-6.8.2/src/CMakeLists.txt 2025-01-24
11:26:57.000000000 +0100
@@ -0,0 +1,8 @@
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(TARGET ${QT_CMAKE_EXPORT_NAMESPACE}::lupdate AND TARGET
${QT_CMAKE_EXPORT_NAMESPACE}::lconvert)
+ add_subdirectory(../translations translations)
+else()
+ message(STATUS "Skipping adding translation custom targets due to missing
lupdate or lconvert.")
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qttranslations-everywhere-src-6.8.1/translations/CMakeLists.txt
new/qttranslations-everywhere-src-6.8.2/translations/CMakeLists.txt
--- old/qttranslations-everywhere-src-6.8.1/translations/CMakeLists.txt
2024-11-21 05:36:35.000000000 +0100
+++ new/qttranslations-everywhere-src-6.8.2/translations/CMakeLists.txt
2025-01-24 11:26:57.000000000 +0100
@@ -1,7 +1,13 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: BSD-3-Clause
+# Avoid running xmllint on each ts file to extract the ts file language.
+# We only need to do that for qt apps, not the qt translations. Speeds up
+# configuration of the repo on macOS hosts.
+set(QT_SKIP_STORE_LANGUAGES_FROM_TS_FILES TRUE)
+
add_custom_target(ts-all)
+add_custom_target(ts-untranslated)
set(repo_root_directory "${CMAKE_CURRENT_SOURCE_DIR}/../..")
set(en_ts_file_dir "${CMAKE_CURRENT_BINARY_DIR}/en_ts")
@@ -23,13 +29,22 @@
# Create a rudimentary .ts file in ${en_ts_file_dir}.
function(generate_empty_ts_file file_name)
if(NOT EXISTS "${en_ts_file_dir}/${file_name}")
- file(WRITE "${en_ts_file_dir}/${file_name}" "<TS></TS>")
+ file(WRITE "${en_ts_file_dir}/${file_name}" "<TS
language=\"en_US\"></TS>")
endif()
endfunction()
-function(add_ts_target target input_file output_file)
+function(add_ts_target target input_file)
+ set(no_value_options "")
+ set(single_value_options "")
+ set(multi_value_options TS_FILES)
+ cmake_parse_arguments(PARSE_ARGV 2 arg
+ "${no_value_options}" "${single_value_options}"
"${multi_value_options}"
+ )
+ _qt_internal_validate_all_args_are_parsed(arg)
add_custom_target(${target}
- COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::lupdate -locations relative
-no-ui-lines -no-sort "@${input_file}" -ts ${output_file}
+ COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::lupdate -locations relative
-no-ui-lines -no-sort
+ "@${input_file}" -ts ${arg_TS_FILES}
+ VERBATIM
)
endfunction()
@@ -42,7 +57,7 @@
set(languages)
foreach(file IN LISTS ts_files)
- if(file MATCHES "([a-z][a-z](_[A-Z][A-Z])?).ts$")
+ if(file MATCHES "_([a-z][a-z](_[A-Z][A-Z])?).ts$")
list(APPEND languages ${CMAKE_MATCH_1})
endif()
endforeach()
@@ -101,26 +116,38 @@
CONTENT "${file_list_string}"
)
- add_custom_target(ts-${catalog}-all)
- add_dependencies(ts-all ts-${catalog}-all)
+ set(ts_files "")
foreach(lang IN LISTS languages)
set(lang_target_name ts-${catalog}-${lang})
+ set(ts_file "${CMAKE_CURRENT_SOURCE_DIR}/${catalog}_${lang}.ts")
+ list(APPEND ts_files "${ts_file}")
add_ts_target(${lang_target_name}
${source_files_list_file}
- "${CMAKE_CURRENT_SOURCE_DIR}/${catalog}_${lang}.ts"
+ TS_FILES "${ts_file}"
)
- add_dependencies(ts-${catalog}-all ${lang_target_name})
if(NOT TARGET ts-${lang})
add_custom_target(ts-${lang})
endif()
add_dependencies(ts-${lang} ${lang_target_name})
endforeach()
+
+ # Add a qtfoo_untranslated.ts file. Such files should not be committed.
+ # They are meant to quickly create a template for a new language.
+ set(untranslated_ts_file
"${CMAKE_CURRENT_SOURCE_DIR}/${catalog}_untranslated.ts")
+ list(APPEND ts_files "${untranslated_ts_file}")
add_ts_target(ts-${catalog}-untranslated
${source_files_list_file}
- "${CMAKE_CURRENT_SOURCE_DIR}/${catalog}_untranslated.ts"
+ TS_FILES "${untranslated_ts_file}"
)
- add_dependencies(ts-${catalog}-all ts-${catalog}-untranslated)
+ add_dependencies(ts-untranslated ts-${catalog}-untranslated)
+
+ # Create a ts-qtfoo-all target that updates all ts files for this catalog
in one go.
+ add_ts_target(ts-${catalog}-all
+ ${source_files_list_file}
+ TS_FILES ${ts_files}
+ )
+ add_dependencies(ts-all ts-${catalog}-all)
endfunction()
# Create the English "translation" for "qt".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qttranslations-everywhere-src-6.8.1/translations/qt_sv.ts
new/qttranslations-everywhere-src-6.8.2/translations/qt_sv.ts
--- old/qttranslations-everywhere-src-6.8.1/translations/qt_sv.ts
2024-11-21 05:36:35.000000000 +0100
+++ new/qttranslations-everywhere-src-6.8.2/translations/qt_sv.ts
2025-01-24 11:26:57.000000000 +0100
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0">
+<TS version="2.0" language="sv">
<context>
<name>MAC_APPLICATION_MENU</name>
<message>
