summaryrefslogtreecommitdiff
path: root/libraries/wxGTK3
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-03-10 07:03:33 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-03-10 07:04:00 +0700
commit696d1fbd7bfb06cefc8fa0755dd888de1adf885a (patch)
treef352ceaec623c6b1b917ba487e85111cb4e2cbf0 /libraries/wxGTK3
parent95fd829f8b121306ec5ac2371b7350c839c4cde6 (diff)
downloadslackbuilds-696d1fbd7bfb06cefc8fa0755dd888de1adf885a.tar.gz
libraries/wxGTK3: Updated for version 3.0.4.
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.SlackBuild9
-rw-r--r--libraries/wxGTK3/wxGTK3.info6
3 files changed, 6 insertions, 38 deletions
diff --git a/libraries/wxGTK3/assert.patch b/libraries/wxGTK3/assert.patch
deleted file mode 100644
index ea5cae370e..0000000000
--- a/libraries/wxGTK3/assert.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 7d94177489..68639b344e 100644
--- a/libraries/wxGTK3/wxGTK3.SlackBuild
+++ b/libraries/wxGTK3/wxGTK3.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for wxGTK3
-# Copyright 2013-2017 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
+# Copyright 2013-2018 Willy Sudiarto Raharjo <willysr@slackbuilds.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=wxGTK3
-VERSION=${VERSION:-3.0.3.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.0.4}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SRCNAM=wxWidgets
@@ -93,9 +93,6 @@ 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 \
diff --git a/libraries/wxGTK3/wxGTK3.info b/libraries/wxGTK3/wxGTK3.info
index b8451f3fea..7edde8a4a5 100644
--- a/libraries/wxGTK3/wxGTK3.info
+++ b/libraries/wxGTK3/wxGTK3.info
@@ -1,8 +1,8 @@
PRGNAM="wxGTK3"
-VERSION="3.0.3.1"
+VERSION="3.0.4"
HOMEPAGE="http://www.wxwidgets.org"
-DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/v3.0.3.1/wxWidgets-3.0.3.1.tar.gz"
-MD5SUM="bd7ece1a472d85d44edf7600834316e4"
+DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/v3.0.4/wxWidgets-3.0.4.tar.gz"
+MD5SUM="148a57dc7e1a025b28d5dbffc99e38eb"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""