diff options
| author | wiz <wiz@pkgsrc.org> | 2016-10-21 15:29:11 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-10-21 15:29:11 +0000 |
| commit | 5a54fc6b7c8232c95267996e990f3d03f423c32f (patch) | |
| tree | fc78ac416a3d5d3269ab5259141e63d0e31fa2d3 /net/filezilla | |
| parent | 109d31b38ba9d708faf4c3ce9fd3f4a336af21d4 (diff) | |
| download | pkgsrc-5a54fc6b7c8232c95267996e990f3d03f423c32f.tar.gz | |
Add an upstream patch that hopefully fixes a rare assertion.
From Tim Kosse.
Bump PKGREVISION.
Diffstat (limited to 'net/filezilla')
| -rw-r--r-- | net/filezilla/Makefile | 3 | ||||
| -rw-r--r-- | net/filezilla/distinfo | 3 | ||||
| -rw-r--r-- | net/filezilla/patches/patch-src_interface_queue.cpp | 31 |
3 files changed, 35 insertions, 2 deletions
diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile index 29aa858ed6b..9c6ee3e9f5a 100644 --- a/net/filezilla/Makefile +++ b/net/filezilla/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.72 2016/09/19 13:36:05 wiz Exp $ +# $NetBSD: Makefile,v 1.73 2016/10/21 15:29:11 wiz Exp $ VERSION= 3.21.0 DISTNAME= FileZilla_${VERSION}_src PKGNAME= filezilla-${VERSION} +PKGREVISION= 1 CATEGORIES= net x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=filezilla/} EXTRACT_SUFX= .tar.bz2 diff --git a/net/filezilla/distinfo b/net/filezilla/distinfo index d6cf64ed0f8..0fb560e1475 100644 --- a/net/filezilla/distinfo +++ b/net/filezilla/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.29 2016/09/19 13:36:05 wiz Exp $ +$NetBSD: distinfo,v 1.30 2016/10/21 15:29:11 wiz Exp $ SHA1 (FileZilla_3.21.0_src.tar.bz2) = 18f5cb6dbae22c0d394e0807acc067940db7b584 RMD160 (FileZilla_3.21.0_src.tar.bz2) = 96a947a46025c6302529d099328606a6660ffe7f SHA512 (FileZilla_3.21.0_src.tar.bz2) = d58573c58e524a257cdbcb60fdb5c749d8e4f8a390b728b458721944b3e836cedf3478ff55565885ff1853ddb3f368d6e6e6d45142f19a9a4ee755b88ceb56b4 Size (FileZilla_3.21.0_src.tar.bz2) = 4428270 bytes +SHA1 (patch-src_interface_queue.cpp) = 6193fa6e29dd5ef709d6c4f8f27947ce1e7fa653 SHA1 (patch-src_putty_unix_uxshare.c) = 0c3102c10b742c461fe032f081d1a642c6fd6a59 diff --git a/net/filezilla/patches/patch-src_interface_queue.cpp b/net/filezilla/patches/patch-src_interface_queue.cpp new file mode 100644 index 00000000000..8b425866bbb --- /dev/null +++ b/net/filezilla/patches/patch-src_interface_queue.cpp @@ -0,0 +1,31 @@ +$NetBSD: patch-src_interface_queue.cpp,v 1.1 2016/10/21 15:29:11 wiz Exp $ + +Upstream patch for an assert(): +https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/src/interface/queue.cpp?view=patch&r1=7884&r2=7883&pathrev=7884 + +--- src/interface/queue.cpp.orig 2016-05-19 07:57:30.000000000 +0000 ++++ src/interface/queue.cpp +@@ -1049,12 +1049,20 @@ void CQueueViewBase::UpdateSelections_It + SetItemState(itemsToSelect.front(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + itemsToSelect.pop_front(); + } +- if (itemsToSelect.empty()) +- SetItemState(item, 0, wxLIST_STATE_SELECTED); +- else if (itemsToSelect.front() == item) ++ if (itemsToSelect.front() == item) { + itemsToSelect.pop_front(); ++ } ++ else { ++ SetItemState(item, 0, wxLIST_STATE_SELECTED); ++ } + + itemsToSelect.push_back(item + count); ++ if (item + count < GetItemCount()) { ++ // On generic list controls, new items may be selected by default after ++ // increasing the item count: Internally it sometimes keeps track ++ // of only unselected items. ++ itemsToSelect.push_back(item + count); ++ } + + item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + } |