Date: Wed, 14 May 2014 15:05:39 GMT From: Peter Klett <peter@netkey.at> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189806: [maintainer-update] update net-p2p/retroshare to 0.5.5c Message-ID: <201405141505.s4EF5dTU032325@cgiserv.freebsd.org> Resent-Message-ID: <201405141510.s4EFA1Ku006435@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189806
>Category: ports
>Synopsis: [maintainer-update] update net-p2p/retroshare to 0.5.5c
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 14 15:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Peter Klett
>Release: 10.0-RELEASE
>Organization:
>Environment:
FreeBSD mybsd10.home 10.0-RELEASE-p1 FreeBSD 10.0-RELEASE-p1 #0: Tue Apr 8 06:45:06 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
* Update to RetroShare version 0.5.5c
* Support for FreeBSD-10 (clang)
* Modified files:
+ Makefile
+ distinfo
+ pkg-plist
* Added files:
+ files/patch-clang
+ files/patch-retroshare-gui__src__retroshare-gui.pro
+ files/patch-retroshare-nogui__src__retroshare-nogui.pro
+ files/patch-supportlibs__pegmarkdown__pegmarkdown.pro
* Deleted files:
+ files/patch-retroshare-gui-src-retroshare-gui.pro
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 354052)
+++ Makefile (working copy)
@@ -2,12 +2,11 @@
# $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
@@ -14,6 +13,8 @@
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,44 @@
libexpat.so:${PORTSDIR}/textproc/expat2 \
libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
libspeex.so:${PORTSDIR}/audio/speex \
- libxslt.so:${PORTSDIR}/textproc/libxslt
-RUN_DEPENDS= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
+ libxslt.so:${PORTSDIR}/textproc/libxslt \
+ libssh_threads.so:${PORTSDIR}/security/libssh
+RUN_DEPENDS+= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
-USES= qmake zip
+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 \
- moc_build rcc_build multimedia
+ 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
-USE_DOS2UNIX= 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,8 +79,6 @@
${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
@@ -66,6 +85,8 @@
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 +105,4 @@
${LN} -s libVOIP.so.1 libVOIP.so && \
${LN} -s libFeedReader.so.1 libFeedReader.so
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo (revision 354052)
+++ distinfo (working copy)
@@ -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
Index: files/patch-clang
===================================================================
--- files/patch-clang (revision 0)
+++ files/patch-clang (working copy)
@@ -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>
Property changes on: files/patch-clang
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: files/patch-retroshare-gui-src-retroshare-gui.pro
===================================================================
--- files/patch-retroshare-gui-src-retroshare-gui.pro (revision 354052)
+++ files/patch-retroshare-gui-src-retroshare-gui.pro (working copy)
@@ -1,23 +0,0 @@
---- 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 ######################################
Index: files/patch-retroshare-gui__src__retroshare-gui.pro
===================================================================
--- files/patch-retroshare-gui__src__retroshare-gui.pro (revision 0)
+++ files/patch-retroshare-gui__src__retroshare-gui.pro (working copy)
@@ -0,0 +1,24 @@
+--- 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 ######################################
Property changes on: files/patch-retroshare-gui__src__retroshare-gui.pro
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-retroshare-nogui__src__retroshare-nogui.pro
===================================================================
--- files/patch-retroshare-nogui__src__retroshare-nogui.pro (revision 0)
+++ files/patch-retroshare-nogui__src__retroshare-nogui.pro (working copy)
@@ -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 ######################################
Property changes on: files/patch-retroshare-nogui__src__retroshare-nogui.pro
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-supportlibs__pegmarkdown__pegmarkdown.pro
===================================================================
--- files/patch-supportlibs__pegmarkdown__pegmarkdown.pro (revision 0)
+++ files/patch-supportlibs__pegmarkdown__pegmarkdown.pro (working copy)
@@ -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
+ }
+
Property changes on: files/patch-supportlibs__pegmarkdown__pegmarkdown.pro
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: pkg-plist
===================================================================
--- pkg-plist (revision 354052)
+++ pkg-plist (working copy)
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405141505.s4EF5dTU032325>