mirror of
https://github.com/Ponce/slackbuilds
synced 2024-10-01 06:32:51 +02:00
libraries/wxGTK3: Fix assert in FileZilla.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
480674ff47
commit
3fae6c13b4
2 changed files with 33 additions and 1 deletions
29
libraries/wxGTK3/assert.patch
Normal file
29
libraries/wxGTK3/assert.patch
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
From ce1dce113c5eda42f49ba3278bb21c61872ca37d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paul Cornett <paulcor@users.noreply.github.com>
|
||||||
|
Date: Mon, 28 Aug 2017 20:31:47 -0700
|
||||||
|
Subject: [PATCH] Avoid delayed destruction if TLW was never created. See
|
||||||
|
#17942
|
||||||
|
|
||||||
|
(cherry picked from commit 4a71ba820f085a3d5a7233e9fd0e23ae4e45af58)
|
||||||
|
---
|
||||||
|
src/common/toplvcmn.cpp | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
|
||||||
|
index ef693690c5d..6a722f8be48 100644
|
||||||
|
--- a/src/common/toplvcmn.cpp
|
||||||
|
+++ b/src/common/toplvcmn.cpp
|
||||||
|
@@ -105,10 +105,10 @@ bool wxTopLevelWindowBase::Destroy()
|
||||||
|
// as we will be deleted anyhow during its destruction and the pointer
|
||||||
|
// stored in wxPendingDelete would become invalid, so just delete ourselves
|
||||||
|
// immediately in this case.
|
||||||
|
- if ( wxWindow* parent = GetParent() )
|
||||||
|
+ wxWindow* parent = GetParent();
|
||||||
|
+ if ( (parent && parent->IsBeingDeleted()) || !GetHandle() )
|
||||||
|
{
|
||||||
|
- if ( parent->IsBeingDeleted() )
|
||||||
|
- return wxNonOwnedWindow::Destroy();
|
||||||
|
+ return wxNonOwnedWindow::Destroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
// delayed destruction: the frame will be deleted during the next idle
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
PRGNAM=wxGTK3
|
PRGNAM=wxGTK3
|
||||||
VERSION=${VERSION:-3.0.3.1}
|
VERSION=${VERSION:-3.0.3.1}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
TAG=${TAG:-_SBo}
|
TAG=${TAG:-_SBo}
|
||||||
|
|
||||||
SRCNAM=wxWidgets
|
SRCNAM=wxWidgets
|
||||||
|
@ -93,6 +93,9 @@ find -L . \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
|
||||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||||
|
|
||||||
|
# fix assert in FileZilla
|
||||||
|
patch -p1 < $CWD/assert.patch
|
||||||
|
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
|
|
Loading…
Reference in a new issue