haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

RetroShare: fix build for x86 arch

Browse Source
This commit is contained in:
Gerasim Troeglazov
2021-11-13 20:11:39 +10:00
parent d79ef89572
commit 958ba78f21
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
net-p2p/retroshare/patches/retroshare-0.6.6.patchset
View File

@@ -1,4 +1,4 @@
From 305f2fd398990f4402048a0afd62a21fb7a44a01 Mon Sep 17 00:00:00 2001
From 0970386a931335c2047dd000ad81a857097607e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Thu, 12 Aug 2021 13:10:39 +0000
Subject: Haiku supporting patches
@@ -215,7 +215,7 @@ index cbd1b9d..bb05c75 100644
2.30.2
From 56f2623be8a2f7be0a852ee1cd03340088a3955f Mon Sep 17 00:00:00 2001
From 1146847079c1f68262994a931a761fea9833be03 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 18 Aug 2021 14:25:46 +0000
Subject: Haiku style by default
@@ -239,7 +239,7 @@ index 86a9355..c16d4e9 100644
2.30.2
From 3ca7cc86a340c50ed4bd2c90f4cd0cd1e7220afd Mon Sep 17 00:00:00 2001
From 5ffcb97de2063e52da0c1045d22f2af5e12f43b5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 19 Aug 2021 08:13:13 +1000
Subject: Use libupnp for Haiku
@@ -265,7 +265,7 @@ index 2c2201e..4e91cbb 100644
2.30.2
From 16ea8e717c65303766d8d0737b2e04efc1aac3f0 Mon Sep 17 00:00:00 2001
From 3f2665daf8792744c9ef3d787b517ac7f743454a Mon Sep 17 00:00:00 2001
From: Gioacchino Mazzurco <gio@eigenlab.org>
Date: Fri, 6 Aug 2021 12:15:34 +0200
Subject: Fix compilation with C++17
@@ -331,7 +331,7 @@ index 8556b81..41d2270 100644
2.30.2
From 18632984161ac3275ee716406684e6b75ba03653 Mon Sep 17 00:00:00 2001
From 80701101852c3961e5c84a19540a81f54f596dea Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 12 Nov 2021 19:04:07 +1000
Subject: Fix bdThread
@@ -354,7 +354,7 @@ index 3fce7ff..9e908b9 100644
2.30.2
From e5da60cf45d052bd3f98ecdc4f0f256d6b3ba847 Mon Sep 17 00:00:00 2001
From 9172243cb7feea3e63ae4e2127e519df53708f69 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 12 Nov 2021 20:20:23 +1000
Subject: Haiku style by default
@@ -379,3 +379,32 @@ index c16d4e9..6b46cc1 100644
--
2.30.2
From a7896a244af95425ebccde9946faf0ed72f57a85 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 13 Nov 2021 20:08:42 +1000
Subject: Use system typedefs for int types
diff --git a/libretroshare/src/tcponudp/tcppacket.h b/libretroshare/src/tcponudp/tcppacket.h
index e87c3e3..78ded40 100644
--- a/libretroshare/src/tcponudp/tcppacket.h
+++ b/libretroshare/src/tcponudp/tcppacket.h
@@ -24,10 +24,13 @@
#include <sys/types.h>
-
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#else
typedef unsigned int uint32;
typedef unsigned short uint16;
typedef unsigned char uint8;
+#endif
#define TCP_PSEUDO_HDR_SIZE 20
--
2.30.2

2
net-p2p/retroshare/retroshare-0.6.6.recipe
View File

@@ -81,7 +81,7 @@ COPYRIGHT="2006-2021 RetroShare Team
2017 Konrad Dębiec"
LICENSE="GNU GPL v2
GNU LGPL v2.1"
REVISION="2"
REVISION="3"
SOURCE_URI="https://github.com/RetroShare/RetroShare/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="c545b9249ac7dbfef72a2d636bc0f8b729c7ce05f21a54dd9284b2a387592d4a"
SOURCE_DIR="RetroShare-$portVersion"