Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qtfm for openSUSE:Factory checked in at 2021-06-09 21:52:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtfm (Old) and /work/SRC/openSUSE:Factory/.qtfm.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtfm" Wed Jun 9 21:52:17 2021 rev:8 rq:898263 version:6.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qtfm/qtfm.changes 2021-05-11 23:03:52.885034031 +0200 +++ /work/SRC/openSUSE:Factory/.qtfm.new.32437/qtfm.changes 2021-06-09 21:52:33.834502741 +0200 @@ -1,0 +2,10 @@ +Tue Jun 8 06:28:58 UTC 2021 - Michael Vetter <[email protected]> + +- Update to 6.2.1: + * fix remove symlink bug + * fix build with Qt 5.15 + * fix memory leak + * fix for "." start path + * fix .desktop key/value parser + +------------------------------------------------------------------- Old: ---- qtfm-6.2.0.tar.gz New: ---- qtfm-6.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtfm.spec ++++++ --- /var/tmp/diff_new_pack.lob7Ow/_old 2021-06-09 21:52:35.370505479 +0200 +++ /var/tmp/diff_new_pack.lob7Ow/_new 2021-06-09 21:52:35.374505487 +0200 @@ -17,7 +17,7 @@ Name: qtfm -Version: 6.2.0 +Version: 6.2.1 Release: 0 Summary: Qt File Manager License: GPL-2.0-or-later AND BSD-3-Clause ++++++ qtfm-6.2.0.tar.gz -> qtfm-6.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/.github/workflows/c-cpp.yml new/qtfm-6.2.1/.github/workflows/c-cpp.yml --- old/qtfm-6.2.0/.github/workflows/c-cpp.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtfm-6.2.1/.github/workflows/c-cpp.yml 2021-05-30 17:03:24.000000000 +0200 @@ -0,0 +1,27 @@ +name: C/C++ CI + +on: + push: + branches: [ 6.2 ] + pull_request: + branches: [ 6.2 ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: apt install + run: sudo apt-get install tree qt5-default qtbase5-dev libmagick++-dev libavdevice-dev libswscale-dev libavformat-dev libavcodec-dev libavutil-dev + - name: Build (qmake release) + run: | + mkdir build + cd build + qmake CONFIG+=with_magick CONFIG+=with_ffmpeg CONFIG+=release PREFIX=/usr .. + make -j2 + sudo make install + ldd /usr/bin/qtfm + ldd /usr/bin/qtfm-tray + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/.travis.yml new/qtfm-6.2.1/.travis.yml --- old/qtfm-6.2.0/.travis.yml 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -sudo: required -language: cpp -compiler: g++ -matrix: - include: - - os: linux - dist: xenial - - os: osx - osx_image: xcode8 - -script: - - sh share/ci.sh - -deploy: - provider: releases - api_key: - secure: H0ij5swOKXnIBVFQiZ6Dwexpn0qTrj4r8svoD/LG1PnQVoDZt8zITrE11YkjPNSAL6sf3K958KWsyLdyE4g7eic5cLbZRXgAz+fMQjPvX6SrtPMo2IRhEhVGMal6BzBpNlXmznwP0vkopMUs/tpW9l3BH+K8Z6+EaFt69tMd6Ty0I+iRteQAG8EyUGNV3o1NAgbJf18MBfWrGJkVfAT79GnV0Pjez/M+7AOc7ZdBc5pij3xkbgzzjzfa8lkErjinqIjSvuGgxFQXNP4e/FGkGPAiegpzTyUG8c/32jEwjcjz5Rcr/fMH4CfyIWMXJ2PQeuItdk7FX0ErB7yvV7BYVz4ucBf6LnJVbHPNt6TkXqHBLh4r5fKylvExDwBZqQwp3OUH5wtyB+d5yBnoERZwJqUiVocyZiTTHI4aqVk1BegKV2fVFoN5W3bNT4Kgt4O2Sg4hmcSunmhTh1Jzmt+Sz3Ov5MLbnUVGGIBNoqXrHHXvqqBnEQ9CUJinPCHh3CViTg1H5jI764YajVm0WWDL95N5bzrY9A0pS65oFgOrt82OXn2nlS7kLxCeehcFbWBs7/Wp/31VWAJ62fS2fNTfsGPRPv+4bEipgnzdOElZ0pTFAlgFYXuSIPoJS0ZcwixshAj17sz6LwFv6dOkK4UP0UXZe2fEdp53kjSeJWI+3CQ= - file_glob: true - file: /opt/deploy/* - skip_cleanup: true - draft: true - on: - repo: rodlie/qtfm - tags: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/AUTHORS new/qtfm-6.2.1/AUTHORS --- old/qtfm-6.2.0/AUTHORS 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/AUTHORS 2021-05-30 17:03:24.000000000 +0200 @@ -1,12 +1,20 @@ -Developers: +Maintainers +=========== - * Ole-Andr?? Rodlie - <[email protected]> - * Michal Rost (8.2012 - 5.2013) - <[email protected]> - * Wittfella (5.2010 - 8.2012) - <[email protected]> + * Ole-Andr?? Rodlie <https://github.com/rodlie> + * version 6.0. + * Michal Rost <https://www.linux-apps.com/p/1131642/> + * version 5.6 to 5.9 (2012-2013). + * Wittfella <http://www.qtfm.org> + * version 1.0 to 5.5 (2010-2012). -Artists: +Contributors +============ + * DanielDevBR <https://github.com/ferion11> + * Brian Callahan <https://github.com/ibara> + * Tatsh <https://github.com/Tatsh> + * kubaroth <https://github.com/kubaroth> + * slackuser0xae34 <https://github.com/slackuser0xae34> * psikoz <https://github.com/psikoz> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/ChangeLog new/qtfm-6.2.1/ChangeLog --- old/qtfm-6.2.0/ChangeLog 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/ChangeLog 2021-05-30 17:03:24.000000000 +0200 @@ -1,3 +1,10 @@ +6.2.1 05-June 2021 +- fix remove symlink bug (thanks to @ferion11) +- fix build with Qt 5.15 (thanks to @a17r) +- fix memory leak (thanks to @Kakueeen) +- fix for "." start path +- fix .desktop key/value parser + 6.2.0 05-June 2019 - imagemagick support (improved thumbnail support) CONFIG+=with_magick - ffmpeg support (get thumbnails from audio/video) CONFIG+=with_ffmpeg @@ -8,14 +15,14 @@ - (u)disks now supports disk labels (with device name as fallback) - bookmarks: added "link" option in file actions - support .config/mimeapps.list -- support for OpenBSD +- support for OpenBSD (thanks to @ibara) - tabbar: hide if only one tab - remove "open file" in context menu if selected item is folder - added "open in new tab" in context menu - fixed run executable on double click - support running AppImages - fixed mount/umount issue with optical storage -- fixed current drag mode (thanks to @DanielDevBR) +- fixed current drag mode (thanks to @ferion11) - fix potential crash in close tab - show and run .desktop in file view @@ -36,7 +43,7 @@ - path tab-completion. Thanks to @kubaroth for the patch - completer handles expansion of ~ path. Thanks to @kubaroth for the patch - support mouse back button -- macOS support +- macOS support (thanks to @tatsh) - NetBSD support 6.1.5 09-December 2018 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/README.md new/qtfm-6.2.1/README.md --- old/qtfm-6.2.0/README.md 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/README.md 2021-05-30 17:03:24.000000000 +0200 @@ -89,7 +89,6 @@ * ``CONFIG+=with_magick`` : This will enable ``ImageMagick`` support. * ``MAGICK_PC=`` : Custom ``Magick++`` pkg-config .pc file. - * ``CONFIG+=magick7`` : Use ``ImageMagick`` v7+. * ``CONFIG+=oldmagick`` : If you have ``ImageMagick`` older than 6.9 *(Ubuntu)*. * ``CONFIG+=with_ffmpeg`` : This will enable FFmpeg support *(**NOTE!** requires ImageMagick)*. * ``CONFIG+=no_tray`` : This will disable ``qtfm-tray`` (``no_dbus`` will also disable this feature). @@ -124,4 +123,4 @@ qmake PREFIX=/usr CONFIG+=with_magick CONFIG+=with_ffmpeg .. make -jX make INSTALL_ROOT=<package> install -``` \ No newline at end of file +``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/fm/src/actiontriggers.cpp new/qtfm-6.2.1/fm/src/actiontriggers.cpp --- old/qtfm-6.2.0/fm/src/actiontriggers.cpp 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/fm/src/actiontriggers.cpp 2021-05-30 17:03:24.000000000 +0200 @@ -315,10 +315,7 @@ // Delete selected file(s) for (int i = 0; i < selList.count(); ++i) { QFileInfo file(modelList->filePath(selList.at(i))); - if (file.isWritable()) { - if (file.isSymLink()) { - ok = QFile::remove(file.filePath()); - } else { + if (file.isWritable() || file.isSymLink()) { if (yesToAll == false) { if (confirm) { QString title = tr("Careful"); @@ -330,10 +327,11 @@ if (ret == QMessageBox::No) return; } } - ok = modelList->remove(selList.at(i)); - } - } else if (file.isSymLink()) { - ok = QFile::remove(file.filePath()); + if (file.isSymLink()) { + ok = QFile::remove(file.filePath()); + } else { + ok = modelList->remove(selList.at(i)); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/fm/src/mainwindow.cpp new/qtfm-6.2.1/fm/src/mainwindow.cpp --- old/qtfm-6.2.0/fm/src/mainwindow.cpp 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/fm/src/mainwindow.cpp 2021-05-30 17:03:24.000000000 +0200 @@ -85,12 +85,15 @@ } #endif + // get path from cmd startPath = QDir::currentPath(); QStringList args = QApplication::arguments(); if(args.count() > 1) { startPath = args.at(1); - if(QUrl(startPath).isLocalFile()) { + if (startPath == ".") { + startPath = getenv("PWD"); + } else if (QUrl(startPath).isLocalFile()) { startPath = QUrl(args.at(1)).toLocalFile(); } } @@ -132,7 +135,7 @@ // Create filesystem model bool realMime = settings->value("realMimeTypes", true).toBool(); - modelList = new myModel(realMime, mimeUtils); + modelList = new myModel(realMime, mimeUtils, this); connect(modelList, SIGNAL(reloadDir(QString)), this, SLOT(handleReloadDir(QString))); dockTree = new QDockWidget(tr("Tree"),this,Qt::SubWindow); @@ -468,7 +471,7 @@ // Load zoom settings zoom = settings->value("zoom", 48).toInt(); zoomTree = settings->value("zoomTree", 16).toInt(); - zoomBook = settings->value("zoomBook", 32).toInt(); + zoomBook = settings->value("zoomBook", 24).toInt(); zoomList = settings->value("zoomList", 24).toInt(); zoomDetail = settings->value("zoomDetail", 32).toInt(); detailTree->setIconSize(QSize(zoomDetail, zoomDetail)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/libfm/iconlist.cpp new/qtfm-6.2.1/libfm/iconlist.cpp --- old/qtfm-6.2.0/libfm/iconlist.cpp 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/libfm/iconlist.cpp 2021-05-30 17:03:24.000000000 +0200 @@ -1,5 +1,7 @@ #include "iconlist.h" +#include <QPainterPath> + QSize IconListDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/libfm/iconview.cpp new/qtfm-6.2.1/libfm/iconview.cpp --- old/qtfm-6.2.0/libfm/iconview.cpp 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/libfm/iconview.cpp 2021-05-30 17:03:24.000000000 +0200 @@ -1,5 +1,7 @@ #include "iconview.h" +#include <QPainterPath> + bool IconViewDelegate::eventFilter(QObject *object, QEvent *event) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/libfm/mymodel.cpp new/qtfm-6.2.1/libfm/mymodel.cpp --- old/qtfm-6.2.0/libfm/mymodel.cpp 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/libfm/mymodel.cpp 2021-05-30 17:03:24.000000000 +0200 @@ -45,7 +45,8 @@ * @param realMime * @param mimeUtils */ -myModel::myModel(bool realMime, MimeUtils *mimeUtils) { +myModel::myModel(bool realMime, MimeUtils *mimeUtils, QObject *parent) + : QAbstractItemModel(parent) { // Stores mime utils mimeUtilsPtr = mimeUtils; @@ -107,6 +108,12 @@ * @brief Deletes model of file system */ myModel::~myModel() { + delete mimeGeneric; + delete mimeGlob; + delete mimeIcons; + delete folderIcons; + delete thumbs; + delete icons; delete rootItem; delete iconFactory; } @@ -727,7 +734,7 @@ #ifndef OLDMAGICK background.quiet(true); #endif -#ifdef MAGICK7 +#if MagickLibVersion >= 0x700 background.alpha(true); #else background.matte(true); @@ -876,11 +883,11 @@ Magick::Image background(Magick::Geometry((size_t)pixSize, (size_t)pixSize), Magick::Color("black")); - #ifdef MAGICK7 +#if MagickLibVersion >= 0x700 background.alpha(true); - #else +#else background.matte(true); - #endif +#endif background.backgroundColor(background.pixelColor(0,0)); background.transparent(background.pixelColor(0,0)); @@ -1005,7 +1012,7 @@ Magick::Image background(Magick::Geometry((size_t)pixSize, (size_t)pixSize), Magick::Color("black")); -#ifdef MAGICK7 +#if MagickLibVersion >= 0x700 background.alpha(true); #else background.matte(true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/libfm/mymodel.h new/qtfm-6.2.1/libfm/mymodel.h --- old/qtfm-6.2.0/libfm/mymodel.h 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/libfm/mymodel.h 2021-05-30 17:03:24.000000000 +0200 @@ -37,7 +37,7 @@ Q_OBJECT public: - myModel(bool realMime, MimeUtils* mimeUtils); + myModel(bool realMime, MimeUtils* mimeUtils, QObject* parent = nullptr); ~myModel(); void loadMimeTypes() const; void cacheInfo(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/libfm/properties.cpp new/qtfm-6.2.1/libfm/properties.cpp --- old/qtfm-6.2.0/libfm/properties.cpp 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/libfm/properties.cpp 2021-05-30 17:03:24.000000000 +0200 @@ -72,8 +72,10 @@ // If we are in correct group and line contains assignment then read data if (groupFound && line.contains("=")) { - QStringList tmp = line.split("="); - data.insert(tmp.at(0), tmp.at(1)); + int index = line.indexOf("="); + QString key = line.mid(0, index); + QString val = line.mid(index+1); + data.insert(key, val); } } file.close(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/share/imagemagick.pri new/qtfm-6.2.1/share/imagemagick.pri --- old/qtfm-6.2.0/share/imagemagick.pri 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/share/imagemagick.pri 2021-05-30 17:03:24.000000000 +0200 @@ -1,5 +1,4 @@ DEFINES += WITH_MAGICK -CONFIG(magick7): DEFINES += MAGICK7 CONFIG(oldmagick): DEFINES += OLDMAGICK MAGICK_CONFIG = Magick++ !isEmpty(MAGICK_PC): MAGICK_CONFIG = $${MAGICK} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtfm-6.2.0/share/qtfm.pri new/qtfm-6.2.1/share/qtfm.pri --- old/qtfm-6.2.0/share/qtfm.pri 2019-06-04 07:47:00.000000000 +0200 +++ new/qtfm-6.2.1/share/qtfm.pri 2021-05-30 17:03:24.000000000 +0200 @@ -2,7 +2,7 @@ QTFM_TARGET_NAME = "QtFM" QTFM_MAJOR = 6 QTFM_MINOR = 2 -QTFM_PATCH = 0 +QTFM_PATCH = 1 QMAKE_TARGET_COMPANY = "$${QTFM_TARGET_NAME}" QMAKE_TARGET_PRODUCT = "$${QTFM_TARGET_NAME}"
