Attachment #142742 for bug #189806

View | Details | Raw Unified | Return to bug 189806
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	retroshare
PORTVERSION=	0.5.5c
PORTREVISION=	1
CATEGORIES=	net-p2p
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
DISTNAME=	${PORTNAME}_${SRC_VERSION}-${SRC_REVISION}

MAINTAINER=	peter@netkey.at
COMMENT=	Private and secure decentralised communication platform


LICENSE=	GPLv2

BUILD_DEPENDS=	protoc:${PORTSDIR}/devel/protobuf \
		pkg-config:${PORTSDIR}/devel/pkgconf
LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
		libpcre.so:${PORTSDIR}/devel/pcre \

		libexpat.so:${PORTSDIR}/textproc/expat2 \
		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
		libspeex.so:${PORTSDIR}/audio/speex \
		libxslt.so:${PORTSDIR}/textproc/libxslt \
		libssh_threads.so:${PORTSDIR}/security/libssh
RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4

USES=		qmake compiler:features dos2unix
USE_GNOME=	glib20
USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
USE_QT4=	corelib gui network xml script designer_build uic_build \
		qmake_build moc_build rcc_build multimedia
#USE_QT5=	buildtools_build core gui network xml uitools printsupport \
#		qmake_build multimedia
#		qmake_build multimedia imageformats svg
HAS_CONFIGURE=	yes

BINARY=		RetroShare
SRC_REVISION=	0.7068
SRC_VERSION=	0.5.5
WRKSRC=		${WRKDIR}/${PORTNAME}-${SRC_VERSION}/src

MAKE_JOBS_UNSAFE=yes
USE_LDCONFIG=	yes
MAKE_ARGS+=	BIOCC=${CC}

DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \
		"${BINARY}" "Network;FileTransfer;" true

DOS2UNIX_FILES=	retroshare-gui/src/retroshare-gui.pro \
	retroshare-nogui/src/retroshare-nogui.pro \
	retroshare-gui/src/gui/RetroShareLink.h \
	retroshare-gui/src/gui/common/GroupTreeWidget.cpp

.include <bsd.port.pre.mk>

post-patch:
.if ${COMPILER_FEATURES:Mlibc++}
	@${REINPLACE_CMD} -e 's|std::tr1::|std::|' \
		${WRKSRC}/libretroshare/src/dbase/findex.[ch]*
