x11-fm/krusader2: update to 2.8.0 release (+)
Release notes: https://krusader.org/release/2.8.0/release_notes.txt Changelog: https://krusader.org/release/2.8.0/changelog.txt
This commit is contained in:
Dima Panov
parent
086e94d318
commit
9f8d95d50d
@ -1,6 +1,5 @@
|
||||
PORTNAME= krusader
|
||||
DISTVERSION= 2.7.2
|
||||
PORTREVISION= 2
|
||||
DISTVERSION= 2.8.0
|
||||
CATEGORIES= x11-fm kde
|
||||
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/
|
||||
|
||||
@ -9,9 +8,10 @@ COMMENT= Twin panel file manager for KDE, like midnight or norton commander
|
||||
WWW= https://krusader.org/
|
||||
|
||||
LICENSE= GPLv2+
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-2.0-or-later.txt
|
||||
|
||||
USES= cmake compiler:c++11-lang cpe gettext kde:5 qt:5 tar:xz xorg
|
||||
USES= cmake compiler:c++11-lang cpe desktop-file-utils gettext \
|
||||
kde:5 qt:5 tar:xz xorg
|
||||
USE_KDE= archive auth auth bookmarks codecs completion config \
|
||||
configwidgets coreaddons doctools ecm guiaddons i18n \
|
||||
iconthemes itemviews jobwidgets kio notifications parts \
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1566836892
|
||||
SHA256 (krusader-2.7.2.tar.xz) = 41a39a43b3c42dd1d1ecaea86df30caff6a061fecc1d66f60859b2a3ca976109
|
||||
SIZE (krusader-2.7.2.tar.xz) = 2912396
|
||||
TIMESTAMP = 1669149193
|
||||
SHA256 (krusader-2.8.0.tar.xz) = 8e4cf05a9318b0bc1b0941811b988b2f2bb0c04a0d1e37998212a9190cf2c29a
|
||||
SIZE (krusader-2.8.0.tar.xz) = 3029352
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
commit 415d519e825a6b8b64d2ef5f9a8e9bf7a458d1d0 (HEAD -> master, origin/master, origin/HEAD)
|
||||
Author: Adriaan de Groot <groot@kde.org>
|
||||
Date: Mon Apr 19 22:39:44 2021 +0200
|
||||
|
||||
Fix crash-on-exit on FreeBSD
|
||||
|
||||
Scenario:
|
||||
- start krusader
|
||||
- close the application (alt-f4, or click the window-close button)
|
||||
- SEGV, with this (edited) backtrace:
|
||||
#0 KUrlNavigator::editor (this=0x80a562400)
|
||||
#1 0x000000000031e20e in ListPanel::eventFilter (this=0x80c2309c0, watched=0x80a6980d0, e=0x7fffffffc278)
|
||||
#6 0x00000008018c3c0c in QWidget::~QWidget() () from /usr/local/lib/qt5/libQt5Widgets.so.5
|
||||
#7 0x0000000800a26c4e in KUrlComboBox::~KUrlComboBox (this=0x80a6980d0)
|
||||
#11 0x00000008005de60b in KUrlNavigator::~KUrlNavigator (this=0x80a562400)
|
||||
#13 0x000000000031d5a5 in ListPanel::~ListPanel (this=0x80c2309c0)
|
||||
|
||||
Analysis:
|
||||
- During the destructor, events are triggered, which hit the
|
||||
event-filter function in the object that is undergoing destruction.
|
||||
Since some of the objects referred to via pointer in the event-filter
|
||||
are dead or being-destroyed, this is UB (so be glad it crashes!).
|
||||
- This is very similar to the problem and backtrace in KIO commit
|
||||
a8a2c08014484145a4bd2a541a1cbeb8be856bf1.
|
||||
|
||||
Fix:
|
||||
- Uninstall the event-filter before carrying on with destruction.
|
||||
- While here, add an extra nullptr check for the combobox in
|
||||
the event-filter.
|
||||
|
||||
diff --git krusader/Panel/listpanel.cpp krusader/Panel/listpanel.cpp
|
||||
index 6f57c321..6a0914c6 100644
|
||||
--- krusader/Panel/listpanel.cpp
|
||||
+++ krusader/Panel/listpanel.cpp
|
||||
@@ -380,6 +380,8 @@ ListPanel::ListPanel(QWidget *parent, AbstractPanelManager *manager, const KConf
|
||||
|
||||
ListPanel::~ListPanel()
|
||||
{
|
||||
+ view->widget()->removeEventFilter(this);
|
||||
+ urlNavigator->editor()->removeEventFilter(this);
|
||||
cancelProgress();
|
||||
delete view;
|
||||
view = nullptr;
|
||||
@@ -527,7 +529,7 @@ bool ListPanel::eventFilter(QObject * watched, QEvent * e)
|
||||
}
|
||||
}
|
||||
// handle URL navigator key events
|
||||
- else if(watched == urlNavigator->editor()) {
|
||||
+ else if(urlNavigator && watched == urlNavigator->editor()) {
|
||||
// override default shortcut for panel focus
|
||||
if(e->type() == QEvent::ShortcutOverride) {
|
||||
auto *ke = dynamic_cast<QKeyEvent *>(e);
|
||||
@ -1,7 +1,8 @@
|
||||
bin/krusader
|
||||
etc/xdg/kio_isorc
|
||||
%%QT_PLUGINDIR%%/kio_iso.so
|
||||
%%QT_PLUGINDIR%%/kio_krarc.so
|
||||
%%QT_PLUGINDIR%%/kf5/kio/kio_iso.so
|
||||
%%QT_PLUGINDIR%%/kf5/kio/kio_krarc.so
|
||||
man/ca/man1/krusader.1.gz
|
||||
man/de/man1/krusader.1.gz
|
||||
man/it/man1/krusader.1.gz
|
||||
man/man1/krusader.1.gz
|
||||
@ -10,6 +11,42 @@ man/pt/man1/krusader.1.gz
|
||||
man/sv/man1/krusader.1.gz
|
||||
man/uk/man1/krusader.1.gz
|
||||
share/applications/org.kde.krusader.desktop
|
||||
share/doc/HTML/ca/krusader/advanced-functions.docbook
|
||||
share/doc/HTML/ca/krusader/archives.docbook
|
||||
share/doc/HTML/ca/krusader/basic-functions.docbook
|
||||
share/doc/HTML/ca/krusader/bookmarks.docbook
|
||||
share/doc/HTML/ca/krusader/checksum.docbook
|
||||
share/doc/HTML/ca/krusader/compare.docbook
|
||||
share/doc/HTML/ca/krusader/configuration-files.docbook
|
||||
share/doc/HTML/ca/krusader/credits-and-license.docbook
|
||||
share/doc/HTML/ca/krusader/diskusage.docbook
|
||||
share/doc/HTML/ca/krusader/editors-note.docbook
|
||||
share/doc/HTML/ca/krusader/faq.docbook
|
||||
share/doc/HTML/ca/krusader/features.docbook
|
||||
share/doc/HTML/ca/krusader/glossary.docbook
|
||||
share/doc/HTML/ca/krusader/help.docbook
|
||||
share/doc/HTML/ca/krusader/index.cache.bz2
|
||||
share/doc/HTML/ca/krusader/index.docbook
|
||||
share/doc/HTML/ca/krusader/introduction.docbook
|
||||
share/doc/HTML/ca/krusader/keyboard-commands.docbook
|
||||
share/doc/HTML/ca/krusader/konfigurator.docbook
|
||||
share/doc/HTML/ca/krusader/krusader-tools.docbook
|
||||
share/doc/HTML/ca/krusader/locate.docbook
|
||||
share/doc/HTML/ca/krusader/menu-commands.docbook
|
||||
share/doc/HTML/ca/krusader/mount.docbook
|
||||
share/doc/HTML/ca/krusader/mouse-commands.docbook
|
||||
share/doc/HTML/ca/krusader/occupied-space.docbook
|
||||
share/doc/HTML/ca/krusader/profiles.docbook
|
||||
share/doc/HTML/ca/krusader/%%CMAKE_BUILD_TYPE%%-overview.docbook
|
||||
share/doc/HTML/ca/krusader/remote-connections.docbook
|
||||
share/doc/HTML/ca/krusader/search.docbook
|
||||
share/doc/HTML/ca/krusader/splitter.docbook
|
||||
share/doc/HTML/ca/krusader/synchronizer.docbook
|
||||
share/doc/HTML/ca/krusader/user-interface.docbook
|
||||
share/doc/HTML/ca/krusader/useraction-xml.docbook
|
||||
share/doc/HTML/ca/krusader/useractions.docbook
|
||||
share/doc/HTML/ca/krusader/vfs.docbook
|
||||
share/doc/HTML/ca/krusader/viewer-editor.docbook
|
||||
share/doc/HTML/de/krusader/advanced-functions.docbook
|
||||
share/doc/HTML/de/krusader/archives.docbook
|
||||
share/doc/HTML/de/krusader/basic-functions.docbook
|
||||
@ -37,7 +74,7 @@ share/doc/HTML/de/krusader/mount.docbook
|
||||
share/doc/HTML/de/krusader/mouse-commands.docbook
|
||||
share/doc/HTML/de/krusader/occupied-space.docbook
|
||||
share/doc/HTML/de/krusader/profiles.docbook
|
||||
share/doc/HTML/de/krusader/release-overview.docbook
|
||||
share/doc/HTML/de/krusader/%%CMAKE_BUILD_TYPE%%-overview.docbook
|
||||
share/doc/HTML/de/krusader/remote-connections.docbook
|
||||
share/doc/HTML/de/krusader/search.docbook
|
||||
share/doc/HTML/de/krusader/splitter.docbook
|
||||
@ -70,7 +107,6 @@ share/doc/HTML/en/krusader/glossary.docbook
|
||||
share/doc/HTML/en/krusader/help.docbook
|
||||
share/doc/HTML/en/krusader/index.cache.bz2
|
||||
share/doc/HTML/en/krusader/index.docbook
|
||||
share/doc/HTML/en/krusader/installation.docbook
|
||||
share/doc/HTML/en/krusader/introduction.docbook
|
||||
share/doc/HTML/en/krusader/keyboard-commands.docbook
|
||||
share/doc/HTML/en/krusader/kgstartup.png
|
||||
@ -86,7 +122,7 @@ share/doc/HTML/en/krusader/mountman.png
|
||||
share/doc/HTML/en/krusader/mouse-commands.docbook
|
||||
share/doc/HTML/en/krusader/occupied-space.docbook
|
||||
share/doc/HTML/en/krusader/profiles.docbook
|
||||
share/doc/HTML/en/krusader/release-overview.docbook
|
||||
share/doc/HTML/en/krusader/%%CMAKE_BUILD_TYPE%%-overview.docbook
|
||||
share/doc/HTML/en/krusader/remote-connections.docbook
|
||||
share/doc/HTML/en/krusader/search.docbook
|
||||
share/doc/HTML/en/krusader/search_advanced.png
|
||||
@ -129,7 +165,7 @@ share/doc/HTML/it/krusader/mount.docbook
|
||||
share/doc/HTML/it/krusader/mouse-commands.docbook
|
||||
share/doc/HTML/it/krusader/occupied-space.docbook
|
||||
share/doc/HTML/it/krusader/profiles.docbook
|
||||
share/doc/HTML/it/krusader/release-overview.docbook
|
||||
share/doc/HTML/it/krusader/%%CMAKE_BUILD_TYPE%%-overview.docbook
|
||||
share/doc/HTML/it/krusader/remote-connections.docbook
|
||||
share/doc/HTML/it/krusader/search.docbook
|
||||
share/doc/HTML/it/krusader/splitter.docbook
|
||||
@ -155,7 +191,6 @@ share/doc/HTML/nl/krusader/glossary.docbook
|
||||
share/doc/HTML/nl/krusader/help.docbook
|
||||
share/doc/HTML/nl/krusader/index.cache.bz2
|
||||
share/doc/HTML/nl/krusader/index.docbook
|
||||
share/doc/HTML/nl/krusader/installation.docbook
|
||||
share/doc/HTML/nl/krusader/introduction.docbook
|
||||
share/doc/HTML/nl/krusader/keyboard-commands.docbook
|
||||
share/doc/HTML/nl/krusader/konfigurator.docbook
|
||||
@ -166,7 +201,7 @@ share/doc/HTML/nl/krusader/mount.docbook
|
||||
share/doc/HTML/nl/krusader/mouse-commands.docbook
|
||||
share/doc/HTML/nl/krusader/occupied-space.docbook
|
||||
share/doc/HTML/nl/krusader/profiles.docbook
|
||||
share/doc/HTML/nl/krusader/release-overview.docbook
|
||||
share/doc/HTML/nl/krusader/%%CMAKE_BUILD_TYPE%%-overview.docbook
|
||||
share/doc/HTML/nl/krusader/remote-connections.docbook
|
||||
share/doc/HTML/nl/krusader/search.docbook
|
||||
share/doc/HTML/nl/krusader/splitter.docbook
|
||||
@ -203,7 +238,7 @@ share/doc/HTML/pt/krusader/mount.docbook
|
||||
share/doc/HTML/pt/krusader/mouse-commands.docbook
|
||||
share/doc/HTML/pt/krusader/occupied-space.docbook
|
||||
share/doc/HTML/pt/krusader/profiles.docbook
|
||||
share/doc/HTML/pt/krusader/release-overview.docbook
|
||||
share/doc/HTML/pt/krusader/%%CMAKE_BUILD_TYPE%%-overview.docbook
|
||||
share/doc/HTML/pt/krusader/remote-connections.docbook
|
||||
share/doc/HTML/pt/krusader/search.docbook
|
||||
share/doc/HTML/pt/krusader/splitter.docbook
|
||||
@ -240,7 +275,7 @@ share/doc/HTML/sv/krusader/mount.docbook
|
||||
share/doc/HTML/sv/krusader/mouse-commands.docbook
|
||||
share/doc/HTML/sv/krusader/occupied-space.docbook
|
||||
share/doc/HTML/sv/krusader/profiles.docbook
|
||||
share/doc/HTML/sv/krusader/release-overview.docbook
|
||||
share/doc/HTML/sv/krusader/%%CMAKE_BUILD_TYPE%%-overview.docbook
|
||||
share/doc/HTML/sv/krusader/remote-connections.docbook
|
||||
share/doc/HTML/sv/krusader/search.docbook
|
||||
share/doc/HTML/sv/krusader/splitter.docbook
|
||||
@ -286,7 +321,7 @@ share/doc/HTML/uk/krusader/mountman.png
|
||||
share/doc/HTML/uk/krusader/mouse-commands.docbook
|
||||
share/doc/HTML/uk/krusader/occupied-space.docbook
|
||||
share/doc/HTML/uk/krusader/profiles.docbook
|
||||
share/doc/HTML/uk/krusader/release-overview.docbook
|
||||
share/doc/HTML/uk/krusader/%%CMAKE_BUILD_TYPE%%-overview.docbook
|
||||
share/doc/HTML/uk/krusader/remote-connections.docbook
|
||||
share/doc/HTML/uk/krusader/search.docbook
|
||||
share/doc/HTML/uk/krusader/search_advanced.png
|
||||
@ -325,35 +360,34 @@ share/icons/hicolor/64x64/apps/krusader_red.png
|
||||
share/icons/hicolor/64x64/apps/krusader_root.png
|
||||
share/icons/hicolor/64x64/apps/krusader_shield.png
|
||||
share/icons/hicolor/64x64/apps/krusader_user.png
|
||||
share/krusader/icons/hicolor/16x16/actions/kr_combine.png
|
||||
share/krusader/icons/hicolor/16x16/actions/kr_comparedirs.png
|
||||
share/krusader/icons/hicolor/16x16/actions/kr_diskusage.png
|
||||
share/krusader/icons/hicolor/16x16/actions/kr_mountman.png
|
||||
share/krusader/icons/hicolor/16x16/actions/kr_syncbrowse_off.png
|
||||
share/krusader/icons/hicolor/16x16/actions/kr_syncbrowse_on.png
|
||||
share/krusader/icons/hicolor/16x16/actions/kr_unselect.png
|
||||
share/krusader/icons/hicolor/22x22/actions/kr_combine.png
|
||||
share/krusader/icons/hicolor/22x22/actions/kr_comparedirs.png
|
||||
share/krusader/icons/hicolor/22x22/actions/kr_diskusage.png
|
||||
share/krusader/icons/hicolor/22x22/actions/kr_mountman.png
|
||||
share/krusader/icons/hicolor/22x22/actions/kr_unselect.png
|
||||
share/krusader/icons/hicolor/32x32/actions/kr_combine.png
|
||||
share/krusader/icons/hicolor/32x32/actions/kr_comparedirs.png
|
||||
share/krusader/icons/hicolor/32x32/actions/kr_diskusage.png
|
||||
share/krusader/icons/hicolor/32x32/actions/kr_mountman.png
|
||||
share/krusader/icons/hicolor/32x32/actions/kr_unselect.png
|
||||
share/krusader/layout.xml
|
||||
share/krusader/midnight_commander.color
|
||||
share/krusader/splash.png
|
||||
share/krusader/total_commander.color
|
||||
share/krusader/total_commander.keymap
|
||||
share/krusader/total_commander.keymap.info
|
||||
share/krusader/useraction_examples.xml
|
||||
share/kservices5/iso.protocol
|
||||
share/kservices5/krarc.protocol
|
||||
%%DATADIR%%/icons/hicolor/16x16/actions/kr_combine.png
|
||||
%%DATADIR%%/icons/hicolor/16x16/actions/kr_comparedirs.png
|
||||
%%DATADIR%%/icons/hicolor/16x16/actions/kr_diskusage.png
|
||||
%%DATADIR%%/icons/hicolor/16x16/actions/kr_mountman.png
|
||||
%%DATADIR%%/icons/hicolor/16x16/actions/kr_syncbrowse_off.png
|
||||
%%DATADIR%%/icons/hicolor/16x16/actions/kr_syncbrowse_on.png
|
||||
%%DATADIR%%/icons/hicolor/16x16/actions/kr_unselect.png
|
||||
%%DATADIR%%/icons/hicolor/22x22/actions/kr_combine.png
|
||||
%%DATADIR%%/icons/hicolor/22x22/actions/kr_comparedirs.png
|
||||
%%DATADIR%%/icons/hicolor/22x22/actions/kr_diskusage.png
|
||||
%%DATADIR%%/icons/hicolor/22x22/actions/kr_mountman.png
|
||||
%%DATADIR%%/icons/hicolor/22x22/actions/kr_unselect.png
|
||||
%%DATADIR%%/icons/hicolor/32x32/actions/kr_combine.png
|
||||
%%DATADIR%%/icons/hicolor/32x32/actions/kr_comparedirs.png
|
||||
%%DATADIR%%/icons/hicolor/32x32/actions/kr_diskusage.png
|
||||
%%DATADIR%%/icons/hicolor/32x32/actions/kr_mountman.png
|
||||
%%DATADIR%%/icons/hicolor/32x32/actions/kr_unselect.png
|
||||
%%DATADIR%%/layout.xml
|
||||
%%DATADIR%%/midnight_commander.color
|
||||
%%DATADIR%%/splash.png
|
||||
%%DATADIR%%/total_commander.color
|
||||
%%DATADIR%%/total_commander.keymap
|
||||
%%DATADIR%%/total_commander.keymap.info
|
||||
%%DATADIR%%/useraction_examples.xml
|
||||
share/kxmlgui5/krusader/krusaderlisterui.rc
|
||||
share/kxmlgui5/krusader/krusaderui.rc
|
||||
share/kxmlgui5/krusader/krviewer.rc
|
||||
share/locale/ar/LC_MESSAGES/krusader.mo
|
||||
share/locale/ast/LC_MESSAGES/krusader.mo
|
||||
share/locale/bg/LC_MESSAGES/krusader.mo
|
||||
share/locale/bs/LC_MESSAGES/krusader.mo
|
||||
@ -377,6 +411,7 @@ share/locale/hu/LC_MESSAGES/krusader.mo
|
||||
share/locale/ia/LC_MESSAGES/krusader.mo
|
||||
share/locale/it/LC_MESSAGES/krusader.mo
|
||||
share/locale/ja/LC_MESSAGES/krusader.mo
|
||||
share/locale/ka/LC_MESSAGES/krusader.mo
|
||||
share/locale/ko/LC_MESSAGES/krusader.mo
|
||||
share/locale/lt/LC_MESSAGES/krusader.mo
|
||||
share/locale/mai/LC_MESSAGES/krusader.mo
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user