Attachment #175900 for bug #209132




# $FreeBSD$

PORTNAME=	qbittorrent
PORTVERSION=	3.3.7
DISTVERSIONPREFIX=	release-
CATEGORIES=	net-p2p ipv6
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

MAINTAINER=	yuri@rawbw.com
COMMENT?=	Bittorrent client using Qt4/Qt5 and libtorrent-rasterbar

LICENSE=	GPLv2

BROKEN=		fails to build

# ABI versions specified on purpose for libtorrent-rasterbar
LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
		libboost_system.so:devel/boost-libs

.if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} == "no"
HAVE_GUI:=	yes
.else
HAVE_GUI:=	no
.endif

USES=		compiler:c++11-lang 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
#USE_OPENSSL=	yes

.if ${HAVE_GUI} == "yes"
LIB_DEPENDS+=	libGeoIP.so:net/GeoIP
USES+=		desktop-file-utils
QT4_USE+=	QT4=gui
QT5_USE+=	QT5=concurrent,gui,widgets GL=gl
INSTALLS_ICONS=	yes
OPTIONS_DEFINE=	DBUS
.else
CONFIGURE_ARGS+=--disable-gui
.endif

PORTDOCS=	AUTHORS Changelog README.md

OPTIONS_DEFINE=		DEBUG DOCS DBUS
OPTIONS_SINGLE=		QT
OPTIONS_SINGLE_QT=	QT4 QT5
OPTIONS_DEFAULT=	QT5
OPTION_QT=		${SELECTED_OPTIONS:MQT*}

DEBUG_CONFIGURE_ENABLE=	debug


.include <bsd.port.options.mk>

# Qt4 fails to detect base clang features, this section corrects it
.if ${PORT_OPTIONS:MQT4}
CXXFLAGS+=		-DQ_COMPILER_INITIALIZER_LISTS
.endif

.if ${PORT_OPTIONS:MDBUS}
USE_${OPTION_QT}+=	dbus
.endif

CONFIGURE_ARGS+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
CONFIGURE_ENV+=		zlib_CFLAGS=-I/usr/include
CONFIGURE_ENV+=		zlib_LIBS=-lz
CONFIGURE_ARGS+=	CXXFLAGS="${CXXFLAGS}"
CONFIGURE_ARGS+=	--with-${OPTION_QT:tl}

GNU_CONFIGURE=	yes
USE_OPENSSL=	yes

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

.if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} != "no"
CONFIGURE_ARGS+=	--disable-gui
.endif

post-install:
.if ${HAVE_GUI} == "yes"
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent
	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \
		${STAGEDIR}${MAN1PREFIX}/man/man1/

Lines 1-2 Link Here

(-)net-p2p/qbittorrent/distinfo (-2 / +3 lines)
1	SHA256 (qBittorrent-qBittorrent-release-3.3.3_GH0.tar.gz) = 04f03623be427294238f119d1ab3311e8560a091778f12df03cc9380fad2c6d9	1	TIMESTAMP = 1476766504
2	SIZE (qBittorrent-qBittorrent-release-3.3.3_GH0.tar.gz) = 4984105	2	SHA256 (qbittorrent-3.3.7.tar.xz) = 72dc824a90fadc0825e6be6f1c215e38f976262c7f83b625061d542b2b664c40
		3	SIZE (qbittorrent-3.3.7.tar.xz) = 2884792




--- src/base/utils/string.cpp.orig	2016-10-18 05:39:24 UTC
+++ src/base/utils/string.cpp
@@ -37,7 +37,7 @@
 #ifdef QBT_USES_QT5
 #include <QCollator>
 #endif
-#ifdef Q_OS_MAC
+#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506)
 #include <QThreadStorage>
 #endif
 
@@ -146,7 +146,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<NaturalCompare> nCmp;
     if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(true));
     return (nCmp.localData())(left, right);
@@ -160,7 +161,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<NaturalCompare> nCmp;
     if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(false));
     return (nCmp.localData())(left, right);

Return to bug 209132

Lines 2-47 Link Here