.endif
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
		${WRKSRC}/libretroshare/src/libretroshare.pro
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \

		${WRKSRC}/plugins/FeedReader/FeedReader.pro
	@${REINPLACE_CMD} -e 's|/usr/local/share/retroshare|${DATADIR}|' \
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
	@${REINPLACE_CMD} -e 's|retroshare-nogui|#retroshare-nogui|' \
		${WRKSRC}/${BINARY}.pro
	@${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|' \
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc


post-install:
	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} \
		${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/retroshare-nogui \
		${STAGEDIR}${PREFIX}/bin
	${MKDIR} ${STAGEDIR}${DATADIR}
	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt \
		${STAGEDIR}${DATADIR}

		${LN} -s libVOIP.so.1 libVOIP.so && \
		${LN} -s libFeedReader.so.1 libFeedReader.so

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (RetroShare-v0.5.5a.zip) = c0d33c6e2055b68184940098599c105c6b6c2909a166331a0c710f9fd86a2253	1	SHA256 (retroshare_0.5.5-0.7068.tar.gz) = 772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650
2	SIZE (RetroShare-v0.5.5a.zip) = 12527884	2	SIZE (retroshare_0.5.5-0.7068.tar.gz) = 11899395




--- libretroshare/src/retroshare/rsconfig.h.orig
+++ libretroshare/src/retroshare/rsconfig.h
@@ -31,6 +31,8 @@
 #include <list>
 #include <map>
 
+#include <time.h>
+
 /* The New Config Interface Class */
 class RsServerConfig;
 extern RsServerConfig *rsConfig;
--- libretroshare/src/retroshare/rsflags.h.orig
+++ libretroshare/src/retroshare/rsflags.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <ostream>
 
 // This class provides a representation for flags that can be combined with bitwise
 // operations. However, because the class is templated with an id, it's not possible to 
--- libretroshare/src/retroshare/rsgxsifacetypes.h.orig
+++ libretroshare/src/retroshare/rsgxsifacetypes.h
@@ -12,6 +12,8 @@
 #include <vector>
 #include <string>
 #include <inttypes.h>
+
+#include <time.h>
 
 
 typedef std::string RsGxsGroupId;
--- plugins/FeedReader/interface/rsFeedReader.h.orig
+++ plugins/FeedReader/interface/rsFeedReader.h
@@ -26,6 +26,8 @@
 #include <string>
 #include <list>
 
+#include <time.h>
+
 class RsFeedReader;
 extern RsFeedReader *rsFeedReader;
 
--- plugins/LinksCloud/rsrank.h.orig
+++ plugins/LinksCloud/rsrank.h
@@ -30,6 +30,8 @@
 #include <string>
 #include <list>
 
+#include <time.h>
+
 /* The Main Interface Class - for information about your Peers */
 class RsRanks;
 extern RsRanks   *rsRanks;
--- retroshare-gui/src/gui/CreateMsgLinkDialog.h.orig
+++ retroshare-gui/src/gui/CreateMsgLinkDialog.h
@@ -23,6 +23,8 @@
 
 #include "ui_CreateMsgLinkDialog.h"
 
+#include <time.h>
+
 class FriendSelectionWidget ;
 
 class CreateMsgLinkDialog : public QDialog, public Ui::CreateMsgLinkDialog
--- retroshare-gui/src/gui/RetroShareLink.h.orig
+++ retroshare-gui/src/gui/RetroShareLink.h
@@ -33,6 +33,7 @@
 //    -------------+----------------+--------------------------+------------------+-------------+-------------
 //
 #include <stdint.h>
+#include <time.h>
 #include <QString>
 #include <QVector>
 #include <QUrl>
--- retroshare-gui/src/gui/common/GroupTreeWidget.cpp.orig
+++ retroshare-gui/src/gui/common/GroupTreeWidget.cpp
@@ -502,7 +502,7 @@ void GroupTreeWidget::calculateScore(QTr
 
 	/* Find out which has given word in it */
 	QTreeWidgetItemIterator itemIterator(ui->treeWidget);
-	QTreeWidgetItem *item;
+	// QTreeWidgetItem *item;
 	while ((item = *itemIterator) != NULL) {
 		itemIterator++;
 
--- retroshare-gui/src/gui/connect/ConnectProgressDialog.h.orig
+++ retroshare-gui/src/gui/connect/ConnectProgressDialog.h
@@ -29,6 +29,7 @@
 #include "ui_ConnectProgressDialog.h"
 
 #include <stdint.h>
+#include <time.h>
 
 class ConnectProgressDialog : public QDialog
 {
--- retroshare-gui/src/./util/DateTime.h.orig
+++ retroshare-gui/src/./util/DateTime.h
@@ -24,6 +24,8 @@
 
 #include <QString>
 
+#include <time.h>
+
 class QDateTime;
 class QDate;
 class QTime;
--- libretroshare/src/util/argstream.h.orig
+++ libretroshare/src/util/argstream.h
@@ -141,9 +141,9 @@ namespace 
 			inline OptionHolder(char s,
 					const char* l,
 					const char* desc);  
-			friend OptionHolder help(char s='h',
-					const char* l="help",
-					const char* desc="Display this help");
+			friend OptionHolder help(char s,
+					const char* l,
+					const char* desc);
 		private:
 			std::string shortName_;
 			std::string longName_;
@@ -173,9 +173,9 @@ namespace 
 			return OptionHolder(l,b,desc);
 		}
 	inline OptionHolder
-		help(char s,
-				const char* l,
-				const char* desc)
+		help(char s='h',
+				const char* l="help",
+				const char* desc="Display this help")
 		{
 			return OptionHolder(s,l,desc);
 		}
--- retroshare-nogui/src/menu/menu.h.orig	2014-01-28 22:57:11.000000000 +0100
+++ retroshare-nogui/src/menu/menu.h	2014-04-10 13:51:23.670843012 +0200
@@ -27,6 +27,7 @@
 #define RSNOGUI_MENU_H
 
 #include <inttypes.h>
+#include <time.h>
 
 #include <string>
 #include <map>




--- retroshare-gui/src/retroshare-gui.pro.orig	2013-10-21 21:31:11.012605427 +0200
+++ retroshare-gui/src/retroshare-gui.pro	2013-10-21 21:31:53.770609780 +0200
@@ -209,17 +209,19 @@
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
 	LIBS *= ../../libretroshare/src/lib/libretroshare.a
+	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
 	LIBS *= -lssl
 	LIBS *= -lgpgme
 	LIBS *= -lupnp
 	LIBS *= -lgnome-keyring
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
 
         gxs {
                 LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
                 LIBS += -lsqlite3
         }
-
+	LIBS *= -rdynamic
 }
 
 ##################################### OpenBSD ######################################




--- retroshare-gui/src/retroshare-gui.pro.orig	2014-04-10 13:28:51.661832058 +0200
+++ retroshare-gui/src/retroshare-gui.pro	2014-04-10 13:29:31.092831413 +0200
@@ -215,17 +215,19 @@
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
 	LIBS *= ../../libretroshare/src/lib/libretroshare.a
+	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
 	LIBS *= -lssl
 	LIBS *= -lgpgme
-	LIBS *= -lupnp
+	LIBS *= -lupnp -lixml
 	LIBS *= -lgnome-keyring
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
 
         gxs {
                 LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
                 LIBS += -lsqlite3
         }
-
+	LIBS *= -rdynamic
 }
 
 ##################################### OpenBSD ######################################




--- retroshare-nogui/src/retroshare-nogui.pro.orig	2014-04-10 14:14:22.622840778 +0200
+++ retroshare-nogui/src/retroshare-nogui.pro	2014-04-10 14:14:55.384836372 +0200
@@ -114,12 +114,16 @@
 
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
+	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
 	LIBS *= ../../libretroshare/src/lib/libretroshare.a
-	LIBS *= -lssl
+	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
+	LIBS *= -lssl -lcrypto
 	LIBS *= -lgpgme
-	LIBS *= -lupnp
+	LIBS *= -lupnp -lixml
 	LIBS *= -lgnome-keyring
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
+	LIBS *= -rdynamic
 }
 
 ##################################### OpenBSD  ######################################

