mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

net-p2p/retroshare: update to 0.5.5c

Browse Source 
- Fix build with clang

PR:		189806
Submitted by:	maintainer
This commit is contained in:
William Grzybowski 2014-06-20 18:32:15 +00:00
parent 8c6663bfce
commit 62d60175bb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=358625
7 changed files with 211 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
net-p2p/retroshare/Makefile
View File

@ -2,18 +2,19 @@
# $FreeBSD$
PORTNAME= retroshare
PORTVERSION= 0.5.5a
PORTREVISION= 1
PORTVERSION= 0.5.5c
CATEGORIES= net-p2p
MASTER_SITES= SF
MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
DISTNAME= ${BINARY}-v${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 \
@ -28,24 +29,40 @@ LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \
libexpat.so:${PORTSDIR}/textproc/expat2 \
libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libspeex.so:${PORTSDIR}/audio/speex \
libxslt.so:${PORTSDIR}/textproc/libxslt
libxslt.so:${PORTSDIR}/textproc/libxslt \
libssh_threads.so:${PORTSDIR}/security/libssh
RUN_DEPENDS= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
USES= dos2unix qmake zip
USES= compiler:features dos2unix qmake
USE_GNOME= glib20
USE_XORG= ice sm x11 xau xcb xdmcp xext xrender
USE_QT4= corelib gui network xml script designer_build uic_build \
moc_build rcc_build multimedia
qmake_build moc_build rcc_build multimedia
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
DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \
"${BINARY}" "Network;FileTransfer;" true
DOS2UNIX_FILES= retroshare-gui/src/retroshare-gui.pro
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}|' \
@ -58,14 +75,14 @@ post-patch:
${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}
@ -84,4 +101,4 @@ post-install:
${LN} -s libVOIP.so.1 libVOIP.so && \
${LN} -s libFeedReader.so.1 libFeedReader.so
.include <bsd.port.mk>
.include <bsd.port.post.mk>

4
net-p2p/retroshare/distinfo
View File

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

145
net-p2p/retroshare/files/patch-clang Normal file
View File

@ -0,0 +1,145 @@
--- 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>

9
net-p2p/retroshare/files/patch-retroshare-gui-src-retroshare-gui.pro → net-p2p/retroshare/files/patch-retroshare-gui__src__retroshare-gui.pro
View File

@ -1,13 +1,14 @@
--- 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 @@
--- 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
+ LIBS *= -lupnp -lixml
LIBS *= -lgnome-keyring
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a

21
net-p2p/retroshare/files/patch-retroshare-nogui__src__retroshare-nogui.pro Normal file
View File

@ -0,0 +1,21 @@
--- 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 ######################################

10
net-p2p/retroshare/files/patch-supportlibs__pegmarkdown__pegmarkdown.pro Normal file
View File

@ -0,0 +1,10 @@
--- ./supportlibs/pegmarkdown/pegmarkdown.pro.orig 2013-12-11 16:08:42.000000000 +0100
+++ ./supportlibs/pegmarkdown/pegmarkdown.pro 2013-12-11 16:09:21.000000000 +0100
@@ -55,6 +55,7 @@
################################# FreeBSD ##########################################
freebsd-* {
+ QMAKE_CC = cc
DESTDIR = lib
}

1
net-p2p/retroshare/pkg-plist
View File

@ -1,4 +1,5 @@
bin/RetroShare
bin/retroshare-nogui
lib/retroshare/extensions/libLinksCloud.so
lib/retroshare/extensions/libLinksCloud.so.1
lib/retroshare/extensions/libVOIP.so