Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lxqt-qtplugin for openSUSE:Factory checked in at 2021-11-09 23:54:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-qtplugin (Old) and /work/SRC/openSUSE:Factory/.lxqt-qtplugin.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-qtplugin" Tue Nov 9 23:54:19 2021 rev:16 rq:930095 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-qtplugin/lxqt-qtplugin.changes 2021-04-17 00:02:01.737619030 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-qtplugin.new.1890/lxqt-qtplugin.changes 2021-11-09 23:54:34.095951336 +0100 @@ -1,0 +2,7 @@ +Mon Nov 8 09:29:02 UTC 2021 - Michael Vetter <mvet...@suse.com> + +- Update to 1.0.0: + * Added workarounds for Qt's poor handling of some dark palettes. + * Used the C++11 override specifier in some places. + +------------------------------------------------------------------- Old: ---- lxqt-qtplugin-0.17.0.tar.xz lxqt-qtplugin-0.17.0.tar.xz.asc New: ---- lxqt-qtplugin-1.0.0.tar.xz lxqt-qtplugin-1.0.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-qtplugin.spec ++++++ --- /var/tmp/diff_new_pack.07JByJ/_old 2021-11-09 23:54:34.971951782 +0100 +++ /var/tmp/diff_new_pack.07JByJ/_new 2021-11-09 23:54:34.975951783 +0100 @@ -17,7 +17,7 @@ Name: lxqt-qtplugin -Version: 0.17.0 +Version: 1.0.0 Release: 0 Summary: LXQt platform integration plugin for Qt 5 License: LGPL-2.1-or-later @@ -30,13 +30,13 @@ BuildRequires: gcc-c++ BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libexif-devel -BuildRequires: lxqt-build-tools-devel >= 0.9.0 +BuildRequires: lxqt-build-tools-devel >= 0.10.0 BuildRequires: pkgconfig BuildRequires: cmake(KF5WindowSystem) -BuildRequires: pkgconfig(Qt5Gui) >= 5.12.0 +BuildRequires: pkgconfig(Qt5Gui) >= 5.15.0 BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5Xdg) >= 3.7.0 +BuildRequires: pkgconfig(Qt5Xdg) >= 3.8.0 BuildRequires: pkgconfig(Qt5XdgIconLoader) BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(libfm-qt) >= %{version} ++++++ lxqt-qtplugin-0.17.0.tar.xz -> lxqt-qtplugin-1.0.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.17.0/AUTHORS new/lxqt-qtplugin-1.0.0/AUTHORS --- old/lxqt-qtplugin-0.17.0/AUTHORS 2021-04-05 16:18:48.000000000 +0200 +++ new/lxqt-qtplugin-1.0.0/AUTHORS 2021-11-05 11:03:45.000000000 +0100 @@ -1,5 +1,5 @@ Upstream Authors: - LXQt team: https://lxqt.org + LXQt team: https://lxqt-project.org Hong Jen Yee (PCMan) <pcman...@gmail.com> Copyright: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.17.0/CHANGELOG new/lxqt-qtplugin-1.0.0/CHANGELOG --- old/lxqt-qtplugin-0.17.0/CHANGELOG 2021-04-05 16:18:48.000000000 +0200 +++ new/lxqt-qtplugin-1.0.0/CHANGELOG 2021-11-05 11:03:45.000000000 +0100 @@ -1,3 +1,8 @@ +lxqt-qtplugin-1.0.0 / 2021-11-04 +================================= + * Added workarounds for Qt's poor handling of some dark palettes. + * Used the C++11 override specifier. + lxqt-qtplugin-0.17.0 / 2021-04-15 ================================= * Handled Qt 5.15 deprecations. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.17.0/CMakeLists.txt new/lxqt-qtplugin-1.0.0/CMakeLists.txt --- old/lxqt-qtplugin-0.17.0/CMakeLists.txt 2021-04-05 16:18:48.000000000 +0200 +++ new/lxqt-qtplugin-1.0.0/CMakeLists.txt 2021-11-05 11:03:45.000000000 +0100 @@ -13,10 +13,10 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Minimum Versions -set(LXQTBT_MINIMUM_VERSION "0.9.0") -set(QT_MINIMUM_VERSION "5.12.0") -set(QTXDG_MINIMUM_VERSION "3.7.0") -set(FMQT_MINIMUM_VERSION "0.17.0") +set(LXQTBT_MINIMUM_VERSION "0.10.0") +set(QT_MINIMUM_VERSION "5.15.0") +set(QTXDG_MINIMUM_VERSION "3.8.0") +set(FMQT_MINIMUM_VERSION "1.0.0") find_package(Qt5DBus ${QT_MINIMUM_VERSION} REQUIRED) find_package(Qt5LinguistTools ${QT_MINIMUM_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.17.0/src/lxqtplatformtheme.cpp new/lxqt-qtplugin-1.0.0/src/lxqtplatformtheme.cpp --- old/lxqt-qtplugin-0.17.0/src/lxqtplatformtheme.cpp 2021-04-05 16:18:48.000000000 +0200 +++ new/lxqt-qtplugin-1.0.0/src/lxqtplatformtheme.cpp 2021-11-05 11:03:45.000000000 +0100 @@ -169,8 +169,17 @@ if (baseColor_.isValid()) { LXQtPalette_->setColor(QPalette::Base, baseColor_); - // See Qt -> qpalette.cpp -> qt_fusionPalette() - LXQtPalette_->setColor(QPalette::Disabled, QPalette::Base, winColor_); + // Qt makes the alternate base color (used by some item views) by mixing the button + // color (= window color) and base color. That can result in unreadable texts when + // the base and window colors have a high contrast with each other. + color = baseColor_; + int l = color.lightness(); + if (l < 127) + l += 10; + else + l -= 10; + color.setHsl(color.hue(), color.saturation(), l); + LXQtPalette_->setColor(QPalette::AlternateBase, color); } if (highlightColor_.isValid()) { @@ -458,10 +467,8 @@ break; case WheelScrollLines: return wheelScrollLines_; -#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) case QPlatformTheme::ShowShortcutsInContextMenus: return QVariant(true); -#endif default: break; } @@ -495,11 +502,7 @@ xdgDirs.append(xdgDataDirs); for (const auto &s: xdgDirs) { -#if (QT_VERSION >= QT_VERSION_CHECK(5,15,0)) const QStringList r = s.split(QLatin1Char(':'), Qt::SkipEmptyParts); -#else - const QStringList r = s.split(QLatin1Char(':'), QString::SkipEmptyParts); -#endif for (const auto& xdgDir: r) { const QFileInfo xdgIconsDir(xdgDir + QStringLiteral("/icons")); if (xdgIconsDir.isDir()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.17.0/src/lxqtsystemtrayicon.h new/lxqt-qtplugin-1.0.0/src/lxqtsystemtrayicon.h --- old/lxqt-qtplugin-0.17.0/src/lxqtsystemtrayicon.h 2021-04-05 16:18:48.000000000 +0200 +++ new/lxqt-qtplugin-1.0.0/src/lxqtsystemtrayicon.h 2021-11-05 11:03:45.000000000 +0100 @@ -42,20 +42,20 @@ Q_OBJECT public: SystemTrayMenu(); - ~SystemTrayMenu() Q_DECL_OVERRIDE; - void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE; - QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE; - QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE; - void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; - void setEnabled(bool enabled) Q_DECL_OVERRIDE; - void setIcon(const QIcon &icon) Q_DECL_OVERRIDE; - void setTag(quintptr tag) Q_DECL_OVERRIDE; - void setText(const QString &text) Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; - void syncMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; - void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE; - quintptr tag() const Q_DECL_OVERRIDE; - QPlatformMenuItem *createMenuItem() const Q_DECL_OVERRIDE; + ~SystemTrayMenu() override; + void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) override; + QPlatformMenuItem *menuItemAt(int position) const override; + QPlatformMenuItem *menuItemForTag(quintptr tag) const override; + void removeMenuItem(QPlatformMenuItem *menuItem) override; + void setEnabled(bool enabled) override; + void setIcon(const QIcon &icon) override; + void setTag(quintptr tag) override; + void setText(const QString &text) override; + void setVisible(bool visible) override; + void syncMenuItem(QPlatformMenuItem *menuItem) override; + void syncSeparatorsCollapsible(bool enable) override; + quintptr tag() const override; + QPlatformMenuItem *createMenuItem() const override; QMenu *menu() const; @@ -70,25 +70,21 @@ Q_OBJECT public: SystemTrayMenuItem(); - ~SystemTrayMenuItem() Q_DECL_OVERRIDE; - void setCheckable(bool checkable) Q_DECL_OVERRIDE; - void setChecked(bool isChecked) Q_DECL_OVERRIDE; - void setEnabled(bool enabled) Q_DECL_OVERRIDE; - void setFont(const QFont &font) Q_DECL_OVERRIDE; - void setIcon(const QIcon &icon) Q_DECL_OVERRIDE; - void setIsSeparator(bool isSeparator) Q_DECL_OVERRIDE; - void setMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; - void setRole(MenuRole role) Q_DECL_OVERRIDE; - void setShortcut(const QKeySequence &shortcut) Q_DECL_OVERRIDE; - void setTag(quintptr tag) Q_DECL_OVERRIDE; - void setText(const QString &text) Q_DECL_OVERRIDE; - void setVisible(bool isVisible) Q_DECL_OVERRIDE; - quintptr tag() const Q_DECL_OVERRIDE; - void setIconSize(int size) - #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) - Q_DECL_OVERRIDE - #endif - ; + ~SystemTrayMenuItem() override; + void setCheckable(bool checkable) override; + void setChecked(bool isChecked) override; + void setEnabled(bool enabled) override; + void setFont(const QFont &font) override; + void setIcon(const QIcon &icon) override; + void setIsSeparator(bool isSeparator) override; + void setMenu(QPlatformMenu *menu) override; + void setRole(MenuRole role) override; + void setShortcut(const QKeySequence &shortcut) override; + void setTag(quintptr tag) override; + void setText(const QString &text) override; + void setVisible(bool isVisible) override; + quintptr tag() const override; + void setIconSize(int size) override; QAction *action() const; @@ -101,21 +97,21 @@ { public: LXQtSystemTrayIcon(); - ~LXQtSystemTrayIcon() Q_DECL_OVERRIDE; + ~LXQtSystemTrayIcon() override; - void init() Q_DECL_OVERRIDE; - void cleanup() Q_DECL_OVERRIDE; - void updateIcon(const QIcon &icon) Q_DECL_OVERRIDE; - void updateToolTip(const QString &tooltip) Q_DECL_OVERRIDE; - void updateMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; + void init() override; + void cleanup() override; + void updateIcon(const QIcon &icon) override; + void updateToolTip(const QString &tooltip) override; + void updateMenu(QPlatformMenu *menu) override; + QRect geometry() const override; void showMessage(const QString &title, const QString &msg, - const QIcon &icon, MessageIcon iconType, int secs) Q_DECL_OVERRIDE; + const QIcon &icon, MessageIcon iconType, int secs) override; - bool isSystemTrayAvailable() const Q_DECL_OVERRIDE; - bool supportsMessages() const Q_DECL_OVERRIDE; + bool isSystemTrayAvailable() const override; + bool supportsMessages() const override; - QPlatformMenu *createMenu() const Q_DECL_OVERRIDE; + QPlatformMenu *createMenu() const override; private: StatusNotifierItem *mSni; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-qtplugin-0.17.0/src/statusnotifieritem/statusnotifieritem.cpp new/lxqt-qtplugin-1.0.0/src/statusnotifieritem/statusnotifieritem.cpp --- old/lxqt-qtplugin-0.17.0/src/statusnotifieritem/statusnotifieritem.cpp 2021-04-05 16:18:48.000000000 +0200 +++ new/lxqt-qtplugin-1.0.0/src/statusnotifieritem/statusnotifieritem.cpp 2021-11-05 11:03:45.000000000 +0100 @@ -317,11 +317,7 @@ image = image.convertToFormat(QImage::Format_ARGB32); pix.bytes = QByteArray((char *) image.bits(), -#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) - image.byteCount()); -#else image.sizeInBytes()); -#endif // swap to network byte order if we are little endian if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)