Index: head/net-p2p/qbittorrent/Makefile =================================================================== --- head/net-p2p/qbittorrent/Makefile (revision 439337) +++ head/net-p2p/qbittorrent/Makefile (revision 439338) @@ -1,78 +1,77 @@ # Created by: Doug Barton # $FreeBSD$ PORTNAME= qbittorrent -PORTVERSION= 3.3.11 -PORTREVISION= 1 +PORTVERSION= 3.3.12 CATEGORIES= net-p2p ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= yuri@rawbw.com COMMENT?= Bittorrent client using Qt4/5 and libtorrent-rasterbar LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \ libboost_system.so:devel/boost-libs USES= compiler:c++11-lib execinfo pkgconfig tar:xz QT4_USE= QT4=corelib,network,xml,qmake_build,linguisttools_build,moc_build,rcc_build,uic_build QT5_USE= QT5=core,network,xml,qmake_build,buildtools_build,linguisttools_build QT_NONSTANDARD= yes DESTDIRNAME= INSTALL_ROOT GNU_CONFIGURE= yes PORTDOCS= AUTHORS Changelog README.md .if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} == "no" WITH_GUI:= yes .else WITH_GUI:= no .endif OPTIONS_DEFINE= DBUS DEBUG DOCS OPTIONS_SINGLE= QT OPTIONS_SINGLE_QT= QT4 QT5 OPTIONS_DEFAULT= QT5 OPTION_QT= ${SELECTED_OPTIONS:MQT*} DEBUG_CONFIGURE_ENABLE= debug DBUS_CONFIGURE_ENABLE= qt-dbus QT4_CONFIGURE_ON= --with-qt4 .if ${WITH_GUI} == "yes" LIB_DEPENDS+= libGeoIP.so:net/GeoIP USES+= desktop-file-utils QT4_USE+= QT4=gui QT5_USE+= QT5=concurrent,gui,widgets GL=gl OPTIONS_DEFAULT+= DBUS .else CONFIGURE_ARGS+= --disable-gui .endif .include .if ${PORT_OPTIONS:MDBUS} USE_${OPTION_QT}+= dbus .endif CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" post-install: .if ${WITH_GUI} == "yes" @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/ .else @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent-nox ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/ .endif @${RM} -r ${STAGEDIR}${PREFIX}/share/man post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: head/net-p2p/qbittorrent/distinfo =================================================================== --- head/net-p2p/qbittorrent/distinfo (revision 439337) +++ head/net-p2p/qbittorrent/distinfo (revision 439338) @@ -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 Index: head/net-p2p/qbittorrent/files/patch-src_base_http_server.cpp =================================================================== --- head/net-p2p/qbittorrent/files/patch-src_base_http_server.cpp (revision 439337) +++ head/net-p2p/qbittorrent/files/patch-src_base_http_server.cpp (nonexistent) @@ -1,25 +0,0 @@ -# Missing header; upstream patch shuffles them a bit -# ---- src/base/http/server.cpp.orig 2017-03-03 23:20:21 UTC -+++ src/base/http/server.cpp -@@ -28,14 +28,18 @@ - * exception statement from your version. - */ - -+#include "server.h" -+ -+#include -+#include -+ - #ifndef QT_NO_OPENSSL - #include - #else - #include - #endif --#include -+ - #include "connection.h" --#include "server.h" - - using namespace Http; - Property changes on: head/net-p2p/qbittorrent/files/patch-src_base_http_server.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp =================================================================== --- head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp (revision 439337) +++ head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp (revision 439338) @@ -1,60 +1,33 @@ # 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 -#ifdef Q_OS_MAC +#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506) #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 -#ifdef Q_OS_MAC // workaround for Apple xcode: https://stackoverflow.com/a/29929949 +#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506) +// workaround for Apple xcode: https://stackoverflow.com/a/29929949 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 -#ifdef Q_OS_MAC // workaround for Apple xcode: https://stackoverflow.com/a/29929949 +#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506) +// workaround for Apple xcode: https://stackoverflow.com/a/29929949 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 - }