Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-virtualkeyboard for
openSUSE:Factory checked in at 2024-02-18 20:24:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-virtualkeyboard (Old)
and /work/SRC/openSUSE:Factory/.qt6-virtualkeyboard.new.1815 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-virtualkeyboard"
Sun Feb 18 20:24:20 2024 rev:24 rq:1147239 version:6.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-virtualkeyboard/qt6-virtualkeyboard.changes
2023-12-04 23:00:42.541885887 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-virtualkeyboard.new.1815/qt6-virtualkeyboard.changes
2024-02-18 20:24:54.833787599 +0100
@@ -1,0 +2,8 @@
+Wed Feb 14 16:53:36 UTC 2024 - Christophe Marin <[email protected]>
+
+- Update to 6.6.2
+ * https://www.qt.io/blog/qt-6.6.2-released
+- Add patch to make builds reproducible (QTBUG-121643):
+ * 0001-Link-VKB-and-VKB.Settings-into-VKB.Components-and-VK.patch
+
+-------------------------------------------------------------------
Old:
----
qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz
New:
----
0001-Link-VKB-and-VKB.Settings-into-VKB.Components-and-VK.patch
qtvirtualkeyboard-everywhere-src-6.6.2.tar.xz
BETA DEBUG BEGIN:
New:- Add patch to make builds reproducible (QTBUG-121643):
* 0001-Link-VKB-and-VKB.Settings-into-VKB.Components-and-VK.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-virtualkeyboard.spec ++++++
--- /var/tmp/diff_new_pack.PoL2a6/_old 2024-02-18 20:24:55.665817625 +0100
+++ /var/tmp/diff_new_pack.PoL2a6/_new 2024-02-18 20:24:55.665817625 +0100
@@ -16,7 +16,7 @@
#
-%define real_version 6.6.1
+%define real_version 6.6.2
%define short_version 6.6
%define tar_name qtvirtualkeyboard-everywhere-src
%define tar_suffix %{nil}
@@ -27,13 +27,15 @@
%endif
#
Name: qt6-virtualkeyboard%{?pkg_suffix}
-Version: 6.6.1
+Version: 6.6.2
Release: 0
Summary: Framework for writing or integrating input methods and engines
for Qt 6
License: GPL-3.0-only
URL: https://www.qt.io
Source:
https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
Source99: qt6-virtualkeyboard-rpmlintrc
+# PATCH-FIX-UPSTREAM -- make builds reproducible
+Patch0: 0001-Link-VKB-and-VKB.Settings-into-VKB.Components-and-VK.patch
BuildRequires: pkgconfig
BuildRequires: qt6-core-private-devel
BuildRequires: qt6-gui-private-devel
@@ -152,6 +154,7 @@
%files -n libQt6VirtualKeyboard6
%license LICENSES/*
%{_qt6_libdir}/libQt6VirtualKeyboard.so.*
+%{_qt6_libdir}/libQt6VirtualKeyboardSettings.so.*
%files -n qt6-virtualkeyboard-devel
%{_qt6_cmakedir}/Qt6/FindCerence*.cmake
@@ -169,8 +172,18 @@
%exclude %{_qt6_includedir}/QtVirtualKeyboard/%{real_version}/
%files -n qt6-virtualkeyboard-private-devel
+%{_qt6_cmakedir}/Qt6VirtualKeyboardSettings/
+%{_qt6_descriptionsdir}/VirtualKeyboardSettings.json
%{_qt6_includedir}/QtVirtualKeyboard/%{real_version}/
+%{_qt6_includedir}/QtVirtualKeyboardSettings/
+%{_qt6_libdir}/libQt6VirtualKeyboardSettings.prl
+%{_qt6_libdir}/libQt6VirtualKeyboardSettings.so
+%{_qt6_metatypesdir}/qt6virtualkeyboardsettings_*_metatypes.json
+%{_qt6_mkspecsdir}/modules/qt_lib_virtualkeyboardsettings.pri
+%{_qt6_mkspecsdir}/modules/qt_lib_virtualkeyboardsettings_private.pri
%{_qt6_mkspecsdir}/modules/qt_lib_virtualkeyboard_private.pri
+%{_qt6_pkgconfigdir}/Qt6VirtualKeyboardSettings.pc
+
### Private only library ###
++++++ 0001-Link-VKB-and-VKB.Settings-into-VKB.Components-and-VK.patch ++++++
>From c81e742f04195269e4c6db089da7351babaa505d Mon Sep 17 00:00:00 2001
From: Ulf Hermann <[email protected]>
Date: Tue, 30 Jan 2024 12:00:01 +0100
Subject: [PATCH] Link VKB and VKB.Settings into VKB.Components and VKB into
VKB.Styles
This forces the build system to build VirtualKeyboard and
VirtualKeyboardSettings first which makes their qmltypes available to
subsequent build steps.
Pick-to: 6.7 6.6
Task-number: QTBUG-121643
Change-Id: Ia0cdfe522d78c94eb87f7fd2cbaf6c2fdac954aa
Reviewed-by: Fabian Kosmale <[email protected]>
---
src/CMakeLists.txt | 2 +-
src/components/CMakeLists.txt | 2 ++
src/settings/CMakeLists.txt | 8 ++++----
src/styles/CMakeLists.txt | 1 +
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1551c2b..747defa 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,9 +4,9 @@
# Generated from src.pro.
add_subdirectory(virtualkeyboard)
+add_subdirectory(settings)
add_subdirectory(components)
add_subdirectory(layouts)
-add_subdirectory(settings)
add_subdirectory(styles)
add_subdirectory(plugin)
add_subdirectory(plugins)
diff --git a/src/components/CMakeLists.txt b/src/components/CMakeLists.txt
index 1ee450e..1343b6d 100644
--- a/src/components/CMakeLists.txt
+++ b/src/components/CMakeLists.txt
@@ -55,4 +55,6 @@ qt_internal_add_qml_module(qtvkbcomponentsplugin
Qt::Gui
Qt::Qml
Qt::Quick
+ Qt::VirtualKeyboard
+ Qt::VirtualKeyboardSettings
)
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index 08d5f28..9d4f37d 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -5,7 +5,7 @@
## qtvkbsettingsplugin Plugin:
#####################################################################
-qt_internal_add_qml_module(qtvkbsettingsplugin
+qt_internal_add_qml_module(VirtualKeyboardSettings
URI "QtQuick.VirtualKeyboard.Settings"
VERSION "${PROJECT_VERSION}"
PAST_MAJOR_VERSIONS 2 1
@@ -28,17 +28,17 @@ qt_internal_add_qml_module(qtvkbsettingsplugin
Qt::VirtualKeyboardPrivate
)
-qt_internal_extend_target(qtvkbsettingsplugin CONDITION
QT_FEATURE_vkb_no_builtin_style
+qt_internal_extend_target(VirtualKeyboardSettings CONDITION
QT_FEATURE_vkb_no_builtin_style
DEFINES
QT_VIRTUALKEYBOARD_DEFAULT_STYLE=""
)
-qt_internal_extend_target(qtvkbsettingsplugin CONDITION
QT_FEATURE_vkb_retro_style AND NOT QT_FEATURE_vkb_no_builtin_style
+qt_internal_extend_target(VirtualKeyboardSettings CONDITION
QT_FEATURE_vkb_retro_style AND NOT QT_FEATURE_vkb_no_builtin_style
DEFINES
QT_VIRTUALKEYBOARD_DEFAULT_STYLE="retro"
)
-qt_internal_extend_target(qtvkbsettingsplugin CONDITION NOT
QT_FEATURE_vkb_no_builtin_style AND NOT QT_FEATURE_vkb_retro_style
+qt_internal_extend_target(VirtualKeyboardSettings CONDITION NOT
QT_FEATURE_vkb_no_builtin_style AND NOT QT_FEATURE_vkb_retro_style
DEFINES
QT_VIRTUALKEYBOARD_DEFAULT_STYLE="default"
)
diff --git a/src/styles/CMakeLists.txt b/src/styles/CMakeLists.txt
index 8676e4a..ce8c779 100644
--- a/src/styles/CMakeLists.txt
+++ b/src/styles/CMakeLists.txt
@@ -48,4 +48,5 @@ qt_internal_add_qml_module(qtvkbstylesplugin
Qt::Qml
Qt::Quick
Qt::Svg
+ Qt::VirtualKeyboard
)
--
2.43.0
++++++ qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz ->
qtvirtualkeyboard-everywhere-src-6.6.2.tar.xz ++++++
++++ 2462 lines of diff (skipped)
