Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package k4dirstat for openSUSE:Factory checked in at 2023-10-24 20:08:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/k4dirstat (Old) and /work/SRC/openSUSE:Factory/.k4dirstat.new.24901 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k4dirstat" Tue Oct 24 20:08:59 2023 rev:10 rq:1119919 version:3.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/k4dirstat/k4dirstat.changes 2022-12-08 16:51:06.239457967 +0100 +++ /work/SRC/openSUSE:Factory/.k4dirstat.new.24901/k4dirstat.changes 2023-10-24 20:09:06.810174323 +0200 @@ -1,0 +2,9 @@ +Tue Oct 24 09:27:14 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 3.4.3 + * Fix a crash when right-clicking in the treeview not on an item + * Remove "KLocalizedString: Using an empty domain" flood +- Drop patch: + * 0001-Add-the-missing-cassert-include.patch + +------------------------------------------------------------------- Old: ---- 0001-Add-the-missing-cassert-include.patch k4dirstat-3.4.2.tar.gz New: ---- k4dirstat-3.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k4dirstat.spec ++++++ --- /var/tmp/diff_new_pack.2WSUAK/_old 2023-10-24 20:09:07.642204572 +0200 +++ /var/tmp/diff_new_pack.2WSUAK/_new 2023-10-24 20:09:07.646204717 +0200 @@ -17,15 +17,12 @@ Name: k4dirstat -Version: 3.4.2 +Version: 3.4.3 Release: 0 Summary: Graphical Disk Usage Utility License: GPL-2.0-only AND LGPL-2.0-only -Group: Productivity/File utilities URL: https://github.com/jeromerobert/k4dirstat Source0: https://github.com/jeromerobert/k4dirstat/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM -Patch0: 0001-Add-the-missing-cassert-include.patch BuildRequires: kf5-filesystem BuildRequires: update-desktop-files BuildRequires: zlib-devel @@ -53,7 +50,8 @@ %build %cmake_kf5 -d build -%make_jobs + +%cmake_build %install %kf5_makeinstall -C build ++++++ k4dirstat-3.4.2.tar.gz -> k4dirstat-3.4.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k4dirstat-3.4.2/CMakeLists.txt new/k4dirstat-3.4.3/CMakeLists.txt --- old/k4dirstat-3.4.2/CMakeLists.txt 2022-08-14 15:14:45.000000000 +0200 +++ new/k4dirstat-3.4.3/CMakeLists.txt 2023-06-19 18:46:46.000000000 +0200 @@ -48,7 +48,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) add_definitions(-DQT_USE_QSTRINGBUILDER) -git_version(K4DIRSTAT_VERSION 3.4.2 k4dirstat-) +git_version(K4DIRSTAT_VERSION 3.4.3 k4dirstat-) add_subdirectory( doc ) add_subdirectory( src ) add_subdirectory( icons ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k4dirstat-3.4.2/src/k4dirstat.cpp new/k4dirstat-3.4.3/src/k4dirstat.cpp --- old/k4dirstat-3.4.2/src/k4dirstat.cpp 2022-08-14 15:14:45.000000000 +0200 +++ new/k4dirstat-3.4.3/src/k4dirstat.cpp 2023-06-19 18:46:46.000000000 +0200 @@ -44,6 +44,7 @@ #include "ktreemapview.h" #include <KIO/ApplicationLauncherJob> #include <KIO/JobUiDelegate> +#include <KIO/JobUiDelegateFactory> #include <KHelpClient> #include <KIconEngine> #include <KIconLoader> @@ -54,7 +55,7 @@ #include <QSplitter> #include <QStorageInfo> #include <QLabel> - +#include <kwidgetsaddons_version.h> #include "settings.h" #define USER_CLEANUPS 10 // Number of user cleanup actions @@ -477,14 +478,20 @@ if (access(file_name.toLatin1(), F_OK) == 0) // file exists { - int button = KMessageBox::questionYesNoCancel( - this, i18n("File %1 exists. Overwrite?", file_name), - i18n("Overwrite?")); // caption - - if (button == KMessageBox::Cancel) - return; + auto msg = i18n("File %1 exists. Overwrite?", file_name); + auto title = i18n("Overwrite?"); +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + int button = KMessageBox::questionTwoActionsCancel(this, msg, title, + KStandardGuiItem::overwrite(), KStandardGuiItem::back()); + if (button == KMessageBox::SecondaryAction) + file_name = ""; +#else + int button = KMessageBox::questionYesNoCancel(this, msg, title); if (button == KMessageBox::No) file_name = ""; +#endif + if (button == KMessageBox::Cancel) + return; } } while (file_name.isEmpty()); @@ -493,7 +500,7 @@ if (!_treeView || !_treeView->writeCache(file_name)) { QString errMsg = i18n("Error writing cache file %1", file_name); statusMsg(errMsg); - KMessageBox::sorry(this, errMsg, + KMessageBox::error(this, errMsg, i18n("Write Error")); // caption } @@ -540,7 +547,11 @@ QUrl::AssumeLocalFile)); auto *job = new KIO::ApplicationLauncherJob(); job->setUrls(urlList); +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + job->setUiDelegate(KIO::createDefaultJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); +#else job->setUiDelegate(new KIO::JobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this)); +#endif job->start(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k4dirstat-3.4.2/src/kdirstatsettings.cpp new/k4dirstat-3.4.3/src/kdirstatsettings.cpp --- old/k4dirstat-3.4.2/src/kdirstatsettings.cpp 2022-08-14 15:14:45.000000000 +0200 +++ new/k4dirstat-3.4.3/src/kdirstatsettings.cpp 2023-06-19 18:46:46.000000000 +0200 @@ -28,6 +28,7 @@ #include <KSharedConfig> #include <QGroupBox> #include <QMenu> +#include <kwidgetsaddons_version.h> using namespace KDirStat; @@ -714,14 +715,18 @@ if (item) { QString excludeRule = item->text(); - int result = KMessageBox::questionYesNo( - this, i18n("Really delete exclude rule \"%1\"?", excludeRule), - i18n("Delete?")); // Window title - if (result == KMessageBox::Yes) { + auto msg = i18n("Really delete exclude rule \"%1\"?", excludeRule); + auto title = i18n("Delete?"); +#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) + bool doIt = KMessageBox::questionTwoActions(this, msg, title, + KStandardGuiItem::del(), KStandardGuiItem::cancel()) == KMessageBox::PrimaryAction; +#else + bool doIt = KMessageBox::questionYesNo(this, msg, title) == KMessageBox::Yes; +#endif + if (doIt) { _excludeRulesListView->takeItem(_excludeRulesListView->currentRow()); } } - checkEnabledState(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k4dirstat-3.4.2/src/kdirtreeview.cpp new/k4dirstat-3.4.3/src/kdirtreeview.cpp --- old/k4dirstat-3.4.2/src/kdirtreeview.cpp 2022-08-14 15:14:45.000000000 +0200 +++ new/k4dirstat-3.4.3/src/kdirtreeview.cpp 2023-06-19 18:46:46.000000000 +0200 @@ -888,6 +888,10 @@ void KDirTreeView::popupContextMenu(const QPoint &localPos) { QModelIndex idx = indexAt(localPos); + if(!idx.isValid()) { + // Right click in the treeview but not on an item + return; + } int column = columnAt(localPos.x()); QPoint pos = viewport()->mapToGlobal(localPos); KFileInfo *orig = model()->indexToFile(proxyModel()->mapToSource(idx)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k4dirstat-3.4.2/src/kstdcleanup.cpp new/k4dirstat-3.4.3/src/kstdcleanup.cpp --- old/k4dirstat-3.4.2/src/kstdcleanup.cpp 2022-08-14 15:14:45.000000000 +0200 +++ new/k4dirstat-3.4.3/src/kstdcleanup.cpp 2023-06-19 18:46:46.000000000 +0200 @@ -12,6 +12,10 @@ #include <KIO/JobUiDelegate> #include <KJobWidgets> #include <KLocalizedString> +#include <kio_version.h> +#if KIO_VERSION >= QT_VERSION_CHECK(5, 100, 0) + #include <KIO/DeleteOrTrashJob> +#endif using namespace KDirStat; @@ -24,7 +28,7 @@ cleanup->setWorksForDotEntry(true); cleanup->setWorksLocalOnly(false); cleanup->setRefreshPolicy(KCleanup::noRefresh); - icon = "konqueror"; + icon = "system-file-manager"; shortcut = Qt::CTRL + Qt::Key_K; return cleanup; } @@ -121,6 +125,7 @@ i18n("Delete (to Trash &Bin)")) {} static void konqOperationsDel(QWidget *m_mainWindow, const QList<QUrl> &urls) { +#if KIO_VERSION < QT_VERSION_CHECK(5, 100, 0) KIO::JobUiDelegate uiDelegate; uiDelegate.setWindow(m_mainWindow); if (uiDelegate.askDeleteConfirmation( @@ -133,6 +138,12 @@ job->uiDelegate()->setAutoErrorHandlingEnabled( true); // or connect to the result signal } +#else + using Iface = KIO::AskUserActionInterface; + auto * job = new KIO::DeleteOrTrashJob(urls, Iface::Trash, + Iface::DefaultConfirmation, m_mainWindow); + job->start(); +#endif } void TrashBinCleanup::execute(KDirTree * tree) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k4dirstat-3.4.2/src/main.cpp new/k4dirstat-3.4.3/src/main.cpp --- old/k4dirstat-3.4.2/src/main.cpp 2022-08-14 15:14:45.000000000 +0200 +++ new/k4dirstat-3.4.3/src/main.cpp 2023-06-19 18:46:46.000000000 +0200 @@ -30,6 +30,7 @@ int main(int argc, char **argv) { QApplication app(argc, argv); + KLocalizedString::setApplicationDomain("k4dirstat"); KAboutData about("k4dirstat", i18n("k4dirstat"), version, i18n(description), KAboutLicense::GPL, "\u00A9 2015-2019 J\u00E9r\u00F4me Robert, \u00A9 2010 Joshua "