Line 0 Link Here

(-)files/patch-supportlibs__pegmarkdown__pegmarkdown.pro (+10 lines)
	1	--- ./supportlibs/pegmarkdown/pegmarkdown.pro.orig 2013-12-11 16:08:42.000000000 +0100
	2	+++ ./supportlibs/pegmarkdown/pegmarkdown.pro 2013-12-11 16:09:21.000000000 +0100
	3	@@ -55,6 +55,7 @@
	4	################################# FreeBSD ##########################################
	5
	6	freebsd-* {
	7	+ QMAKE_CC = cc
	8	DESTDIR = lib
	9	}
	10

Lines 1-4 Link Here

(-)pkg-plist (+1 lines)
1	bin/RetroShare	1	bin/RetroShare
		2	bin/retroshare-nogui
2	lib/retroshare/extensions/libLinksCloud.so	3	lib/retroshare/extensions/libLinksCloud.so
3	lib/retroshare/extensions/libLinksCloud.so.1	4	lib/retroshare/extensions/libLinksCloud.so.1
4	lib/retroshare/extensions/libVOIP.so	5	lib/retroshare/extensions/libVOIP.so

Return to bug 189806

Lines 2-13 Link Here

(-)Makefile (-11 / +32 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= retroshare	4	PORTNAME= retroshare
5	PORTVERSION= 0.5.5a	5	PORTVERSION= 0.5.5c
6	PORTREVISION= 1
7	CATEGORIES= net-p2p	6	CATEGORIES= net-p2p
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9	MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}	8	MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
10	DISTNAME= ${BINARY}-v${PORTVERSION}	9	DISTNAME= ${PORTNAME}_${SRC_VERSION}-${SRC_REVISION}
11		10
12	MAINTAINER= peter@netkey.at	11	MAINTAINER= peter@netkey.at
13	COMMENT= Private and secure decentralised communication platform	12	COMMENT= Private and secure decentralised communication platform
Lines 14-19 Link Here
14		13
15	LICENSE= GPLv2	14	LICENSE= GPLv2
16		15
		16	BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf \
		17	pkg-config:${PORTSDIR}/devel/pkgconf
17	LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \	18	LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
18	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \	19	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
19	libpcre.so:${PORTSDIR}/devel/pcre \	20	libpcre.so:${PORTSDIR}/devel/pcre \
Lines 28-51 Link Here
28	libexpat.so:${PORTSDIR}/textproc/expat2 \	29	libexpat.so:${PORTSDIR}/textproc/expat2 \
29	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \	30	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
30	libspeex.so:${PORTSDIR}/audio/speex \	31	libspeex.so:${PORTSDIR}/audio/speex \
31	libxslt.so:${PORTSDIR}/textproc/libxslt	32	libxslt.so:${PORTSDIR}/textproc/libxslt \
32	RUN_DEPENDS= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4	33	libssh_threads.so:${PORTSDIR}/security/libssh
		34	RUN_DEPENDS+= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
