From 9e585c15b1592398dd8d84fe6b7eb2d09994c7bcb7277791be079fceffe3adb1 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 18 Feb 2025 08:34:28 +0000 Subject: [PATCH] - Update to 0.11.0: * Features: + Highlight public XMPP provider titles while card is expanded + Round corners of cards and buttons + Add fading in/out hover effect to map previews + Collapse contact profiles by default if they have more than 3 entries + Show colored check mark for delivered messages instead of none to avoid message bubble resizing * Bugfixes: + Fix opening public MUC-based group chats via another XMPP client + Fix playing voice messages and changing playing position + Fix updating message reactions that could not be sent instead of adding them a second time + Fix updating group chat users in user interface + Fix displaying message reaction details + Update filtering contacts by labels even if label list is not open anymore + Fix scrolling media overview + Fix updating draft messages * Notes: + Kaidan requires Qt 6.6 now - Add drop_quick_compiler_option.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaidan?expand=0&rev=45 --- drop_quick_compiler_option.patch | 66 +++++++++++++++++++ kaidan-0.10.1.tar.xz | 3 - kaidan-0.10.1.tar.xz.sig | 16 ----- kaidan-0.11.0.tar.xz | 3 + kaidan-0.11.0.tar.xz.sig | 16 +++++ kaidan.changes | 26 ++++++++ kaidan.spec | 107 ++++++++++++++++--------------- 7 files changed, 166 insertions(+), 71 deletions(-) create mode 100644 drop_quick_compiler_option.patch delete mode 100644 kaidan-0.10.1.tar.xz delete mode 100644 kaidan-0.10.1.tar.xz.sig create mode 100644 kaidan-0.11.0.tar.xz create mode 100644 kaidan-0.11.0.tar.xz.sig diff --git a/drop_quick_compiler_option.patch b/drop_quick_compiler_option.patch new file mode 100644 index 0000000..ecb7140 --- /dev/null +++ b/drop_quick_compiler_option.patch @@ -0,0 +1,66 @@ +From c02e132951d0807418fdc86824c0e65923cb0346 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= + +Date: Sun, 16 Feb 2025 23:28:46 +0100 +Subject: [PATCH] CMakeLists: Remove the QUICK_COMPILER option + +The Qt6QuickCompiler package and the qtquick_compiler_add_resources are +no longer available on Qt 6. There is a new QML script compiler, but it +requires adding the QML with qt_add_qml_module: +https://doc.qt.io/qt-6/qtqml-qml-script-compiler.html +--- + CMakeLists.txt | 10 ---------- + src/CMakeLists.txt | 9 ++------- + 2 files changed, 2 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7e20082ed..5eba63627 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,6 @@ option(BUILD_TESTS "Build unit tests" FALSE) + option(APPIMAGE "Build Kaidan as AppImage (will only work in the appimage script)" FALSE) + option(UBUNTU_TOUCH "Building an Ubuntu Touch click (internal use only!)" FALSE) + option(CLICK_ARCH "Architecture that will be used in the click's manifest") +-option(QUICK_COMPILER "Use QtQuick compiler to improve performance" FALSE) + option(USE_KNOTIFICATIONS "Use KNotifications for displaying notifications" TRUE) + option(BUNDLE_ICONS "Bundle breeze icons" FALSE) + +@@ -90,15 +89,6 @@ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) + # QML modules + ecm_find_qmlmodule(org.kde.kquickimageeditor 1.0) + +-# Optional QtQuickCompiler +-if(QUICK_COMPILER) +- find_package(Qt6QuickCompiler) +- set_package_properties(Qt6QuickCompiler PROPERTIES +- DESCRIPTION "Compile QML at build time" +- TYPE OPTIONAL +- ) +-endif() +- + if(USE_KNOTIFICATIONS) + find_package(KF6Notifications ${KF_MIN_VERSION} REQUIRED) + set(__KF6Notifications_LIBRARIES KF6::Notifications) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 353301bcf..513ac280f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -242,13 +242,8 @@ ecm_add_app_icon(KAIDAN_ICNS ICONS ${ICONS_SRCS}) + message(STATUS ${KAIDAN_ICNS}) + target_sources(${PROJECT_NAME} PRIVATE ${KAIDAN_ICNS}) + +-# QML files +-if(QUICK_COMPILER) +- qtquick_compiler_add_resources(COMPILED_QML_QRC qml/qml.qrc) +- target_sources(${PROJECT_NAME} PRIVATE ${COMPILED_QML_QRC}) +-else() +- target_sources(${PROJECT_NAME} PRIVATE qml/qml.qrc) +-endif() ++qt_add_resources(QML_QRC qml/qml.qrc) ++target_sources(${PROJECT_NAME} PRIVATE ${QML_QRC}) + + ecm_create_qm_loader(${PROJECT_NAME} kaidan_qt) + +-- +GitLab + diff --git a/kaidan-0.10.1.tar.xz b/kaidan-0.10.1.tar.xz deleted file mode 100644 index 9e1ae5e..0000000 --- a/kaidan-0.10.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d28ec1cb9bdd44f4b73c23c651b1adfa233981f6d7b1c760e8a7a72c1cdc6f16 -size 3064212 diff --git a/kaidan-0.10.1.tar.xz.sig b/kaidan-0.10.1.tar.xz.sig deleted file mode 100644 index 8b64ae2..0000000 --- a/kaidan-0.10.1.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEErgjFkKfREsGXnQaLBO+tD3pNlyQFAmddx84ACgkQBO+tD3pN -lySlCQ//TwKYza5ekg6VGtQ53trO0H9MIDHAHN6na3OvL1xXhrl/A3hz19A7A9b1 -sU6CQhP3Hvq6X3QUgDNV9JW3BKcMsLUxoBtJlhZVDdd9HEOsu1FwofzXjDQM0vn+ -8NB0NoInT9tn80ynHjCmKRt6QMXdgUOlvUWFh0fIAWgNK3o/ScnDKHiGNTurpvUj -cCgkRE2RaDaGhnn5IFjCYfGGbC1vM5KcwWDKzBCjt/RQML4OrnrZq2NUg2BXiLm5 -iJoZmnk+XqdTwUVSa8Mpww4OtwQP0qmh2XyKbpOGK3ekPowJCbj2AXf6WcLuMAuY -eaWaJjpCa8/7W7zK6xsOxhqzbodZV1hkvkPRS2imxqeC+8Gx+KGD+o/RneBX+Uat -QgDwMhVuIJDFGiuG9UshozVo1QoBWF5OY4qb/9eYwLiVDc/JIl5Ho5FarP39qurM -o6iocDOc8VnnySbd32ialSkxPq8f754NI0/iJkSFDwZgCGz4HntZXXDgy6KImCui -jK1Se0mX7/OXyZl9x+icbXz5PDMPQvghuZ8bjQNhjLvOj7QE5s6ldAQSPk5+TiSK -oylTXBcXKqygu8S3w2MKbLXESgjUPaLBZFVpzrmRVv5lWkBKb917ScJD2wc47qlg -KlhjCH+3PN+nNIO2Af58buMppXVBa6uu7YkK/R00OF+V/umawmI= -=HW6J ------END PGP SIGNATURE----- diff --git a/kaidan-0.11.0.tar.xz b/kaidan-0.11.0.tar.xz new file mode 100644 index 0000000..79fd605 --- /dev/null +++ b/kaidan-0.11.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3feef43d66ff5c30ae81894a7343da1856ca84b0177b8a07922f193ca33776a2 +size 874168 diff --git a/kaidan-0.11.0.tar.xz.sig b/kaidan-0.11.0.tar.xz.sig new file mode 100644 index 0000000..5c6e2ff --- /dev/null +++ b/kaidan-0.11.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEErgjFkKfREsGXnQaLBO+tD3pNlyQFAmewagQACgkQBO+tD3pN +lyQdAg/+PNx2HbrodFwXeRJjQg44b5FfSJ3ZfxclpM0dEZJfQYaQqBo6gCZ6HgR3 +CeYm9Ft8dQ/naaR3YQL2iPp0gKby9OnnykriG1t4okpsDfUcdmQP1rDlm5RvWHnk +9bxEgO4px1v7VI918rLmkO39KtAfUkYpHJ97KbADy9m5wp+xq+ULXzmw0WimilqC +DoWuvVP4wpUfrivz2jeY9b7CHZkXhXnkNcHalVjkJCBICYfraqPgqPsBmPaaIhcA +C0FdHt86wv6Y8GZZV28Br51IiB5f83gx//axujp3Bx9m/5J1Aa+TmzeQs/6gEZkT +kvjLcxcJehMQqddbBqG6OPKzFqr1bMXyRUYCy/MumTNg6uKcYZ9bwM+w4VK7m0uE +Dyvh4hh35RhXKJJOK64vM6PECDYghpHVUFOyH4ke2b52LzGh7Jh2ElyhSzAuNf3E +ZiKYzi7wYHqobuxyvWMwGE1PYyDOLTy46wtehGt5wqHBTwr7xPLjadTEWIjG8t4N +lI+uQTGc9VYCL2uSPXW6VEGyP3R6cVYMIi5fPNl5Pl0W2lpG/u4p47q+czu2wmW2 +ZkAwGLWX2SoYl/oRmO6McxxWtKECPl6b9LAjDmV/PNIefaKJWBvRBr5ITsFb+NH4 +sdwxSJ5+WUOb1PHtHT3KYL9GooLsE8KjqKaidcKpS2miwAVo9v8= +=Lgqu +-----END PGP SIGNATURE----- diff --git a/kaidan.changes b/kaidan.changes index 86b2f5c..fa9045f 100644 --- a/kaidan.changes +++ b/kaidan.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sun Feb 16 22:36:37 UTC 2025 - Jaime Marquínez Ferrándiz + +- Update to 0.11.0: + * Features: + + Highlight public XMPP provider titles while card is expanded + + Round corners of cards and buttons + + Add fading in/out hover effect to map previews + + Collapse contact profiles by default if they have more than 3 entries + + Show colored check mark for delivered messages instead of none to avoid + message bubble resizing + * Bugfixes: + + Fix opening public MUC-based group chats via another XMPP client + + Fix playing voice messages and changing playing position + + Fix updating message reactions that could not be sent instead of adding + them a second time + + Fix updating group chat users in user interface + + Fix displaying message reaction details + + Update filtering contacts by labels even if label list is not open + anymore + + Fix scrolling media overview + + Fix updating draft messages + * Notes: + + Kaidan requires Qt 6.6 now +- Add drop_quick_compiler_option.patch + ------------------------------------------------------------------- Sun Dec 15 09:05:42 UTC 2024 - Christophe Marin diff --git a/kaidan.spec b/kaidan.spec index e10d45b..a439173 100644 --- a/kaidan.spec +++ b/kaidan.spec @@ -1,7 +1,7 @@ # # spec file for package kaidan # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: kaidan -Version: 0.10.1 +Version: 0.11.0 Release: 0 Summary: A XMPP client based on KDE Framework License: AML AND GPL-3.0-or-later AND SUSE-GPL-3.0+-with-openssl-exception AND MIT AND CC-BY-SA-4.0 @@ -25,50 +25,53 @@ URL: https://www.kaidan.im Source0: https://download.kde.org/unstable/%{name}/%{version}/%{name}-%{version}.tar.xz Source1: https://download.kde.org/unstable/%{name}/%{version}/%{name}-%{version}.tar.xz.sig Source2: kaidan.keyring -BuildRequires: cmake >= 3.3 -BuildRequires: extra-cmake-modules >= 5.40.0 -%if 0%{?suse_version} == 1500 -BuildRequires: gcc13-c++ -BuildRequires: gcc13-PIE -%endif +# PATCH-FIX-UPSTREAM: https://invent.kde.org/network/kaidan/-/merge_requests/1328 +Patch0: drop_quick_compiler_option.patch +BuildRequires: cmake >= 3.16 +BuildRequires: kf6-extra-cmake-modules >= 6.6.0 # Both Qt 5 and Qt 6 flavors use the same cmake config name, use the -devel package name # BuildRequires: cmake(KQuickImageEditor) -BuildRequires: kquickimageeditor-devel +BuildRequires: kquickimageeditor6-devel +BuildRequires: fdupes BuildRequires: pkgconfig -BuildRequires: cmake(KF5CoreAddons) >= 5.67.0 -BuildRequires: cmake(KF5KIO) >= 5.67.0 -BuildRequires: cmake(KF5Kirigami2) >= 5.67.0 -BuildRequires: cmake(KF5KirigamiAddons) >= 0.10.0 -BuildRequires: cmake(KF5Notifications) -BuildRequires: cmake(KF5QQC2DeskopStyle) -BuildRequires: cmake(QXmppQt5) >= 1.9.0 -BuildRequires: cmake(Qt5Concurrent) -BuildRequires: cmake(Qt5Core) >= 5.15.0 -BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: cmake(Qt5Location) -BuildRequires: cmake(Qt5Multimedia) -BuildRequires: cmake(Qt5Positioning) -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5QuickCompiler) -BuildRequires: cmake(Qt5QuickControls2) -BuildRequires: cmake(Qt5Sql) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Widgets) -BuildRequires: cmake(Qt5Xml) +BuildRequires: qt6-declarative-tools >= 6.6.0 +BuildRequires: cmake(KF6CoreAddons) >= 6.6.0 +BuildRequires: cmake(KF6Crash) +BuildRequires: cmake(KF6KIO) >= 6.6.0 +BuildRequires: cmake(KF6Kirigami2) >= 6.6.0 +BuildRequires: cmake(KF6KirigamiAddons) >= 1.4.0 +BuildRequires: cmake(KF6Notifications) +BuildRequires: cmake(KF6Prison) +BuildRequires: cmake(KF6QQC2DesktopStyle) +BuildRequires: cmake(QXmppQt6) >= 1.9.0 +BuildRequires: cmake(Qt6Concurrent) +BuildRequires: cmake(Qt6Core) >= 6.6.0 +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(Qt6Location) +BuildRequires: cmake(Qt6Multimedia) +BuildRequires: cmake(Qt6Positioning) +BuildRequires: cmake(Qt6Qml) +BuildRequires: cmake(Qt6Quick) +BuildRequires: cmake(Qt6QuickControls2) +BuildRequires: cmake(Qt6Sql) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Xml) BuildRequires: cmake(ZXing) >= 1.0.8 BuildRequires: pkgconfig(icu-uc) -Requires: kirigami-addons >= 0.7.0 -Requires: kirigami2 >= 5.67.0 -Requires: kquickimageeditor-imports -Requires: libqt5-qtquickcontrols2 -Requires: libQt5Location5 -Requires: libQt5PositioningQuick5 +Requires: kf6-kirigami-imports >= 6.6.0 +Requires: kf6-prison-imports +Requires: kirigami-addons6 >= 1.4.0 +Requires: kquickimageeditor6-imports +Requires: qt6-declarative-imports +Requires: qt6-location +Requires: qt6-multimedia-imports +Requires: qt6-positioning-imports %description Kaidan is a simple Jabber/XMPP client providing a user-interface using Kirigami and QtQuick. The back-end of Kaidan is entirely written in C++ -using the qxmpp XMPP client library and Qt 5. +using the qxmpp XMPP client library and Qt 6. %lang_package @@ -76,28 +79,28 @@ using the qxmpp XMPP client library and Qt 5. %autosetup -p1 %build -%if 0%{?suse_version} == 1500 -export CXX=g++-13 -%endif -%cmake_kf5 -d build '-DI18N:BOOL=ON' '-DQUICK_COMPILER:BOOL=ON' -%cmake_build +%cmake_kf6 '-DI18N:BOOL=ON' +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install %find_lang %{name} --with-qt +%fdupes %{buildroot} + %files %license LICENSES/* -%doc README.md NEWS -%dir %{_kf5_sharedir}/kaidan -%{_kf5_applicationsdir}/im.kaidan.kaidan.desktop -%{_kf5_appstreamdir}/im.kaidan.kaidan.appdata.xml -%{_kf5_bindir}/kaidan -%{_kf5_iconsdir}/hicolor/*/apps/kaidan.* -%{_kf5_notifydir}/kaidan.notifyrc -%{_kf5_sharedir}/kaidan/images -%{_kf5_sharedir}/kaidan/providers* +%doc README.md NEWS.md +%dir %{_kf6_sharedir}/kaidan +%{_kf6_applicationsdir}/im.kaidan.kaidan.desktop +%{_kf6_appstreamdir}/im.kaidan.kaidan.appdata.xml +%{_kf6_bindir}/kaidan +%{_kf6_debugdir}/kaidan.categories +%{_kf6_iconsdir}/hicolor/*/apps/kaidan.* +%{_kf6_notificationsdir}/kaidan.notifyrc +%{_kf6_sharedir}/kaidan/images +%{_kf6_sharedir}/kaidan/providers* %files lang -f %{name}.lang