Attachment 203830 Details for Bug 237406 – retroshare.diff

[patch] retroshare.diff

retroshare.diff (text/plain), 3.77 KB, created by Tobias Kortkamp on 2019-04-20 14:54:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2019-04-20 14:54:13 UTC

Size: 3.77 KB

patch

obsolete

>Index: net-p2p/retroshare/Makefile
>===================================================================
>--- net-p2p/retroshare/Makefile	(revision 499274)
>+++ net-p2p/retroshare/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	retroshare
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.6.4
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-p2p
> 
> PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
>@@ -19,7 +19,6 @@
> LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher \
> 		libspeex.so:audio/speex \
> 		libspeexdsp.so:audio/speexdsp \
>-		libupnp.so:devel/upnp \
> 		libgnome-keyring.so:security/libgnome-keyring \
> 		libgpgme.so:security/gpgme \
> 		libopencv_highgui.so:graphics/opencv \
>@@ -26,7 +25,8 @@
> 		libopencv_imgproc.so:graphics/opencv-core \
> 		libavcodec.so:multimedia/ffmpeg \
> 		libcurl.so:ftp/curl \
>-		libmicrohttpd.so:www/libmicrohttpd
>+		libmicrohttpd.so:www/libmicrohttpd \
>+		libminiupnpc.so:net/miniupnpc
> 
> USES=		compiler:features desktop-file-utils dos2unix \
> 		gnome pkgconfig qmake qt:5 ssl
>Index: net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro
>===================================================================
>--- net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro	(revision 499274)
>+++ net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro	(working copy)
>@@ -1,6 +1,6 @@
> --- libretroshare/src/libretroshare.pro.orig	2018-03-13 19:25:38 UTC
> +++ libretroshare/src/libretroshare.pro
>-@@ -341,13 +341,15 @@ mac {
>+@@ -341,13 +341,14 @@ mac {
>  
>  freebsd-* {
>  	INCLUDEPATH *= /usr/local/include/gpgme
>@@ -10,8 +10,9 @@
>  	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
>+-	#CONFIG += upnp_miniupnpc 
>+-    CONFIG += upnp_libupnp
>++	CONFIG += upnp_miniupnpc 
> +	DEFINES *= PLUGIN_DIR=\"\\\"$${PLUGIN_DIR}\\\"\"
> +	DEFINES *= DATA_DIR=\"\\\"$${DATA_DIR}\\\"\"
>  }
>Index: net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro
>===================================================================
>--- net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro	(revision 499274)
>+++ net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro	(working copy)
>@@ -1,6 +1,6 @@
>---- retroshare-gui/src/retroshare-gui.pro.orig	2016-02-05 19:04:46 UTC
>+--- retroshare-gui/src/retroshare-gui.pro.orig	2018-03-13 19:25:38 UTC
> +++ retroshare-gui/src/retroshare-gui.pro
>-@@ -239,12 +239,16 @@ macx {
>+@@ -270,12 +270,15 @@ macx {
>  
>  freebsd-* {
>  	INCLUDEPATH *= /usr/local/include/gpgme
>@@ -7,10 +7,10 @@
> -	LIBS *= -lssl
> +	LIBS *= -lssl -lcrypto
>  	LIBS *= -lgpgme
>- 	LIBS *= -lupnp
>+-	LIBS *= -lupnp
>++	LIBS *= -lminiupnpc
>  	LIBS *= -lgnome-keyring
> +	LIBS *= -lz
>-+	LIBS *= -lixml
> +	LIBS *= -lexecinfo
>  
> -	LIBS += -lsqlite3
>Index: net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro
>===================================================================
>--- net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro	(revision 499274)
>+++ net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro	(working copy)
>@@ -1,6 +1,6 @@
>---- retroshare-nogui/src/retroshare-nogui.pro.orig	2016-03-05 21:29:14 UTC
>+--- retroshare-nogui/src/retroshare-nogui.pro.orig	2019-04-20 14:26:36 UTC
> +++ retroshare-nogui/src/retroshare-nogui.pro
>-@@ -126,10 +126,16 @@ macx {
>+@@ -115,10 +115,15 @@ macx {
>  
>  freebsd-* {
>  	INCLUDEPATH *= /usr/local/include/gpgme
>@@ -7,10 +7,10 @@
> -	LIBS *= -lssl
> +	LIBS *= -lssl -lcrypto
>  	LIBS *= -lgpgme
>- 	LIBS *= -lupnp
>+-	LIBS *= -lupnp
>++	LIBS *= -lminiupnpc
>  	LIBS *= -lgnome-keyring
> +	LIBS *= -lz
>-+	LIBS *= -lixml
> +	LIBS *= -lthr
> +	LIBS += -lsqlcipher
> +	LIBS *= -lexecinfo

Flags:

tobik: maintainer-approval? (peter)

Actions: View | Diff

Attachments on bug 237406: 203830