33		35
34	USES= qmake zip	36	USES= qmake compiler:features dos2unix
35	USE_GNOME= glib20	37	USE_GNOME= glib20
36	USE_XORG= ice sm x11 xau xcb xdmcp xext xrender	38	USE_XORG= ice sm x11 xau xcb xdmcp xext xrender
37	USE_QT4= corelib gui network xml script designer_build uic_build \	39	USE_QT4= corelib gui network xml script designer_build uic_build \
38	moc_build rcc_build multimedia	40	qmake_build moc_build rcc_build multimedia
		41	#USE_QT5= buildtools_build core gui network xml uitools printsupport \
		42	# qmake_build multimedia
		43	# qmake_build multimedia imageformats svg
		44	HAS_CONFIGURE= yes
		45
39	BINARY= RetroShare	46	BINARY= RetroShare
		47	SRC_REVISION= 0.7068
		48	SRC_VERSION= 0.5.5
		49	WRKSRC= ${WRKDIR}/${PORTNAME}-${SRC_VERSION}/src
		50
40	MAKE_JOBS_UNSAFE=yes	51	MAKE_JOBS_UNSAFE=yes
41	USE_LDCONFIG= yes	52	USE_LDCONFIG= yes
		53	MAKE_ARGS+= BIOCC=${CC}
42		54
43	DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \	55	DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \
44	"${BINARY}" "Network;FileTransfer;" true	56	"${BINARY}" "Network;FileTransfer;" true
45		57
46	USE_DOS2UNIX= retroshare-gui/src/retroshare-gui.pro	58	DOS2UNIX_FILES= retroshare-gui/src/retroshare-gui.pro \
		59	retroshare-nogui/src/retroshare-nogui.pro \
		60	retroshare-gui/src/gui/RetroShareLink.h \
		61	retroshare-gui/src/gui/common/GroupTreeWidget.cpp
47		62
		63	.include <bsd.port.pre.mk>
		64
48	post-patch:	65	post-patch:
		66	.if ${COMPILER_FEATURES:Mlibc++}
		67	@${REINPLACE_CMD} -e 's\|std::tr1::\|std::\|' \
		68	${WRKSRC}/libretroshare/src/dbase/findex.[ch]*
		69	.endif
49	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \	70	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
50	${WRKSRC}/libretroshare/src/libretroshare.pro	71	${WRKSRC}/libretroshare/src/libretroshare.pro
51	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \	72	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
Lines 58-65 Link Here
58	${WRKSRC}/plugins/FeedReader/FeedReader.pro	79	${WRKSRC}/plugins/FeedReader/FeedReader.pro
59	@${REINPLACE_CMD} -e 's\|/usr/local/share/retroshare\|${DATADIR}\|' \	80	@${REINPLACE_CMD} -e 's\|/usr/local/share/retroshare\|${DATADIR}\|' \
60	${WRKSRC}/libretroshare/src/rsserver/rsinit.cc	81	${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
61	@${REINPLACE_CMD} -e 's\|retroshare-nogui\|#retroshare-nogui\|' \
62	${WRKSRC}/${BINARY}.pro
63	@${REINPLACE_CMD} -e 's\|/usr/lib\|${LOCALBASE}/lib\|' \	82	@${REINPLACE_CMD} -e 's\|/usr/lib\|${LOCALBASE}/lib\|' \
64	${WRKSRC}/libretroshare/src/rsserver/rsinit.cc	83	${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
65		84
Lines 66-71 Link Here
66	post-install:	85	post-install:
67	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} \	86	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} \
68	${STAGEDIR}${PREFIX}/bin	87	${STAGEDIR}${PREFIX}/bin
		88	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/retroshare-nogui \
		89	${STAGEDIR}${PREFIX}/bin
