summaryrefslogtreecommitdiff
path: root/libraries/wxGTK3
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-11-06 10:01:25 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-11-11 07:07:24 +0700
commit3fae6c13b41e3adbccf4a599a130ecbe7c19c4c2 (patch)
tree5ba0735631d71452ea8ec7a5381508d3a612a4c1 /libraries/wxGTK3
parent480674ff47998aac1b3c44a4b819061d67d6a7eb (diff)
downloadslackbuilds-3fae6c13b41e3adbccf4a599a130ecbe7c19c4c2.tar.gz
libraries/wxGTK3: Fix assert in FileZilla.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/wxGTK3')
-rw-r--r--libraries/wxGTK3/assert.patch29
-rw-r--r--libraries/wxGTK3/wxGTK3.SlackBuild5
2 files changed, 33 insertions, 1 deletions
diff --git a/libraries/wxGTK3/assert.patch b/libraries/wxGTK3/assert.patch
new file mode 100644
index 0000000000..ea5cae370e
--- /dev/null
+++ b/libraries/wxGTK3/assert.patch
@@ -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
diff --git a/libraries/wxGTK3/wxGTK3.SlackBuild b/libraries/wxGTK3/wxGTK3.SlackBuild
index 04bfd3c96f..7d94177489 100644
--- a/libraries/wxGTK3/wxGTK3.SlackBuild
+++ b/libraries/wxGTK3/wxGTK3.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=wxGTK3
VERSION=${VERSION:-3.0.3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
SRCNAM=wxWidgets
@@ -93,6 +93,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# fix assert in FileZilla
+patch -p1 < $CWD/assert.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \