svn commit: r436556 - in head/net-p2p/qbittorrent: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Mon Mar 20 18:17:38 UTC 2017
Author: amdmi3
Date: Mon Mar 20 18:17:36 2017
New Revision: 436556
URL: https://svnweb.freebsd.org/changeset/ports/436556
Log:
- Update to 3.3.11
- While here, fix LICENSE and add LICENSE_FILE
PR: 217550
Submitted by: rezny at freebsd.org
Approved by: maintainer timeout (yuri at rawbw.com, 2 weeks)
Added:
head/net-p2p/qbittorrent/files/patch-src_base_http_server.cpp (contents, props changed)
Deleted:
head/net-p2p/qbittorrent/files/patch-src_base_bittorrent_session.cpp
Modified:
head/net-p2p/qbittorrent/Makefile
head/net-p2p/qbittorrent/distinfo
head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp
head/net-p2p/qbittorrent/pkg-plist
Modified: head/net-p2p/qbittorrent/Makefile
==============================================================================
--- head/net-p2p/qbittorrent/Makefile Mon Mar 20 18:16:43 2017 (r436555)
+++ head/net-p2p/qbittorrent/Makefile Mon Mar 20 18:17:36 2017 (r436556)
@@ -2,15 +2,15 @@
# $FreeBSD$
PORTNAME= qbittorrent
-PORTVERSION= 3.3.10
-PORTREVISION= 1
+PORTVERSION= 3.3.11
CATEGORIES= net-p2p ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= yuri at rawbw.com
COMMENT?= Bittorrent client using Qt4/5 and libtorrent-rasterbar
-LICENSE= GPLv2
+LICENSE= GPLv2+
+LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
libboost_system.so:devel/boost-libs
@@ -58,15 +58,6 @@ USE_${OPTION_QT}+= dbus
CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-post-patch:
-.if ${PORT_OPTIONS:MQT4}
- ${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/bin/qmake-qt4,' \
- ${WRKSRC}/${CONFIGURE_SCRIPT}
-.else
- ${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/lib/qt5/bin/qmake,' \
- ${WRKSRC}/${CONFIGURE_SCRIPT}
-.endif
-
post-install:
.if ${WITH_GUI} == "yes"
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent
Modified: head/net-p2p/qbittorrent/distinfo
==============================================================================
--- head/net-p2p/qbittorrent/distinfo Mon Mar 20 18:16:43 2017 (r436555)
+++ head/net-p2p/qbittorrent/distinfo Mon Mar 20 18:17:36 2017 (r436556)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482707995
-SHA256 (qbittorrent-3.3.10.tar.xz) = 2c657ceacdc84033da044a0a9ecba7e0fdb35858324dc097546f989166f1a8d2
-SIZE (qbittorrent-3.3.10.tar.xz) = 2959380
+TIMESTAMP = 1488638509
+SHA256 (qbittorrent-3.3.11.tar.xz) = 4892ac5ed4bde2ed325fb67456698e703bb933b9eb1d146598259f4e2154a760
+SIZE (qbittorrent-3.3.11.tar.xz) = 2986312
Added: head/net-p2p/qbittorrent/files/patch-src_base_http_server.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-p2p/qbittorrent/files/patch-src_base_http_server.cpp Mon Mar 20 18:17:36 2017 (r436556)
@@ -0,0 +1,25 @@
+# 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 <QNetworkProxy>
++#include <QStringList>
++
+ #ifndef QT_NO_OPENSSL
+ #include <QSslSocket>
+ #else
+ #include <QTcpSocket>
+ #endif
+-#include <QNetworkProxy>
++
+ #include "connection.h"
+-#include "server.h"
+
+ using namespace Http;
+
Modified: head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp
==============================================================================
--- head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp Mon Mar 20 18:16:43 2017 (r436555)
+++ head/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp Mon Mar 20 18:17:36 2017 (r436556)
@@ -1,6 +1,8 @@
-Avoid use of thread local storage on versions prior to which it was supported.
-
---- src/base/utils/string.cpp.orig 2016-12-17 18:02:06 UTC
+# 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
@@ -37,7 +37,7 @@
#ifdef QBT_USES_QT5
@@ -31,3 +33,28 @@ Avoid use of thread local storage on ver
static QThreadStorage<NaturalCompare> 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
+ }
Modified: head/net-p2p/qbittorrent/pkg-plist
==============================================================================
--- head/net-p2p/qbittorrent/pkg-plist Mon Mar 20 18:16:43 2017 (r436555)
+++ head/net-p2p/qbittorrent/pkg-plist Mon Mar 20 18:17:36 2017 (r436556)
@@ -1,16 +1,27 @@
bin/qbittorrent
man/man1/qbittorrent.1.gz
+share/appdata/qBittorrent.appdata.xml
share/applications/qBittorrent.desktop
share/icons/hicolor/128x128/apps/qbittorrent.png
+share/icons/hicolor/128x128/status/qbittorrent-tray.png
share/icons/hicolor/16x16/apps/qbittorrent.png
+share/icons/hicolor/16x16/status/qbittorrent-tray.png
share/icons/hicolor/192x192/apps/qbittorrent.png
+share/icons/hicolor/192x192/status/qbittorrent-tray.png
share/icons/hicolor/22x22/apps/qbittorrent.png
+share/icons/hicolor/22x22/status/qbittorrent-tray.png
share/icons/hicolor/24x24/apps/qbittorrent.png
+share/icons/hicolor/24x24/status/qbittorrent-tray.png
share/icons/hicolor/32x32/apps/qbittorrent.png
+share/icons/hicolor/32x32/status/qbittorrent-tray.png
share/icons/hicolor/36x36/apps/qbittorrent.png
+share/icons/hicolor/36x36/status/qbittorrent-tray.png
share/icons/hicolor/48x48/apps/qbittorrent.png
+share/icons/hicolor/48x48/status/qbittorrent-tray.png
share/icons/hicolor/64x64/apps/qbittorrent.png
+share/icons/hicolor/64x64/status/qbittorrent-tray.png
share/icons/hicolor/72x72/apps/qbittorrent.png
+share/icons/hicolor/72x72/status/qbittorrent-tray.png
share/icons/hicolor/96x96/apps/qbittorrent.png
+share/icons/hicolor/96x96/status/qbittorrent-tray.png
share/pixmaps/qbittorrent.png
-share/appdata/qBittorrent.appdata.xml
More information about the svn-ports-head
mailing list