From owner-svn-ports-head@freebsd.org Mon Apr 24 17:43:09 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4A35D4EFA4; Mon, 24 Apr 2017 17:43:09 +0000 (UTC) (envelope-from rezny@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91BBC18CB; Mon, 24 Apr 2017 17:43:09 +0000 (UTC) (envelope-from rezny@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3OHh8fL092321; Mon, 24 Apr 2017 17:43:08 GMT (envelope-from rezny@FreeBSD.org) Received: (from rezny@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3OHh8h0092318; Mon, 24 Apr 2017 17:43:08 GMT (envelope-from rezny@FreeBSD.org) Message-Id: <201704241743.v3OHh8h0092318@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rezny set sender to rezny@FreeBSD.org using -f From: Matthew Rezny Date: Mon, 24 Apr 2017 17:43:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r439338 - in head/net-p2p/qbittorrent: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Apr 2017 17:43:09 -0000 Author: rezny Date: Mon Apr 24 17:43:08 2017 New Revision: 439338 URL: https://svnweb.freebsd.org/changeset/ports/439338 Log: Update to 3.3.12 PR: 218817 Approved by: yuri@rawbw.com (maintainer), swills (mentor) Differential Revision: https://reviews.freebsd.org/D10464 Deleted: head/net-p2p/qbittorrent/files/patch-src_base_http_server.cpp Modified: head/net-p2p/qbittorrent/Makefile head/net-p2p/qbittorrent/distinfo head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp Modified: head/net-p2p/qbittorrent/Makefile ============================================================================== --- head/net-p2p/qbittorrent/Makefile Mon Apr 24 17:40:10 2017 (r439337) +++ head/net-p2p/qbittorrent/Makefile Mon Apr 24 17:43:08 2017 (r439338) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qbittorrent -PORTVERSION= 3.3.11 -PORTREVISION= 1 +PORTVERSION= 3.3.12 CATEGORIES= net-p2p ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Modified: head/net-p2p/qbittorrent/distinfo ============================================================================== --- head/net-p2p/qbittorrent/distinfo Mon Apr 24 17:40:10 2017 (r439337) +++ head/net-p2p/qbittorrent/distinfo Mon Apr 24 17:43:08 2017 (r439338) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488638509 -SHA256 (qbittorrent-3.3.11.tar.xz) = 4892ac5ed4bde2ed325fb67456698e703bb933b9eb1d146598259f4e2154a760 -SIZE (qbittorrent-3.3.11.tar.xz) = 2986312 +TIMESTAMP = 1492894034 +SHA256 (qbittorrent-3.3.12.tar.xz) = 56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f +SIZE (qbittorrent-3.3.12.tar.xz) = 2989604 Modified: head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp ============================================================================== --- head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp Mon Apr 24 17:40:10 2017 (r439337) +++ head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp Mon Apr 24 17:43:08 2017 (r439338) @@ -1,10 +1,8 @@ # Avoid use of thread local storage on versions prior to which it was supported. # -# Qt::escape is part of QtGui, upstream patch replaces it for webui -# ---- src/base/utils/string.cpp.orig 2017-03-03 23:20:21 UTC +--- src/base/utils/string.cpp.orig 2017-04-06 16:53:25 UTC +++ src/base/utils/string.cpp -@@ -37,7 +37,7 @@ +@@ -38,7 +38,7 @@ #ifdef QBT_USES_QT5 #include #endif @@ -13,7 +11,7 @@ #include #endif -@@ -146,7 +146,8 @@ bool Utils::String::naturalCompareCaseSe +@@ -147,7 +147,8 @@ bool Utils::String::naturalCompareCaseSe { // provide a single `NaturalCompare` instance for easy use // https://doc.qt.io/qt-5/threads-reentrancy.html @@ -23,7 +21,7 @@ static QThreadStorage nCmp; if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(true)); return (nCmp.localData())(left, right); -@@ -160,7 +161,8 @@ bool Utils::String::naturalCompareCaseIn +@@ -161,7 +162,8 @@ bool Utils::String::naturalCompareCaseIn { // provide a single `NaturalCompare` instance for easy use // https://doc.qt.io/qt-5/threads-reentrancy.html @@ -33,28 +31,3 @@ static QThreadStorage nCmp; if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(false)); return (nCmp.localData())(left, right); -@@ -217,6 +219,23 @@ QString Utils::String::toHtmlEscaped(con - #ifdef QBT_USES_QT5 - return str.toHtmlEscaped(); - #else -- return Qt::escape(str); -+ // code from Qt -+ QString rich; -+ const int len = str.length(); -+ rich.reserve(int(len * 1.1)); -+ for (int i = 0; i < len; ++i) { -+ if (str.at(i) == QLatin1Char('<')) -+ rich += QLatin1String("<"); -+ else if (str.at(i) == QLatin1Char('>')) -+ rich += QLatin1String(">"); -+ else if (str.at(i) == QLatin1Char('&')) -+ rich += QLatin1String("&"); -+ else if (str.at(i) == QLatin1Char('"')) -+ rich += QLatin1String("""); -+ else -+ rich += str.at(i); -+ } -+ rich.squeeze(); -+ return rich; - #endif - }