Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1477063751286990"
MIME-Version: 1.0
Date: Fri, 21 Oct 2016 15:29:11 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/net/filezilla
To: pkgsrc-changes@NetBSD.org
Reply-To: wiz@netbsd.org
Message-Id: <20161021152912.0195DFBD2@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1477063751286990
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri Oct 21 15:29:11 UTC 2016

Modified Files:
	pkgsrc/net/filezilla: Makefile distinfo
Added Files:
	pkgsrc/net/filezilla/patches: patch-src_interface_queue.cpp

Log Message:
Add an upstream patch that hopefully fixes a rare assertion.
>From Tim Kosse.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/net/filezilla/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/filezilla/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/filezilla/patches/patch-src_interface_queue.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1477063751286990
Content-Disposition: inline
Content-Length: 3012
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/filezilla/Makefile
diff -u pkgsrc/net/filezilla/Makefile:1.72 pkgsrc/net/filezilla/Makefile:1.73
--- pkgsrc/net/filezilla/Makefile:1.72	Mon Sep 19 13:36:05 2016
+++ pkgsrc/net/filezilla/Makefile	Fri Oct 21 15:29:11 2016
@@ -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

Index: pkgsrc/net/filezilla/distinfo
diff -u pkgsrc/net/filezilla/distinfo:1.29 pkgsrc/net/filezilla/distinfo:1.30
--- pkgsrc/net/filezilla/distinfo:1.29	Mon Sep 19 13:36:05 2016
+++ pkgsrc/net/filezilla/distinfo	Fri Oct 21 15:29:11 2016
@@ -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

Added files:

Index: pkgsrc/net/filezilla/patches/patch-src_interface_queue.cpp
diff -u /dev/null pkgsrc/net/filezilla/patches/patch-src_interface_queue.cpp:1.1
--- /dev/null	Fri Oct 21 15:29:11 2016
+++ pkgsrc/net/filezilla/patches/patch-src_interface_queue.cpp	Fri Oct 21 15:29:11 2016
@@ -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);
+ 	}


--_----------=_1477063751286990--