Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package k4dirstat for openSUSE:Factory checked in at 2021-04-22 18:04:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/k4dirstat (Old) and /work/SRC/openSUSE:Factory/.k4dirstat.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "k4dirstat" Thu Apr 22 18:04:22 2021 rev:6 rq:887500 version:3.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/k4dirstat/k4dirstat.changes 2020-07-09 13:16:41.604762501 +0200 +++ /work/SRC/openSUSE:Factory/.k4dirstat.new.12324/k4dirstat.changes 2021-04-22 18:05:59.894698284 +0200 @@ -1,0 +2,7 @@ +Thu Apr 22 08:08:08 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 3.2.2: + * Save "Show treemap" status + * Fix a segfault after reading a cache file + +------------------------------------------------------------------- Old: ---- k4dirstat-3.2.1.tar.gz New: ---- k4dirstat-3.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ k4dirstat.spec ++++++ --- /var/tmp/diff_new_pack.j9ibzX/_old 2021-04-22 18:06:00.342699019 +0200 +++ /var/tmp/diff_new_pack.j9ibzX/_new 2021-04-22 18:06:00.346699025 +0200 @@ -1,7 +1,7 @@ # # spec file for package k4dirstat # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: k4dirstat -Version: 3.2.1 +Version: 3.2.2 Release: 0 Summary: Graphical Disk Usage Utility License: GPL-2.0-only AND LGPL-2.0-only @@ -27,6 +27,7 @@ # PATCH-FIX-UPSTREAM Patch0: 0001-Add-the-missing-cassert-include.patch BuildRequires: kf5-filesystem +BuildRequires: update-desktop-files BuildRequires: zlib-devel BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5DocTools) @@ -39,9 +40,6 @@ BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Widgets) Recommends: k4dirstat-lang = %{version} -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif %description K4DirStat (KDE Directory Statistics) is a small utility program that sums up @@ -61,9 +59,7 @@ %install %kf5_makeinstall -C build -%if 0%{?suse_version} %suse_update_desktop_file -r k4dirstat Qt KDE Utility Filesystem -%endif %find_lang k4dirstat %{name}.lang ++++++ k4dirstat-3.2.1.tar.gz -> k4dirstat-3.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k4dirstat-3.2.1/CMakeLists.txt new/k4dirstat-3.2.2/CMakeLists.txt --- old/k4dirstat-3.2.1/CMakeLists.txt 2020-04-20 10:41:03.000000000 +0200 +++ new/k4dirstat-3.2.2/CMakeLists.txt 2020-12-23 19:08:25.000000000 +0100 @@ -47,7 +47,7 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) -git_version(K4DIRSTAT_VERSION 3.2.1 k4dirstat-) +git_version(K4DIRSTAT_VERSION 3.2.2 k4dirstat-) add_subdirectory( doc ) add_subdirectory( src ) add_subdirectory( icons ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k4dirstat-3.2.1/src/k4dirstat.cpp new/k4dirstat-3.2.2/src/k4dirstat.cpp --- old/k4dirstat-3.2.1/src/k4dirstat.cpp 2020-04-20 10:41:03.000000000 +0200 +++ new/k4dirstat-3.2.2/src/k4dirstat.cpp 2020-12-23 19:08:25.000000000 +0100 @@ -391,17 +391,10 @@ void k4dirstat::saveMainWinConfig() { KConfigGroup config = KSharedConfig::openConfig()->group("General Options"); - - config.writeEntry("Geometry", size()); + _fileOpenRecent->saveEntries(config); config.writeEntry("Show Treemap", _showTreemapView->isChecked()); - // Config entries for 2.0? seriously? - // config.writeEntry( "ToolBarPos", (int) toolBar( "mainToolBar" - // )->pos() ); - if (_treemapView) config.writeEntry("TreemapViewHeight", _treemapView->height()); - - _fileOpenRecent->saveEntries(config); } //============================================================================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/k4dirstat-3.2.1/src/kdirtreecache.cpp new/k4dirstat-3.2.2/src/kdirtreecache.cpp --- old/k4dirstat-3.2.1/src/kdirtreecache.cpp 2020-04-20 10:41:03.000000000 +0200 +++ new/k4dirstat-3.2.2/src/kdirtreecache.cpp 2020-12-23 19:08:25.000000000 +0100 @@ -175,7 +175,20 @@ checkHeader(); } +static void setStateRecursive(KDirInfo * root) { + // Once the whole cache file is read set the state of each KDirInfo to + // finished so the tree view can start fetching the tree + root->setReadState(KDirFinished); + for(int i = 0; i < root->numChildren(); i++) { + KFileInfo * f = root->child(i); + if(f->isDirInfo()) { + setStateRecursive(static_cast<KDirInfo*>(f)); + } + } +} + KCacheReader::~KCacheReader() { + setStateRecursive(_toplevel); if (_cache) gzclose(_cache);
