Attachment 194676 Details for Bug 229367 – Diff Update RetroShare to 0.6.4

[patch] Diff Update RetroShare to 0.6.4

retroshare-update-0.6.4.diff (text/plain), 4.87 KB, created by peter on 2018-06-27 14:35:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: peter

Created: 2018-06-27 14:35:18 UTC

Size: 4.87 KB

patch

obsolete

>diff -ruN retroshare.bak/distinfo retroshare/distinfo
>--- retroshare.bak/distinfo	2018-02-22 08:55:38.000000000 +0100
>+++ retroshare/distinfo	2018-06-27 00:07:17.410134000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1514378949
>-SHA256 (RetroShare-RetroShare-v0.6.3_GH0.tar.gz) = ddb64aa5148fdc950d4426f52f1cbb11578619b1242614e3c4ca4792ee5ce30b
>-SIZE (RetroShare-RetroShare-v0.6.3_GH0.tar.gz) = 19699359
>+TIMESTAMP = 1530050837
>+SHA256 (RetroShare-RetroShare-v0.6.4_GH0.tar.gz) = 84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a
>+SIZE (RetroShare-RetroShare-v0.6.4_GH0.tar.gz) = 20018361
>diff -ruN retroshare.bak/files/patch-libretroshare_src_libretroshare.pro retroshare/files/patch-libretroshare_src_libretroshare.pro
>--- retroshare.bak/files/patch-libretroshare_src_libretroshare.pro	2016-05-21 04:10:58.000000000 +0200
>+++ retroshare/files/patch-libretroshare_src_libretroshare.pro	2018-06-27 14:54:41.736684000 +0200
>@@ -1,6 +1,6 @@
>---- libretroshare/src/libretroshare.pro.orig	2016-02-05 19:04:46 UTC
>+--- libretroshare/src/libretroshare.pro.orig	2018-03-13 19:25:38 UTC
> +++ libretroshare/src/libretroshare.pro
>-@@ -293,7 +293,7 @@ mac {
>+@@ -341,13 +341,15 @@ mac {
>  
>  freebsd-* {
>  	INCLUDEPATH *= /usr/local/include/gpgme
>@@ -9,3 +9,11 @@
>  
>  	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
>  
>+ 	# linux/bsd can use either - libupnp is more complete and packaged.
>+ 	#CONFIG += upnp_miniupnpc 
>+     CONFIG += upnp_libupnp
>++	DEFINES *= PLUGIN_DIR=\"\\\"$${PLUGIN_DIR}\\\"\"
>++	DEFINES *= DATA_DIR=\"\\\"$${DATA_DIR}\\\"\"
>+ }
>+ 
>+ ################################# OpenBSD ##########################################
>diff -ruN retroshare.bak/files/patch-libretroshare_src_rsserver_rsaccounts.cc retroshare/files/patch-libretroshare_src_rsserver_rsaccounts.cc
>--- retroshare.bak/files/patch-libretroshare_src_rsserver_rsaccounts.cc	1970-01-01 01:00:00.000000000 +0100
>+++ retroshare/files/patch-libretroshare_src_rsserver_rsaccounts.cc	2018-06-27 14:54:41.739198000 +0200
>@@ -0,0 +1,10 @@
>+--- libretroshare/src/rsserver/rsaccounts.cc.orig	2018-03-13 19:25:38 UTC
>++++ libretroshare/src/rsserver/rsaccounts.cc
>+@@ -35,6 +35,7 @@
>+ #endif // WINDOWS_SYS
>+ 
>+ #include <sys/types.h>
>++#include <sys/param.h>
>+ #include <sys/stat.h>
>+ 
>+ #include <iostream>
>diff -ruN retroshare.bak/files/patch-retroshare.pri retroshare/files/patch-retroshare.pri
>--- retroshare.bak/files/patch-retroshare.pri	1970-01-01 01:00:00.000000000 +0100
>+++ retroshare/files/patch-retroshare.pri	2018-06-27 14:54:41.796450000 +0200
>@@ -0,0 +1,22 @@
>+--- retroshare.pri.orig	2018-03-13 19:25:38 UTC
>++++ retroshare.pri
>+@@ -16,7 +16,7 @@ no_retroshare_nogui:CONFIG -= retroshare
>+ 
>+ # To enable RetroShare plugins append the following
>+ # assignation to qmake command line "CONFIG+=retroshare_plugins"
>+-CONFIG *= no_retroshare_plugins
>++CONFIG *=retroshare_plugins
>+ retroshare_plugins:CONFIG -= no_retroshare_plugins
>+ 
>+ # To enable RetroShare-android-service append the following assignation to
>+@@ -101,8 +101,8 @@ rs_macos10.10:CONFIG -= rs_macos10.11
>+ rs_macos10.12:CONFIG -= rs_macos10.11
>+ 
>+ 
>+-linux-* {
>+-	isEmpty(PREFIX)   { PREFIX   = "/usr" }
>++freebsd-* {
>++	isEmpty(PREFIX)   { PREFIX   = "/usr/local" }
>+ 	isEmpty(BIN_DIR)  { BIN_DIR  = "$${PREFIX}/bin" }
>+ 	isEmpty(INC_DIR)  { INC_DIR  = "$${PREFIX}/include/retroshare" }
>+ 	isEmpty(LIB_DIR)  { LIB_DIR  = "$${PREFIX}/lib" }
>diff -ruN retroshare.bak/Makefile retroshare/Makefile
>--- retroshare.bak/Makefile	2018-05-09 22:27:51.000000000 +0200
>+++ retroshare/Makefile	2018-06-27 14:37:36.000000000 +0200
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	retroshare
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.6.3
>-PORTREVISION=	2
>+DISTVERSION=	0.6.4
> CATEGORIES=	net-p2p
> 
> MAINTAINER=	peter@netkey.at
>@@ -29,6 +28,7 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	RetroShare
> GH_PROJECT=	RetroShare
>+RS_REVISION=	0e6d27a
> USE_GNOME=	libxml2 libxslt
> USE_GL=		gl
> USE_QT5=	core gui multimedia printsupport network widgets xml \
>@@ -39,8 +39,12 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
>+		${WRKSRC}/retroshare.pri
>+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
> 		${WRKSRC}/libretroshare/src/libretroshare.pro
> 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
>+		${WRKSRC}/libretroshare/src/rsserver/rsaccounts.cc
>+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
> 		${WRKSRC}/retroshare-gui/src/retroshare-gui.pro
> 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
> 		${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
>@@ -48,9 +52,7 @@
> 		${WRKSRC}/data/retroshare.desktop
> 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
> 		${WRKSRC}/data/retroshare.desktop
>-.if defined(GH_TAGNAME)
>-	@${REINPLACE_CMD} -e 's|RS_REVISION_NUMBER.*|RS_REVISION_NUMBER   0x${GH_TAGNAME}|' \
>+	@${REINPLACE_CMD} -e 's|RS_REVISION_NUMBER.*|RS_REVISION_NUMBER   0x${RS_REVISION}|' \
> 		${WRKSRC}/libretroshare/src/retroshare/rsversion.h
>-.endif
> 
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 229367: 194676 | 194677