(-)net-p2p/qbittorrent/Makefile (-36 / +24 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qbittorrent	4	PORTNAME= qbittorrent
5	PORTVERSION= 3.3.3	5	PORTVERSION= 3.3.7
6	DISTVERSIONPREFIX= release-
7	CATEGORIES= net-p2p ipv6	6	CATEGORIES= net-p2p ipv6
		7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
8		8
9	MAINTAINER= yuri@rawbw.com	9	MAINTAINER= yuri@rawbw.com
10	COMMENT?= Bittorrent client using Qt4 and libtorrent-rasterbar	10	COMMENT?= Bittorrent client using Qt4/Qt5 and libtorrent-rasterbar
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
14	BROKEN= fails to build
15
16	# ABI versions specified on purpose for libtorrent-rasterbar
17	LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \	14	LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
18	libboost_system.so:devel/boost-libs	15	libboost_system.so:devel/boost-libs
19		16
20	USE_GITHUB= yes	17	.if !defined(SLAVE_PORT) \|\| ${SLAVE_PORT:tl} == "no"
21	GH_ACCOUNT= qBittorrent	18	HAVE_GUI:= yes
22	GH_PROJECT= qBittorrent	19	.else
		20	HAVE_GUI:= no
		21	.endif
23		22
24	USES= compiler:c++11-lang execinfo pkgconfig tar:xz	23	USES= compiler:c++11-lang execinfo pkgconfig tar:xz
25	QT4_USE= QT4=corelib,network,qmake_build,linguisttools_build,moc_build,rcc_build,uic_build	24	QT4_USE= QT4=corelib,network,xml,qmake_build,linguisttools_build,moc_build,rcc_build,uic_build
26	QT5_USE= QT5=core,concurrent,network,widgets,qmake_build,buildtools_build,linguisttools_build	25	QT5_USE= QT5=core,network,xml,qmake_build,buildtools_build,linguisttools_build
27	QT_NONSTANDARD= yes	26	QT_NONSTANDARD= yes
28	DESTDIRNAME= INSTALL_ROOT	27	DESTDIRNAME= INSTALL_ROOT
		28	GNU_CONFIGURE= yes
		29	#USE_OPENSSL= yes
29		30
30	.if !defined(SLAVE_PORT)	31	.if ${HAVE_GUI} == "yes"
31	LIB_DEPENDS+= libGeoIP.so:net/GeoIP	32	LIB_DEPENDS+= libGeoIP.so:net/GeoIP
32	USES+= desktop-file-utils	33	USES+= desktop-file-utils
33	QT4_USE+= QT4=gui,xml	34	QT4_USE+= QT4=gui
34	QT5_USE+= QT5=gui,xml	35	QT5_USE+= QT5=concurrent,gui,widgets GL=gl
35	INSTALLS_ICONS= yes	36	INSTALLS_ICONS= yes
36	OPTIONS_DEFINE= DBUS	37	OPTIONS_DEFINE= DBUS
		38	.else
		39	CONFIGURE_ARGS+=--disable-gui
37	.endif	40	.endif
38		41
39	PORTDOCS= AUTHORS Changelog README.md	42	PORTDOCS= AUTHORS Changelog README.md
40		43
41	OPTIONS_DEFINE= DEBUG DOCS DBUS	44	OPTIONS_DEFINE= DEBUG DOCS DBUS
42	OPTIONS_RADIO= QT	45	OPTIONS_SINGLE= QT
43	OPTIONS_RADIO_QT= QT4 QT5	46	OPTIONS_SINGLE_QT= QT4 QT5
44	OPTIONS_DEFAULT= QT4	47	OPTIONS_DEFAULT= QT5
45	OPTION_QT= ${SELECTED_OPTIONS:MQT*}	48	OPTION_QT= ${SELECTED_OPTIONS:MQT*}
46		49
47	DEBUG_CONFIGURE_ENABLE= debug	50	DEBUG_CONFIGURE_ENABLE= debug
Lines 49-87 Link Here
49		52
50	.include <bsd.port.options.mk>	53	.include <bsd.port.options.mk>
51		54
52	# Qt4 fails to detect base clang features, this section corrects it
53	.if ${PORT_OPTIONS:MQT4}
54	CXXFLAGS+= -DQ_COMPILER_INITIALIZER_LISTS
55	.endif
56
57	.if ${PORT_OPTIONS:MDBUS}	55	.if ${PORT_OPTIONS:MDBUS}
58	USE_${OPTION_QT}+= dbus	56	USE_${OPTION_QT}+= dbus
59	.endif	57	.endif
60		58
61	CXXFLAGS+= -DBOOST_ASIO_DYN_LINK	59	CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
62	CONFIGURE_ENV+= zlib_CFLAGS=-I/usr/include
63	CONFIGURE_ENV+= zlib_LIBS=-lz
64	CONFIGURE_ARGS+= CXXFLAGS="${CXXFLAGS}"
65	CONFIGURE_ARGS+= --with-${OPTION_QT:tl}	60	CONFIGURE_ARGS+= --with-${OPTION_QT:tl}
66		61
67	GNU_CONFIGURE= yes
68	USE_OPENSSL= yes
69
70	post-patch:	62	post-patch:
71	.if ${PORT_OPTIONS:MQT4}	63	.if ${PORT_OPTIONS:MQT4}
72	${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/bin/qmake-qt4,' \	64	${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/bin/qmake-qt4,' \
73	${WRKSRC}/${CONFIGURE_SCRIPT}	65	${WRKSRC}/${CONFIGURE_SCRIPT}
74	.else	66	.else
75	${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/lib/qt5/bin/qmake,' \	67	${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/lib/qt5/bin/qmake,' \
76	${WRKSRC}/${CONFIGURE_SCRIPT}	68	${WRKSRC}/${CONFIGURE_SCRIPT}
77	.endif	69	.endif
78		70
79	.if !defined(SLAVE_PORT) \|\| ${SLAVE_PORT:tl} != "no"
80	CONFIGURE_ARGS+= --disable-gui
81	.endif
82
83	post-install:	71	post-install:
84	.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no"	72	.if ${HAVE_GUI} == "yes"
85	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent	73	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent
86	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \	74	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \
87	${STAGEDIR}${MAN1PREFIX}/man/man1/	75	${STAGEDIR}${MAN1PREFIX}/man/man1/

Line 0 Link Here

(-)net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp (+31 lines)
	1	--- src/base/utils/string.cpp.orig 2016-10-18 05:39:24 UTC
	2	+++ src/base/utils/string.cpp
	3	@@ -37,7 +37,7 @@
	4	#ifdef QBT_USES_QT5
	5	#include <QCollator>
	6	#endif
	7	-#ifdef Q_OS_MAC
	8	+#if defined(Q_OS_MAC) \|\| (defined(__FreeBSD__) && __FreeBSD_version < 1003506)
	9	#include <QThreadStorage>
	10	#endif
	11
	12	@@ -146,7 +146,8 @@ bool Utils::String::naturalCompareCaseSe
	13	{
	14	// provide a single `NaturalCompare` instance for easy use
	15	// https://doc.qt.io/qt-5/threads-reentrancy.html
	16	-#ifdef Q_OS_MAC // workaround for Apple xcode: https://stackoverflow.com/a/29929949
	17	+#if defined(Q_OS_MAC) \|\| (defined(__FreeBSD__) && __FreeBSD_version < 1003506)
	18	+// workaround for Apple xcode: https://stackoverflow.com/a/29929949
	19	static QThreadStorage<NaturalCompare> nCmp;
	20	if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(true));
	21	return (nCmp.localData())(left, right);
	22	@@ -160,7 +161,8 @@ bool Utils::String::naturalCompareCaseIn
	23	{
	24	// provide a single `NaturalCompare` instance for easy use
	25	// https://doc.qt.io/qt-5/threads-reentrancy.html
	26	-#ifdef Q_OS_MAC // workaround for Apple xcode: https://stackoverflow.com/a/29929949
	27	+#if defined(Q_OS_MAC) \|\| (defined(__FreeBSD__) && __FreeBSD_version < 1003506)
	28	+// workaround for Apple xcode: https://stackoverflow.com/a/29929949
	29	static QThreadStorage<NaturalCompare> nCmp;
	30	if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(false));
	31	return (nCmp.localData())(left, right);