Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kguiaddons for openSUSE:Factory checked in at 2021-05-10 15:35:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kguiaddons (Old) and /work/SRC/openSUSE:Factory/.kguiaddons.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kguiaddons" Mon May 10 15:35:32 2021 rev:90 rq:891752 version:5.82.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kguiaddons/kguiaddons.changes 2021-04-12 12:36:21.793295347 +0200 +++ /work/SRC/openSUSE:Factory/.kguiaddons.new.2988/kguiaddons.changes 2021-05-10 15:37:06.534103144 +0200 @@ -1,0 +2,12 @@ +Sat May 1 16:40:53 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.82.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.82.0 +- Changes since 5.81.0: + * Port from deprecated QFontMetrics::charWidth() to horizontalAdvance() + * Add KIconUtils::addOverlays() overload to replace KDE::icon() + * keysequencerecordertest: import from project keysequencerecorder.h + +------------------------------------------------------------------- Old: ---- kguiaddons-5.81.0.tar.xz kguiaddons-5.81.0.tar.xz.sig New: ---- kguiaddons-5.82.0.tar.xz kguiaddons-5.82.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kguiaddons.spec ++++++ --- /var/tmp/diff_new_pack.hpMXhi/_old 2021-05-10 15:37:07.158100727 +0200 +++ /var/tmp/diff_new_pack.hpMXhi/_new 2021-05-10 15:37:07.158100727 +0200 @@ -17,7 +17,7 @@ %define lname libKF5GuiAddons5 -%define _tar_path 5.81 +%define _tar_path 5.82 # 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 lang Name: kguiaddons -Version: 5.81.0 +Version: 5.82.0 Release: 0 Summary: Utilities for graphical user interfaces License: LGPL-2.1-or-later @@ -42,11 +42,11 @@ BuildRequires: kf5-filesystem BuildRequires: libQt5Gui-private-headers-devel BuildRequires: pkgconfig -BuildRequires: cmake(Qt5Gui) >= 5.14.0 -BuildRequires: cmake(Qt5Test) >= 5.14.0 -BuildRequires: cmake(Qt5WaylandClient) >= 5.14.0 -BuildRequires: cmake(Qt5Widgets) >= 5.14.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.14.0 +BuildRequires: cmake(Qt5Gui) >= 5.15.0 +BuildRequires: cmake(Qt5Test) >= 5.15.0 +BuildRequires: cmake(Qt5WaylandClient) >= 5.15.0 +BuildRequires: cmake(Qt5Widgets) >= 5.15.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.15.0 BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) @@ -69,22 +69,22 @@ Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5Gui) >= 5.14.0 +Requires: cmake(Qt5Gui) >= 5.15.0 %description devel The KDE GUI addons provide utilities for graphical user interfaces in the areas of colors, fonts, text, images, keyboard input. Development files. %prep -%setup -q +%autosetup -p1 %build - %cmake_kf5 -d build - %cmake_build +%cmake_kf5 -d build +%cmake_build %install - %kf5_makeinstall -C build - %fdupes %{buildroot} +%kf5_makeinstall -C build +%fdupes %{buildroot} %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig ++++++ kguiaddons-5.81.0.tar.xz -> kguiaddons-5.82.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.81.0/.gitignore new/kguiaddons-5.82.0/.gitignore --- old/kguiaddons-5.81.0/.gitignore 2021-04-03 11:32:39.000000000 +0200 +++ new/kguiaddons-5.82.0/.gitignore 2021-05-01 11:41:15.000000000 +0200 @@ -22,3 +22,6 @@ .cmake/ /.clang-format /compile_commands.json +.clangd +.idea +/cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.81.0/CMakeLists.txt new/kguiaddons-5.82.0/CMakeLists.txt --- old/kguiaddons-5.81.0/CMakeLists.txt 2021-04-03 11:32:39.000000000 +0200 +++ new/kguiaddons-5.82.0/CMakeLists.txt 2021-05-01 11:41:15.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.81.0") # handled by release scripts +set(KF_VERSION "5.82.0") # handled by release scripts project(KGuiAddons VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.81.0 NO_MODULE) +find_package(ECM 5.82.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) @@ -27,7 +27,7 @@ include(KDECMakeSettings) include(KDEGitCommitHooks) -set(REQUIRED_QT_VERSION 5.14.0) +set(REQUIRED_QT_VERSION 5.15.0) if (WITH_WAYLAND) set(_qtgui_find_components COMPONENTS Private) endif() @@ -57,7 +57,7 @@ SOVERSION 5) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) if (BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.81.0/autotests/keysequencerecordertest.cpp new/kguiaddons-5.82.0/autotests/keysequencerecordertest.cpp --- old/kguiaddons-5.81.0/autotests/keysequencerecordertest.cpp 2021-04-03 11:32:39.000000000 +0200 +++ new/kguiaddons-5.82.0/autotests/keysequencerecordertest.cpp 2021-05-01 11:41:15.000000000 +0200 @@ -5,7 +5,7 @@ #include "keysequencerecordertest.h" -#include <KeySequenceRecorder> +#include "keysequencerecorder.h" #include <QSignalSpy> #include <QTest> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.81.0/src/text/kwordwrap.cpp new/kguiaddons-5.82.0/src/text/kwordwrap.cpp --- old/kguiaddons-5.81.0/src/text/kwordwrap.cpp 2021-04-03 11:32:39.000000000 +0200 +++ new/kguiaddons-5.82.0/src/text/kwordwrap.cpp 2021-05-01 11:41:15.000000000 +0200 @@ -55,7 +55,7 @@ for (int i = 0; i < len; ++i) { const QChar c = inputString.at(i); - const int ww = fm.charWidth(inputString, i); + const int ww = fm.horizontalAdvance(c); isParens = (c == QLatin1Char('(') // || c == QLatin1Char('[') // @@ -87,7 +87,7 @@ if (x + ww > w - 4 && lastBreak == -1) { // time to break but found nowhere [-> break here] breakAt = i; } - if (i == len - 2 && x + ww + fm.charWidth(inputString, i + 1) > w) { // don't leave the last char alone + if (i == len - 2 && x + ww + fm.horizontalAdvance(inputString.at(i + 1)) > w) { // don't leave the last char alone breakAt = lastBreak == -1 ? i - 1 : lastBreak; } if (c == QLatin1Char('\n')) { // Forced break here @@ -202,7 +202,7 @@ int tl = 0; int w = 0; while (tl < t.length()) { - w += fm.charWidth(t, tl); + w += fm.horizontalAdvance(t.at(tl)); if (w >= maxW) { break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.81.0/src/util/kiconutils.cpp new/kguiaddons-5.82.0/src/util/kiconutils.cpp --- old/kguiaddons-5.81.0/src/util/kiconutils.cpp 2021-04-03 11:32:39.000000000 +0200 +++ new/kguiaddons-5.82.0/src/util/kiconutils.cpp 2021-05-01 11:41:15.000000000 +0200 @@ -148,4 +148,33 @@ return QIcon(new KOverlayIconEngine(icon, overlays)); } +QIcon addOverlays(const QString &iconName, const QStringList &overlays) +{ + const int count = overlays.size(); + const QIcon icon = QIcon::fromTheme(iconName); + if (count == 0) { + return icon; + } + + QHash<Qt::Corner, QIcon> overlaysHash; + overlaysHash.reserve(count); + + if (count >= 1) { + overlaysHash.insert(Qt::BottomRightCorner, QIcon::fromTheme(overlays.at(0))); + } + + if (count >= 2) { + overlaysHash.insert(Qt::BottomLeftCorner, QIcon::fromTheme(overlays.at(1))); + } + + if (count >= 3) { + overlaysHash.insert(Qt::TopLeftCorner, QIcon::fromTheme(overlays.at(2))); + } + + if (count >= 4) { + overlaysHash.insert(Qt::TopRightCorner, QIcon::fromTheme(overlays.at(3))); + } + + return QIcon(new KOverlayIconEngine(icon, overlaysHash)); +} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kguiaddons-5.81.0/src/util/kiconutils.h new/kguiaddons-5.82.0/src/util/kiconutils.h --- old/kguiaddons-5.81.0/src/util/kiconutils.h 2021-04-03 11:32:39.000000000 +0200 +++ new/kguiaddons-5.82.0/src/util/kiconutils.h 2021-05-01 11:41:15.000000000 +0200 @@ -36,6 +36,26 @@ * and placed in one of the corners of the base icon. */ KGUIADDONS_EXPORT QIcon addOverlays(const QIcon &icon, const QHash<Qt::Corner, QIcon> &overlays); + +/** + * Adds up to four overlays on the icon constructed from @p iconName. + * + * The @p overlays is a QStringList of icon names (e.g. the emblems that are drawn on + * icons in Dolphin and KFileWidget, e.g. symlink, un-mounted device ...etc). + * + * Overlays are added in this order: + * - first icon is used to paint an overlay on the bottom-right corner + * - second icon on the bottom-left corner + * - third icon on the top-left corner + * - fourth icon on the top-right corner + * + * Each overlay icon is scaled down to 1/3 or 1/4 (depending on the icon size). + * + * All @c QIcon objects are constructed using @c QIcon::fromTheme(). + * + * @since 5.82 + */ +KGUIADDONS_EXPORT QIcon addOverlays(const QString &iconName, const QStringList &overlays); } #endif // KICONUTILS_H