69	${MKDIR} ${STAGEDIR}${DATADIR}	90	${MKDIR} ${STAGEDIR}${DATADIR}
70	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt \	91	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt \
71	${STAGEDIR}${DATADIR}	92	${STAGEDIR}${DATADIR}
Lines 84-87 Link Here
84	${LN} -s libVOIP.so.1 libVOIP.so && \	105	${LN} -s libVOIP.so.1 libVOIP.so && \
85	${LN} -s libFeedReader.so.1 libFeedReader.so	106	${LN} -s libFeedReader.so.1 libFeedReader.so
86		107
87	.include <bsd.port.mk>	108	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-clang (+145 lines)
		1	--- libretroshare/src/retroshare/rsconfig.h.orig
		2	+++ libretroshare/src/retroshare/rsconfig.h
		3	@@ -31,6 +31,8 @@
		4	#include <list>
		5	#include <map>
		6
		7	+#include <time.h>
		8	+
		9	/* The New Config Interface Class */
		10	class RsServerConfig;
		11	extern RsServerConfig *rsConfig;
		12	--- libretroshare/src/retroshare/rsflags.h.orig
		13	+++ libretroshare/src/retroshare/rsflags.h
		14	@@ -1,6 +1,7 @@
		15	#pragma once
		16
		17	#include <stdint.h>
		18	+#include <ostream>
		19
		20	// This class provides a representation for flags that can be combined with bitwise
		21	// operations. However, because the class is templated with an id, it's not possible to
		22	--- libretroshare/src/retroshare/rsgxsifacetypes.h.orig
		23	+++ libretroshare/src/retroshare/rsgxsifacetypes.h
		24	@@ -12,6 +12,8 @@
		25	#include <vector>
		26	#include <string>
		27	#include <inttypes.h>
		28	+
		29	+#include <time.h>
		30
		31
		32	typedef std::string RsGxsGroupId;
		33	--- plugins/FeedReader/interface/rsFeedReader.h.orig
		34	+++ plugins/FeedReader/interface/rsFeedReader.h
		35	@@ -26,6 +26,8 @@
		36	#include <string>
		37	#include <list>
		38
		39	+#include <time.h>
		40	+
		41	class RsFeedReader;
		42	extern RsFeedReader *rsFeedReader;
		43
		44	--- plugins/LinksCloud/rsrank.h.orig
		45	+++ plugins/LinksCloud/rsrank.h
		46	@@ -30,6 +30,8 @@
		47	#include <string>
		48	#include <list>
		49
		50	+#include <time.h>
		51	+
		52	/* The Main Interface Class - for information about your Peers */
		53	class RsRanks;
		54	extern RsRanks *rsRanks;
		55	--- retroshare-gui/src/gui/CreateMsgLinkDialog.h.orig
		56	+++ retroshare-gui/src/gui/CreateMsgLinkDialog.h
		57	@@ -23,6 +23,8 @@
		58
		59	#include "ui_CreateMsgLinkDialog.h"
		60
		61	+#include <time.h>
		62	+
		63	class FriendSelectionWidget ;
		64
