Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2021-11-06 18:14:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksane" Sat Nov 6 18:14:50 2021 rev:135 rq:929418 version:21.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2021-10-13 18:04:20.063109802 +0200 +++ /work/SRC/openSUSE:Factory/.libksane.new.1890/libksane.changes 2021-11-06 18:16:35.748839988 +0100 @@ -1,0 +2,10 @@ +Tue Nov 2 21:34:51 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.08.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/21.08.3/ +- Changes since 21.08.2: + * Naughty-list pixma network backend option polling (kde#429260) + +------------------------------------------------------------------- Old: ---- libksane-21.08.2.tar.xz libksane-21.08.2.tar.xz.sig New: ---- libksane-21.08.3.tar.xz libksane-21.08.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.aQnkQK/_old 2021-11-06 18:16:36.348840298 +0100 +++ /var/tmp/diff_new_pack.aQnkQK/_new 2021-11-06 18:16:36.352840300 +0100 @@ -23,7 +23,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: libksane -Version: 21.08.2 +Version: 21.08.3 Release: 0 Summary: KDE scanning library License: GPL-2.0-or-later ++++++ libksane-21.08.2.tar.xz -> libksane-21.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.2/CMakeLists.txt new/libksane-21.08.3/CMakeLists.txt --- old/libksane-21.08.2/CMakeLists.txt 2021-10-05 07:36:15.000000000 +0200 +++ new/libksane-21.08.3/CMakeLists.txt 2021-11-02 01:08:44.000000000 +0100 @@ -3,7 +3,7 @@ # KDE Applications version, managed by release script. set(RELEASE_SERVICE_VERSION_MAJOR "21") set(RELEASE_SERVICE_VERSION_MINOR "08") -set(RELEASE_SERVICE_VERSION_MICRO "2") +set(RELEASE_SERVICE_VERSION_MICRO "3") set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(KSane) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.2/po/ca/libksane.po new/libksane-21.08.3/po/ca/libksane.po --- old/libksane-21.08.2/po/ca/libksane.po 2021-10-05 07:36:15.000000000 +0200 +++ new/libksane-21.08.3/po/ca/libksane.po 2021-11-02 01:08:44.000000000 +0100 @@ -3,7 +3,7 @@ # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2020, 2021. +# Josep M. Ferrer <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2020, 2021. # Antoni Bella P??rez <[email protected]>, 2015, 2016, 2020. msgid "" msgstr "" @@ -11,7 +11,7 @@ "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-20 01:49+0000\n" "PO-Revision-Date: 2021-08-03 10:42+0200\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"Last-Translator: Josep M. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.2/po/ca@valencia/libksane.po new/libksane-21.08.3/po/ca@valencia/libksane.po --- old/libksane-21.08.2/po/ca@valencia/libksane.po 2021-10-05 07:36:15.000000000 +0200 +++ new/libksane-21.08.3/po/ca@valencia/libksane.po 2021-11-02 01:08:44.000000000 +0100 @@ -3,7 +3,7 @@ # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2020, 2021. +# Josep M. Ferrer <[email protected]>, 2008, 2009, 2010, 2011, 2012, 2015, 2018, 2020, 2021. # Antoni Bella P??rez <[email protected]>, 2015, 2016, 2020. msgid "" msgstr "" @@ -11,7 +11,7 @@ "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-20 01:49+0000\n" "PO-Revision-Date: 2021-08-03 10:42+0200\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"Last-Translator: Josep M. Ferrer <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.2/po/zh_CN/libksane.po new/libksane-21.08.3/po/zh_CN/libksane.po --- old/libksane-21.08.2/po/zh_CN/libksane.po 2021-10-05 07:36:15.000000000 +0200 +++ new/libksane-21.08.3/po/zh_CN/libksane.po 2021-11-02 01:08:44.000000000 +0100 @@ -10,7 +10,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-20 01:49+0000\n" -"PO-Revision-Date: 2021-09-27 13:10\n" +"PO-Revision-Date: 2021-10-29 13:28\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.2/src/ksanecore_p.cpp new/libksane-21.08.3/src/ksanecore_p.cpp --- old/libksane-21.08.2/src/ksanecore_p.cpp 2021-10-05 00:06:36.000000000 +0200 +++ new/libksane-21.08.3/src/ksanecore_p.cpp 2021-10-31 11:09:14.000000000 +0100 @@ -13,6 +13,7 @@ #include <QImage> #include <QList> +#include <QRegularExpression> #include <ksane_debug.h> @@ -168,7 +169,7 @@ if (option->name() == QStringLiteral("wait-for-button")) { connect(option, &KSaneBaseOption::valueChanged, this, &KSaneCorePrivate::setWaitForExternalButton); } - + m_optionsList.append(option); m_externalOptionsList.append(new KSaneInternalOption(option)); connect(option, &KSaneBaseOption::optionsNeedReload, this, &KSaneCorePrivate::reloadOptions); @@ -186,7 +187,7 @@ m_optionsLocation.insert(it.value(), i - 1); } } - + // add extra option for inverting image colors KSaneBaseOption *invertOption = new KSaneInvertOption(); m_optionsList.append(invertOption); @@ -198,23 +199,33 @@ m_optionsList.append(pageSizeOption); m_externalOptionsList.append(new KSaneInternalOption(pageSizeOption)); m_optionsLocation.insert(KSaneCore::PageSizeOption, m_optionsList.size() - 1); - + + // NOTICE The Pixma network backend behaves badly. polling a value will result in 1 second + // sleeps for every poll. The problem has been reported, but no easy/quick fix was available and + // the bug has been there for multiple years. Since this destroys the usability of the backend totally, + // we simply put the backend on the naughty list and disable the option polling. + static QRegularExpression pixmaNetworkBackend(QStringLiteral("pixma.*\\d+\\.\\d+\\.\\d+\\.\\d+")); + m_optionPollingNaughtylisted = false; + if (pixmaNetworkBackend.match(m_devName).hasMatch()) { + m_optionPollingNaughtylisted = true; + } + // start polling the poll options - if (m_optionsPollList.size() > 0) { + if (m_optionsPollList.size() > 0 && !m_optionPollingNaughtylisted) { m_optionPollTimer.start(); } // Create the scan thread m_scanThread = new KSaneScanThread(m_saneHandle); - + m_scanThread->setImageInverted(invertOption->value()); connect(invertOption, &KSaneInvertOption::valueChanged, m_scanThread, &KSaneScanThread::setImageInverted); - + if (optionResolution != nullptr) { m_scanThread->setImageResolution(optionResolution->value()); connect(optionResolution, &KSaneBaseOption::valueChanged, m_scanThread, &KSaneScanThread::setImageResolution); } - + connect(m_scanThread, &KSaneScanThread::scanProgressUpdated, q, &KSaneCore::scanProgress); connect(m_scanThread, &KSaneScanThread::finished, this, &KSaneCorePrivate::imageScanFinished); @@ -230,7 +241,7 @@ delete m_optionsList.takeFirst(); delete m_externalOptionsList.takeFirst(); } - + m_optionsLocation.clear(); m_optionsPollList.clear(); m_optionPollTimer.stop(); @@ -356,7 +367,7 @@ void KSaneCorePrivate::scanIsFinished(KSaneCore::KSaneScanStatus status, const QString &message) { sane_cancel(m_saneHandle); - if (m_optionsPollList.size() > 0) { + if (m_optionsPollList.size() > 0 && !m_optionPollingNaughtylisted) { m_optionPollTimer.start(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-21.08.2/src/ksanecore_p.h new/libksane-21.08.3/src/ksanecore_p.h --- old/libksane-21.08.2/src/ksanecore_p.h 2021-10-05 00:06:36.000000000 +0200 +++ new/libksane-21.08.3/src/ksanecore_p.h 2021-10-31 11:09:14.000000000 +0100 @@ -69,6 +69,7 @@ QList<KSaneBaseOption *> m_optionsPollList; QTimer m_readValuesTimer; QTimer m_optionPollTimer; + bool m_optionPollingNaughtylisted = false; QString m_saneUserName; QString m_sanePassword;
