Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kf6-kguiaddons for openSUSE:Factory checked in at 2024-12-15 12:35:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf6-kguiaddons (Old) and /work/SRC/openSUSE:Factory/.kf6-kguiaddons.new.29675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kguiaddons" Sun Dec 15 12:35:11 2024 rev:10 rq:1230852 version:6.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kf6-kguiaddons/kf6-kguiaddons.changes 2024-11-09 20:56:40.530188757 +0100 +++ /work/SRC/openSUSE:Factory/.kf6-kguiaddons.new.29675/kf6-kguiaddons.changes 2024-12-15 12:38:37.269788887 +0100 @@ -1,0 +2,16 @@ +Sun Dec 8 10:09:16 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.9.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/6/6.9.0 +- Changes since 6.8.0: + * Bump PlasmaWaylandProtocols build dependency to 1.15.0 + * Update dependency version to 6.9.0 + * Add Python bindings + * It compiles fine without deprecated methods + * kmodifierkeyinfo: Update to v5 of the Wayland protocol (kde#483657) + * Don't try to access QDBusMessage if not successful reply + * Update version to 6.9.0 + +------------------------------------------------------------------- Old: ---- kguiaddons-6.8.0.tar.xz kguiaddons-6.8.0.tar.xz.sig New: ---- kguiaddons-6.9.0.tar.xz kguiaddons-6.9.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf6-kguiaddons.spec ++++++ --- /var/tmp/diff_new_pack.cmenoB/_old 2024-12-15 12:38:37.741808542 +0100 +++ /var/tmp/diff_new_pack.cmenoB/_new 2024-12-15 12:38:37.745808708 +0100 @@ -19,13 +19,13 @@ %define qt6_version 6.7.0 %define rname kguiaddons -# Full KF6 version (e.g. 6.8.0) +# Full KF6 version (e.g. 6.9.0) %{!?_kf6_version: %global _kf6_version %{version}} # Last major and minor KF6 version (e.g. 6.0) %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kf6-kguiaddons -Version: 6.8.0 +Version: 6.9.0 Release: 0 Summary: Utilities for graphical user interfaces License: LGPL-2.1-or-later @@ -45,7 +45,7 @@ BuildRequires: cmake(Qt6Gui) >= %{qt6_version} BuildRequires: cmake(Qt6ToolsTools) >= %{qt6_version} BuildRequires: cmake(Qt6WaylandClient) >= %{qt6_version} -BuildRequires: pkgconfig(wayland-client) >= 1.9 +BuildRequires: pkgconfig(wayland-client) >= 1.15 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) Requires: libKF6GuiAddons6 = %{version} ++++++ kguiaddons-6.8.0.tar.xz -> kguiaddons-6.9.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-6.8.0/CMakeLists.txt new/kguiaddons-6.9.0/CMakeLists.txt --- old/kguiaddons-6.8.0/CMakeLists.txt 2024-11-02 16:46:54.000000000 +0100 +++ new/kguiaddons-6.9.0/CMakeLists.txt 2024-12-13 13:58:51.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "6.8.0") # handled by release scripts +set(KF_VERSION "6.9.0") # handled by release scripts project(KGuiAddons VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 6.8.0 NO_MODULE) +find_package(ECM 6.9.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -24,6 +24,7 @@ include(ECMGeneratePkgConfigFile) include(ECMMarkNonGuiExecutable) include(ECMQmlModule) +include(CMakeDependentOption) option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -40,7 +41,7 @@ set(WITH_X11 OFF) endif() -set(REQUIRED_QT_VERSION 6.5.0) +set(REQUIRED_QT_VERSION 6.6.0) if (WITH_WAYLAND) set(_qtgui_find_components COMPONENTS Private) endif() @@ -56,7 +57,7 @@ endif() if (WITH_WAYLAND) - find_package(PlasmaWaylandProtocols 1.10.0 REQUIRED) + find_package(PlasmaWaylandProtocols 1.15.0 REQUIRED) find_package(Qt6WaylandClient ${REQUIRED_QT_VERSION} REQUIRED CONFIG) find_package(Wayland 1.9 REQUIRED Client) endif() @@ -77,6 +78,11 @@ find_package(Gradle REQUIRED) endif() +# For the Python bindings +find_package(Python3 3.10 COMPONENTS Interpreter Development) +find_package(Shiboken6) +find_package(PySide6) + set(kguiaddons_version_header "${CMAKE_CURRENT_BINARY_DIR}/src/kguiaddons_version.h") ecm_setup_version(PROJECT VARIABLE_PREFIX KGUIADDONS VERSION_HEADER "${kguiaddons_version_header}" @@ -84,15 +90,28 @@ SOVERSION 6) ecm_set_disabled_deprecation_versions( - QT 6.5 + QT 6.8 ) +cmake_dependent_option(BUILD_PYTHON_BINDINGS "Generate Python Bindings" ON "TARGET Shiboken6::libshiboken AND TARGET PySide6::pyside6" OFF) +add_feature_info(PYTHON_BINDINGS ${BUILD_PYTHON_BINDINGS} "Python bindings") + +# FreeBSD CI is missing required packages +if (CMAKE_SYSTEM_NAME MATCHES FreeBSD) + set(BUILD_PYTHON_BINDINGS OFF) +endif() + add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) endif() +if (BUILD_PYTHON_BINDINGS) + include(ECMGeneratePythonBindings) + add_subdirectory(python) +endif() + # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF6GuiAddons") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-6.8.0/python/CMakeLists.txt new/kguiaddons-6.9.0/python/CMakeLists.txt --- old/kguiaddons-6.8.0/python/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-6.9.0/python/CMakeLists.txt 2024-12-13 13:58:51.000000000 +0100 @@ -0,0 +1,44 @@ +# SPDX-FileCopyrightText: 2024 Manuel Alcaraz Zambrano <manuelalcaraz...@gmail.com> +# SPDX-License-Identifier: BSD-2-Clause + +set(bindings_library "KGuiAddons") + +set(wrapped_header ${CMAKE_CURRENT_SOURCE_DIR}/bindings.h) +set(typesystem_file ${CMAKE_CURRENT_SOURCE_DIR}/bindings.xml) + +set(generated_sources + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kguiaddons_module_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kcolormimedata_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kcolorschemewatcher_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kcolorutils_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kcountryflagemojiiconengine_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kcursorsaver_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kdatevalidator_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kfontutils_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kiconutils_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kjobwindows_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kkeysequencerecorder_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kmodifierkeyinfo_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/ksystemclipboard_wrapper.cpp + ${CMAKE_CURRENT_BINARY_DIR}/KGuiAddons/kwordwrap_wrapper.cpp) + +ecm_generate_python_bindings( + PACKAGE_NAME ${bindings_library} + VERSION ${KF_VERSION} + WRAPPED_HEADER ${wrapped_header} + TYPESYSTEM ${typesystem_file} + GENERATED_SOURCES ${generated_sources} + DEPENDENCIES KF6::GuiAddons + QT_VERSION ${REQUIRED_QT_VERSION} + HOMEPAGE_URL "https://invent.kde.org/frameworks/kguiaddons"; + ISSUES_URL "https://bugs.kde.org/describecomponents.cgi?product=frameworks-kguiaddons"; + AUTHOR "The KDE Community" + README ../README.md +) + +target_link_libraries(${bindings_library} PRIVATE KF6::GuiAddons) + +execute_process(COMMAND ${Python_EXECUTABLE} -Esc "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '${CMAKE_INSTALL_PREFIX}', 'base': '${CMAKE_INSTALL_PREFIX}'}))" OUTPUT_VARIABLE sysconfig_output) +string(STRIP ${sysconfig_output} PYTHON_INSTALL_DIR) + +install(TARGETS ${bindings_library} LIBRARY DESTINATION "${PYTHON_INSTALL_DIR}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-6.8.0/python/bindings.h new/kguiaddons-6.9.0/python/bindings.h --- old/kguiaddons-6.8.0/python/bindings.h 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-6.9.0/python/bindings.h 2024-12-13 13:58:51.000000000 +0100 @@ -0,0 +1,24 @@ +// SPDX-FileCopyrightText: 2024 Manuel Alcaraz Zambrano <manuelalcaraz...@gmail.com> +// SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL + +#pragma once + +// Make "signals:", "slots:" visible as access specifiers +#define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a))) + +#include <QDate> + +#include <KColorMimeData> +#include <KColorSchemeWatcher> +#include <KColorUtils> +#include <KCountryFlagEmojiIconEngine> +#include <KCursorSaver> +#include <KDateValidator> +#include <KFontUtils> +#include <KIconUtils> +#include <KJobWindows> +#include <KKeySequenceRecorder> +#include <KModifierKeyInfo> +#include <KSystemClipboard> +#include <KWordWrap> +#include <klocalimagecacheimpl.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-6.8.0/python/bindings.xml new/kguiaddons-6.9.0/python/bindings.xml --- old/kguiaddons-6.8.0/python/bindings.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kguiaddons-6.9.0/python/bindings.xml 2024-12-13 13:58:51.000000000 +0100 @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<typesystem package="KGuiAddons"> +<!-- +SPDX-FileCopyrightText: 2024 Manuel Alcaraz Zambrano <manuelalcaraz...@gmail.com> +SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL +--> + <load-typesystem name="typesystem_gui.xml" generate="no"/> + + <namespace-type name="KColorMimeData" /> + <object-type name="KColorSchemeWatcher"> + <enum-type name="ColorPreference" /> + </object-type> + <namespace-type name="KColorUtils" /> + <object-type name="KCountryFlagEmojiIconEngine" /> + <object-type name="KCursorSaver" /> + <object-type name="KDateValidator" /> + <namespace-type name="KFontUtils"> + <enum-type name="AdaptFontSizeOption" flags="AdaptFontSizeOptions" /> + </namespace-type> + <namespace-type name="KIconUtils" /> + <namespace-type name="KJobWindows" /> + <object-type name="KKeySequenceRecorder" /> + <object-type name="KModifierKeyInfo" /> + <object-type name="KSystemClipboard" /> + <object-type name="KWordWrap" /> + +</typesystem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-6.8.0/src/colors/kcolorschemewatcher_xdg.cpp new/kguiaddons-6.9.0/src/colors/kcolorschemewatcher_xdg.cpp --- old/kguiaddons-6.8.0/src/colors/kcolorschemewatcher_xdg.cpp 2024-11-02 16:46:54.000000000 +0100 +++ new/kguiaddons-6.9.0/src/colors/kcolorschemewatcher_xdg.cpp 2024-12-13 13:58:51.000000000 +0100 @@ -8,6 +8,7 @@ #include <QDBusConnection> #include <QDBusMessage> +#include <QDBusReply> #include <QDBusVariant> #include <QDebug> @@ -27,10 +28,12 @@ QStringLiteral("Read")); m.setArguments({QStringLiteral("org.freedesktop.appearance"), QStringLiteral("color-scheme")}); - auto reply = QDBusConnection::sessionBus().call(m); + QDBusReply<QDBusVariant> reply = QDBusConnection::sessionBus().call(m); - const uint result = reply.arguments().first().value<QDBusVariant>().variant().value<QDBusVariant>().variant().toUInt(); - m_preference = fdoToInternal(result); + if (reply.isValid()) { + const uint result = reply.value().variant().toUInt(); + m_preference = fdoToInternal(result); + } } KColorSchemeWatcher::ColorPreference KColorSchemeWatcherXDG::systemPreference() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-6.8.0/src/util/kmodifierkeyinfoprovider_wayland.cpp new/kguiaddons-6.9.0/src/util/kmodifierkeyinfoprovider_wayland.cpp --- old/kguiaddons-6.8.0/src/util/kmodifierkeyinfoprovider_wayland.cpp 2024-11-02 16:46:54.000000000 +0100 +++ new/kguiaddons-6.9.0/src/util/kmodifierkeyinfoprovider_wayland.cpp 2024-12-13 13:58:51.000000000 +0100 @@ -19,7 +19,7 @@ Q_OBJECT public: KeyState() - : QWaylandClientExtensionTemplate<KeyState>(4) + : QWaylandClientExtensionTemplate<KeyState>(5) { } @@ -48,6 +48,8 @@ return KModifierKeyInfoProvider::Locked; case KeyState::state::state_latched: return KModifierKeyInfoProvider::Latched; + case KeyState::state::state_pressed: + return KModifierKeyInfoProvider::Pressed; } Q_UNREACHABLE(); return KModifierKeyInfoProvider::Nothing; @@ -62,6 +64,16 @@ return Qt::Key_NumLock; case KeyState::key::key_scrolllock: return Qt::Key_ScrollLock; + case KeyState::key_alt: + return Qt::Key_Alt; + case KeyState::key_shift: + return Qt::Key_Shift; + case KeyState::key_control: + return Qt::Key_Control; + case KeyState::key_meta: + return Qt::Key_Meta; + case KeyState::key_altgr: + return Qt::Key_AltGr; } Q_UNREACHABLE(); return {}; @@ -85,6 +97,11 @@ stateUpdated(Qt::Key_CapsLock, KModifierKeyInfoProvider::Nothing); stateUpdated(Qt::Key_NumLock, KModifierKeyInfoProvider::Nothing); stateUpdated(Qt::Key_ScrollLock, KModifierKeyInfoProvider::Nothing); + stateUpdated(Qt::Key_Alt, KModifierKeyInfoProvider::Nothing); + stateUpdated(Qt::Key_Shift, KModifierKeyInfoProvider::Nothing); + stateUpdated(Qt::Key_Control, KModifierKeyInfoProvider::Nothing); + stateUpdated(Qt::Key_Meta, KModifierKeyInfoProvider::Nothing); + stateUpdated(Qt::Key_AltGr, KModifierKeyInfoProvider::Nothing); } KModifierKeyInfoProviderWayland::~KModifierKeyInfoProviderWayland()
