Update krusader to 2.8.0
This commit is contained in:
rsadowski
parent
7577f9e844
commit
9600895cbb
@ -1,8 +1,7 @@
|
||||
COMMENT= twin panel file manager for KDE
|
||||
|
||||
VERSION= 2.7.2
|
||||
VERSION= 2.8.0
|
||||
DISTNAME= krusader-${VERSION}
|
||||
REVISION= 2
|
||||
|
||||
CATEGORIES= x11
|
||||
|
||||
@ -28,14 +27,14 @@ EXTRACT_SUFX= .tar.xz
|
||||
|
||||
MODULES = devel/kf5
|
||||
|
||||
RUN_DEPENDS += devel/desktop-file-utils \
|
||||
RUN_DEPENDS = devel/desktop-file-utils \
|
||||
x11/gtk+3,-guic \
|
||||
x11/kde-applications/kompare
|
||||
|
||||
BUILD_DEPENDS +=devel/kf5/kdoctools \
|
||||
BUILD_DEPENDS = devel/kf5/kdoctools \
|
||||
devel/gettext,-tools
|
||||
|
||||
LIB_DEPENDS += devel/kf5/karchive \
|
||||
LIB_DEPENDS = devel/kf5/karchive \
|
||||
devel/kf5/kauth \
|
||||
devel/kf5/kbookmarks \
|
||||
devel/kf5/kcodecs \
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (krusader-2.7.2.tar.xz) = QaOaQ7PELdHR7K6obfMMr/agYf7MHWb2CFmyo8qXYQk=
|
||||
SIZE (krusader-2.7.2.tar.xz) = 2912396
|
||||
SHA256 (krusader-2.8.0.tar.xz) = jkzwWpMYsLwbCUGBG5iLLyuwwEoNHjeZghKpGQzywpo=
|
||||
SIZE (krusader-2.8.0.tar.xz) = 3029352
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 415d519e825a6b8b64d2ef5f9a8e9bf7a458d1d0 Mon Sep 17 00:00:00 2001
|
||||
From: Adriaan de Groot <groot@kde.org>
|
||||
Date: Mon, 19 Apr 2021 22:39:44 +0200
|
||||
Subject: [PATCH] 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.
|
||||
|
||||
Index: krusader/Panel/listpanel.cpp
|
||||
--- krusader/Panel/listpanel.cpp.orig
|
||||
+++ krusader/Panel/listpanel.cpp
|
||||
@@ -379,6 +379,8 @@ ListPanel::ListPanel(QWidget *parent, AbstractPanelMan
|
||||
|
||||
ListPanel::~ListPanel()
|
||||
{
|
||||
+ view->widget()->removeEventFilter(this);
|
||||
+ urlNavigator->editor()->removeEventFilter(this);
|
||||
cancelProgress();
|
||||
delete view;
|
||||
view = 0;
|
||||
@@ -529,7 +531,7 @@ bool ListPanel::eventFilter(QObject * watched, QEvent
|
||||
}
|
||||
}
|
||||
// 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) {
|
||||
QKeyEvent *ke = static_cast<QKeyEvent *>(e);
|
||||
@ -1,8 +1,45 @@
|
||||
@bin bin/krusader
|
||||
@so lib/qt5/plugins/kio_iso.so
|
||||
@so lib/qt5/plugins/kio_krarc.so
|
||||
@so lib/qt5/plugins/kf5/kio/kio_iso.so
|
||||
@so lib/qt5/plugins/kf5/kio/kio_krarc.so
|
||||
@man man/man1/krusader.1
|
||||
share/applications/org.kde.krusader.desktop
|
||||
share/doc/HTML/ca/krusader/
|
||||
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/release-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/
|
||||
share/doc/HTML/de/krusader/advanced-functions.docbook
|
||||
share/doc/HTML/de/krusader/archives.docbook
|
||||
@ -65,7 +102,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
|
||||
@ -152,7 +188,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
|
||||
@ -362,13 +397,12 @@ 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
|
||||
share/kxmlgui5/
|
||||
share/kxmlgui5/krusader/
|
||||
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
|
||||
@ -392,6 +426,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…
Reference in New Issue
Block a user