65	class CreateMsgLinkDialog : public QDialog, public Ui::CreateMsgLinkDialog
66	--- retroshare-gui/src/gui/RetroShareLink.h.orig
67	+++ retroshare-gui/src/gui/RetroShareLink.h
68	@@ -33,6 +33,7 @@
69	// -------------+----------------+--------------------------+------------------+-------------+-------------
70	//
71	#include <stdint.h>
72	+#include <time.h>
73	#include <QString>
74	#include <QVector>
75	#include <QUrl>
76	--- retroshare-gui/src/gui/common/GroupTreeWidget.cpp.orig
77	+++ retroshare-gui/src/gui/common/GroupTreeWidget.cpp
78	@@ -502,7 +502,7 @@ void GroupTreeWidget::calculateScore(QTr
79
80	/* Find out which has given word in it */
81	QTreeWidgetItemIterator itemIterator(ui->treeWidget);
82	- QTreeWidgetItem *item;
83	+ // QTreeWidgetItem *item;
84	while ((item = *itemIterator) != NULL) {
85	itemIterator++;
86
87	--- retroshare-gui/src/gui/connect/ConnectProgressDialog.h.orig
88	+++ retroshare-gui/src/gui/connect/ConnectProgressDialog.h
89	@@ -29,6 +29,7 @@
90	#include "ui_ConnectProgressDialog.h"
91
92	#include <stdint.h>
93	+#include <time.h>
94
95	class ConnectProgressDialog : public QDialog
96	{
97	--- retroshare-gui/src/./util/DateTime.h.orig
98	+++ retroshare-gui/src/./util/DateTime.h
99	@@ -24,6 +24,8 @@
100
101	#include <QString>
102
103	+#include <time.h>
104	+
105	class QDateTime;
106	class QDate;
107	class QTime;
108	--- libretroshare/src/util/argstream.h.orig
109	+++ libretroshare/src/util/argstream.h
110	@@ -141,9 +141,9 @@ namespace
111	inline OptionHolder(char s,
112	const char* l,
113	const char* desc);
114	- friend OptionHolder help(char s='h',
115	- const char* l="help",
116	- const char* desc="Display this help");
117	+ friend OptionHolder help(char s,
118	+ const char* l,
119	+ const char* desc);
120	private:
121	std::string shortName_;
122	std::string longName_;
123	@@ -173,9 +173,9 @@ namespace
124	return OptionHolder(l,b,desc);
125	}
126	inline OptionHolder
127	- help(char s,
128	- const char* l,
129	- const char* desc)
130	+ help(char s='h',
131	+ const char* l="help",
132	+ const char* desc="Display this help")
133	{
134	return OptionHolder(s,l,desc);
135	}
136	--- retroshare-nogui/src/menu/menu.h.orig 2014-01-28 22:57:11.000000000 +0100
137	+++ retroshare-nogui/src/menu/menu.h 2014-04-10 13:51:23.670843012 +0200
138	@@ -27,6 +27,7 @@
139	#define RSNOGUI_MENU_H
140
141	#include <inttypes.h>
142	+#include <time.h>
143
144	#include <string>
145	#include <map>

Lines 1-23 Link Here

(-)files/patch-retroshare-gui-src-retroshare-gui.pro (-23 lines)
1	--- retroshare-gui/src/retroshare-gui.pro.orig 2013-10-21 21:31:11.012605427 +0200
2	+++ retroshare-gui/src/retroshare-gui.pro 2013-10-21 21:31:53.770609780 +0200
3	@@ -209,17 +209,19 @@
4	freebsd-* {
5	INCLUDEPATH *= /usr/local/include/gpgme
6	LIBS *= ../../libretroshare/src/lib/libretroshare.a
7	+ LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
8	LIBS *= -lssl
9	LIBS *= -lgpgme
10	LIBS *= -lupnp
11	LIBS *= -lgnome-keyring
12	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
13	+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
14
15	gxs {
16	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
17	LIBS += -lsqlite3
18	}
19	-
20	+ LIBS *= -rdynamic
21	}
22
23	##################################### OpenBSD ######################################

Line 0 Link Here

(-)files/patch-retroshare-gui__src__retroshare-gui.pro (+24 lines)
	1	--- retroshare-gui/src/retroshare-gui.pro.orig 2014-04-10 13:28:51.661832058 +0200
	2	+++ retroshare-gui/src/retroshare-gui.pro 2014-04-10 13:29:31.092831413 +0200
	3	@@ -215,17 +215,19 @@
	4	freebsd-* {
	5	INCLUDEPATH *= /usr/local/include/gpgme
	6	LIBS *= ../../libretroshare/src/lib/libretroshare.a
	7	+ LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
	8	LIBS *= -lssl
	9	LIBS *= -lgpgme
	10	- LIBS *= -lupnp
	11	+ LIBS *= -lupnp -lixml
	12	LIBS *= -lgnome-keyring
	13	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
	14	+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
	15
	16	gxs {
	17	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
	18	LIBS += -lsqlite3
	19	}
	20	-
	21	+ LIBS *= -rdynamic
	22	}
	23
	24	##################################### OpenBSD ######################################

Line 0 Link Here

(-)files/patch-retroshare-nogui__src__retroshare-nogui.pro (+21 lines)
	1	--- retroshare-nogui/src/retroshare-nogui.pro.orig 2014-04-10 14:14:22.622840778 +0200
	2	+++ retroshare-nogui/src/retroshare-nogui.pro 2014-04-10 14:14:55.384836372 +0200
	3	@@ -114,12 +114,16 @@
	4
	5	freebsd-* {
	6	INCLUDEPATH *= /usr/local/include/gpgme
	7	+ QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
	8	LIBS *= ../../libretroshare/src/lib/libretroshare.a
	9	- LIBS *= -lssl
	10	+ LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
	11	+ LIBS *= -lssl -lcrypto
	12	LIBS *= -lgpgme
	13	- LIBS *= -lupnp
	14	+ LIBS *= -lupnp -lixml
	15	LIBS *= -lgnome-keyring
	16	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
	17	+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
	18	+ LIBS *= -rdynamic
	19	}
	20
	21	##################################### OpenBSD ######################################