Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kguiaddons for openSUSE:Factory checked in at 2022-04-11 23:47:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kguiaddons (Old) and /work/SRC/openSUSE:Factory/.kguiaddons.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kguiaddons" Mon Apr 11 23:47:09 2022 rev:101 rq:968164 version:5.93.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kguiaddons/kguiaddons.changes 2022-03-14 19:35:51.934039998 +0100 +++ /work/SRC/openSUSE:Factory/.kguiaddons.new.1900/kguiaddons.changes 2022-04-11 23:48:29.271588606 +0200 @@ -1,0 +2,12 @@ +Sun Apr 3 10:47:12 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.93.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.93.0 +- Changes since 5.92.0: + * CI: require tests to pass + * Gracefully ignore SIGPIPE + * Use nativeInterface to access the x11 display + +------------------------------------------------------------------- Old: ---- kguiaddons-5.92.0.tar.xz kguiaddons-5.92.0.tar.xz.sig New: ---- kguiaddons-5.93.0.tar.xz kguiaddons-5.93.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kguiaddons.spec ++++++ --- /var/tmp/diff_new_pack.YmrDrX/_old 2022-04-11 23:48:29.735583302 +0200 +++ /var/tmp/diff_new_pack.YmrDrX/_new 2022-04-11 23:48:29.739583257 +0200 @@ -17,7 +17,7 @@ %define lname libKF5GuiAddons5 -%define _tar_path 5.92 +%define _tar_path 5.93 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without released Name: kguiaddons -Version: 5.92.0 +Version: 5.93.0 Release: 0 Summary: Utilities for graphical user interfaces License: LGPL-2.1-or-later ++++++ kguiaddons-5.92.0.tar.xz -> kguiaddons-5.93.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.92.0/.kde-ci.yml new/kguiaddons-5.93.0/.kde-ci.yml --- old/kguiaddons-5.92.0/.kde-ci.yml 2022-03-05 12:14:00.000000000 +0100 +++ new/kguiaddons-5.93.0/.kde-ci.yml 2022-04-02 11:59:14.000000000 +0200 @@ -5,3 +5,4 @@ Options: test-before-installing: True + require-passing-tests-on: [ 'Linux', 'FreeBSD' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.92.0/CMakeLists.txt new/kguiaddons-5.93.0/CMakeLists.txt --- old/kguiaddons-5.92.0/CMakeLists.txt 2022-03-05 12:14:00.000000000 +0100 +++ new/kguiaddons-5.93.0/CMakeLists.txt 2022-04-02 11:59:14.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.92.0") # handled by release scripts +set(KF_VERSION "5.93.0") # handled by release scripts project(KGuiAddons VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.92.0 NO_MODULE) +find_package(ECM 5.93.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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.92.0/src/CMakeLists.txt new/kguiaddons-5.93.0/src/CMakeLists.txt --- old/kguiaddons-5.92.0/src/CMakeLists.txt 2022-03-05 12:14:00.000000000 +0100 +++ new/kguiaddons-5.93.0/src/CMakeLists.txt 2022-04-02 11:59:14.000000000 +0200 @@ -82,13 +82,10 @@ if (WITH_X11 AND (TARGET Qt5::X11Extras OR TARGET Qt6::Gui)) add_library(kmodifierkey_xcb MODULE util/kmodifierkeyinfoprovider_xcb.cpp) install(TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kguiaddons/kmodifierkey/) - if (TARGET Qt5::X11Extras) - set(_qt_x11_libs Qt5::X11Extras) - elseif (TARGET Qt6::Gui) - set(_qt_x11_libs Qt6::GuiPrivate) # qtx11extras_p.h + target_link_libraries(kmodifierkey_xcb PRIVATE Qt5::X11Extras) endif() - target_link_libraries(kmodifierkey_xcb PRIVATE X11::Xkb XCB::XCB KF5::GuiAddons ${_qt_x11_libs}) + target_link_libraries(kmodifierkey_xcb PRIVATE X11::Xkb XCB::XCB KF5::GuiAddons) endif() ecm_generate_headers(KGuiAddons_HEADERS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.92.0/src/geo-scheme-handler/google-maps-geo-handler.desktop new/kguiaddons-5.93.0/src/geo-scheme-handler/google-maps-geo-handler.desktop --- old/kguiaddons-5.92.0/src/geo-scheme-handler/google-maps-geo-handler.desktop 2022-03-05 12:14:00.000000000 +0100 +++ new/kguiaddons-5.93.0/src/geo-scheme-handler/google-maps-geo-handler.desktop 2022-04-02 11:59:14.000000000 +0200 @@ -3,6 +3,7 @@ Exec=kde-geo-uri-handler --coordinate-template "https://www.google.com/maps/@<LAT>,<LON>,<Z>" --query-template "https://www.google.com/maps/search/<Q>" --fallback "https://www.google.com/maps/"; %u Name=Google Maps Name[ca]=Google Maps +Name[ca@valencia]=Google Maps Name[cs]=Mapy Google Name[en_GB]=Google Maps Name[es]=Google Maps @@ -11,6 +12,7 @@ Name[it]=Mappe di Google Name[ko]=Google ?????? Name[nl]=Google Maps +Name[pt]=Google Maps Name[ro]=H??r??i Google Name[sk]=Google Maps Name[sl]=Google Maps diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.92.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop new/kguiaddons-5.93.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop --- old/kguiaddons-5.92.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop 2022-03-05 12:14:00.000000000 +0100 +++ new/kguiaddons-5.93.0/src/geo-scheme-handler/openstreetmap-geo-handler.desktop 2022-04-02 11:59:14.000000000 +0200 @@ -3,6 +3,7 @@ Exec=kde-geo-uri-handler --coordinate-template "https://www.openstreetmap.org/#map=<Z>/<LAT>/<LON>" --query-template "https://www.openstreetmap.org/search?query=<Q>" --fallback "https://www.openstreetmap.org"; %u Name=OpenStreetMap Name[ca]=OpenStreetMap +Name[ca@valencia]=OpenStreetMap Name[cs]=OpenStreetMap Name[en_GB]=OpenStreetMap Name[es]=OpenStreetMap @@ -11,6 +12,7 @@ Name[it]=OpenStreetMap Name[ko]=OpenStreetMap Name[nl]=OpenStreetMap +Name[pt]=OpenStreetMap Name[ro]=OpenStreetMap Name[sk]=OpenStreetMap Name[sl]=OpenStreetMap diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.92.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop new/kguiaddons-5.93.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop --- old/kguiaddons-5.92.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop 2022-03-05 12:14:00.000000000 +0100 +++ new/kguiaddons-5.93.0/src/geo-scheme-handler/qwant-maps-geo-handler.desktop 2022-04-02 11:59:14.000000000 +0200 @@ -3,6 +3,7 @@ Exec=kde-geo-uri-handler --coordinate-template "https://www.qwant.com/maps/#map=<Z>/<LAT>/<LON>" --query-template "https://www.qwant.com/maps/?q=<Q>&client=opensearch" --fallback "https://www.qwant.com/maps/"; %u Name=Qwant Maps Name[ca]=Qwant Maps +Name[ca@valencia]=Qwant Maps Name[cs]=Mapy Qwant Name[en_GB]=Qwant Maps Name[es]=Qwant Maps @@ -11,6 +12,7 @@ Name[it]=Qwant Maps Name[ko]=Qwant ?????? Name[nl]=Qwant Maps +Name[pt]=Qwant Maps Name[ro]=H??r??i Qwant Name[sk]=Qwant Maps Name[sl]=Qwant Maps diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.92.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop new/kguiaddons-5.93.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop --- old/kguiaddons-5.92.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop 2022-03-05 12:14:00.000000000 +0100 +++ new/kguiaddons-5.93.0/src/geo-scheme-handler/wheelmap-geo-handler.desktop 2022-04-02 11:59:14.000000000 +0200 @@ -3,6 +3,7 @@ Exec=kde-geo-uri-handler --coordinate-template "https://wheelmap.org/?lat=<LAT>&lon=<LON>" --query-template "https://wheelmap.org/search?q=<Q>" --fallback "https://wheelmap.org"; %u Name=wheelmap.org Name[ca]=wheelmap.org +Name[ca@valencia]=wheelmap.org Name[cs]=wheelmap.org Name[en_GB]=wheelmap.org Name[es]=wheelmap.org @@ -11,6 +12,7 @@ Name[it]=wheelmap.org Name[ko]=wheelmap.org Name[nl]=wheelmap.org +Name[pt]=wheelmap.org Name[ro]=wheelmap.org Name[sk]=wheelmap.org Name[sl]=wheelmap.org diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.92.0/src/systemclipboard/waylandclipboard.cpp new/kguiaddons-5.93.0/src/systemclipboard/waylandclipboard.cpp --- old/kguiaddons-5.92.0/src/systemclipboard/waylandclipboard.cpp 2022-03-05 12:14:00.000000000 +0100 +++ new/kguiaddons-5.93.0/src/systemclipboard/waylandclipboard.cpp 2022-04-02 11:59:14.000000000 +0200 @@ -20,6 +20,7 @@ #include <errno.h> #include <poll.h> +#include <signal.h> #include <string.h> #include <unistd.h> @@ -324,7 +325,6 @@ void DataControlSource::zwlr_data_control_source_v1_send(const QString &mime_type, int32_t fd) { - QFile c; QString send_mime_type = mime_type; if (send_mime_type == QStringLiteral("text/plain;charset=utf-8")) { // if we get a request on the fallback mime, send the data from the original mime type @@ -352,10 +352,16 @@ ba = m_mimeData->data(send_mime_type); } - if (c.open(fd, QFile::WriteOnly, QFile::AutoCloseHandle)) { - c.write(ba); - c.close(); - } + // Create a sigpipe handler that does nothing, or clients may be forced to terminate + // if the pipe is closed in the other end. + struct sigaction action, oldAction; + action.sa_handler = SIG_IGN; + sigemptyset(&action.sa_mask); + action.sa_flags = 0; + sigaction(SIGPIPE, &action, &oldAction); + write(fd, ba.constData(), ba.size()); + sigaction(SIGPIPE, &oldAction, nullptr); + close(fd); } void DataControlSource::zwlr_data_control_source_v1_cancelled() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.92.0/src/util/kmodifierkeyinfoprovider_xcb.cpp new/kguiaddons-5.93.0/src/util/kmodifierkeyinfoprovider_xcb.cpp --- old/kguiaddons-5.92.0/src/util/kmodifierkeyinfoprovider_xcb.cpp 2022-03-05 12:14:00.000000000 +0100 +++ new/kguiaddons-5.93.0/src/util/kmodifierkeyinfoprovider_xcb.cpp 2022-04-02 11:59:14.000000000 +0200 @@ -9,9 +9,7 @@ #include "kmodifierkeyinfo.h" #include <QGuiApplication> -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -#include <private/qtx11extras_p.h> -#else +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #include <QX11Info> #endif @@ -58,6 +56,15 @@ return mask; } +static Display *display() +{ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + return QX11Info::display(); +#else + return qGuiApp->nativeInterface<QNativeInterface::QX11Application>()->display(); +#endif +} + KModifierKeyInfoProviderXcb::KModifierKeyInfoProviderXcb() : KModifierKeyInfoProvider() , m_xkbEv(0) @@ -69,12 +76,12 @@ int xkberr; int maj; int min; - m_xkbAvailable = XkbQueryExtension(QX11Info::display(), &code, &m_xkbEv, &xkberr, &maj, &min); + m_xkbAvailable = XkbQueryExtension(display(), &code, &m_xkbEv, &xkberr, &maj, &min); } } if (m_xkbAvailable) { /* clang-format off */ - XkbSelectEvents(QX11Info::display(), + XkbSelectEvents(display(), XkbUseCoreKbd, XkbStateNotifyMask | XkbMapNotifyMask, XkbStateNotifyMask | XkbMapNotifyMask); @@ -86,7 +93,7 @@ | XkbPointerButtonMask; /* clang-format on */ - XkbSelectEventDetails(QX11Info::display(), XkbUseCoreKbd, XkbStateNotifyMask, stateMask, stateMask); + XkbSelectEventDetails(display(), XkbUseCoreKbd, XkbStateNotifyMask, stateMask, stateMask); } xkbUpdateModifierMapping(); @@ -101,7 +108,7 @@ // get the initial state if (m_xkbAvailable) { XkbStateRec state; - XkbGetState(QX11Info::display(), XkbUseCoreKbd, &state); + XkbGetState(display(), XkbUseCoreKbd, &state); xkbModifierStateChanged(state.mods, state.latched_mods, state.locked_mods); xkbButtonStateChanged(state.ptr_buttons); @@ -122,7 +129,7 @@ return false; } - return XkbLatchModifiers(QX11Info::display(), XkbUseCoreKbd, m_xkbModifiers[key], latched ? m_xkbModifiers[key] : 0); + return XkbLatchModifiers(display(), XkbUseCoreKbd, m_xkbModifiers[key], latched ? m_xkbModifiers[key] : 0); } bool KModifierKeyInfoProviderXcb::setKeyLocked(Qt::Key key, bool locked) @@ -131,7 +138,7 @@ return false; } - return XkbLockModifiers(QX11Info::display(), XkbUseCoreKbd, m_xkbModifiers[key], locked ? m_xkbModifiers[key] : 0); + return XkbLockModifiers(display(), XkbUseCoreKbd, m_xkbModifiers[key], locked ? m_xkbModifiers[key] : 0); } // HACK: xcb-xkb is not yet a public part of xcb. Because of that we have to include the event structure. @@ -296,7 +303,7 @@ << ModifierDefinition(Qt::Key_ScrollLock, 0, "ScrollLock", XK_Scroll_Lock); /* clang-format on */ - XkbDescPtr xkb = XkbGetKeyboard(QX11Info::display(), XkbAllComponentsMask, XkbUseCoreKbd); + XkbDescPtr xkb = XkbGetKeyboard(display(), XkbAllComponentsMask, XkbUseCoreKbd); QList<ModifierDefinition>::const_iterator it; QList<ModifierDefinition>::const_iterator end = srcModifiers.constEnd(); @@ -308,14 +315,14 @@ mask = xkbVirtualModifier(xkb, it->name); } if (mask == 0 && it->keysym != 0) { - mask = XkbKeysymToModifiers(QX11Info::display(), it->keysym); + mask = XkbKeysymToModifiers(display(), it->keysym); } else if (mask == 0) { // special case for AltGr /* clang-format off */ - mask = XkbKeysymToModifiers(QX11Info::display(), XK_Mode_switch) - | XkbKeysymToModifiers(QX11Info::display(), XK_ISO_Level3_Shift) - | XkbKeysymToModifiers(QX11Info::display(), XK_ISO_Level3_Latch) - | XkbKeysymToModifiers(QX11Info::display(), XK_ISO_Level3_Lock); + mask = XkbKeysymToModifiers(display(), XK_Mode_switch) + | XkbKeysymToModifiers(display(), XK_ISO_Level3_Shift) + | XkbKeysymToModifiers(display(), XK_ISO_Level3_Latch) + | XkbKeysymToModifiers(display(), XK_ISO_Level3_Lock); /* clang-format on */ } }
