libclaw: added patch to link claw_net against libnetwork.so

Korli's patch fixed #3048
This commit is contained in:
Humdinger
2018-09-15 09:05:15 +02:00
parent c6cebd781f
commit 8325f4d2db
2 changed files with 41 additions and 19 deletions

View File

@@ -18,7 +18,7 @@ Claw stands for \"C++ Library Absolutely Wonderful\"."
HOMEPAGE="http://libclaw.sourceforge.net/"
COPYRIGHT="2008-2014 Julien Jorge"
LICENSE="GNU LGPL v2.1"
REVISION="4"
REVISION="5"
SOURCE_URI="http://sourceforge.net/projects/libclaw/files/libclaw/$portVersion/libclaw-$portVersion.tar.gz"
CHECKSUM_SHA256="0be289da7f43b1892575f14b27860af5d1e1f6961eae11653d64e625fd7924b7"
PATCHES="libclaw-$portVersion.patchset"

View File

@@ -1,4 +1,4 @@
From fa045ed22d1276b0c7deae6f5ca5cf71a58dbe3d Mon Sep 17 00:00:00 2001
From 2906b0e50b7c3e01dd6d078fb9fc8c0450f7b667 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Apr 2014 18:04:49 +0200
Subject: Add missing include.
@@ -17,10 +17,10 @@ index 16761ab..bc471b0 100644
#include <sys/stat.h>
#include <netinet/in.h>
--
1.8.3.4
2.19.0
From f8da4cf7165d68763faa5f3955c79b2f1fff7e32 Mon Sep 17 00:00:00 2001
From 34d6c5baa8bb39361cf13d225463812137b61728 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 5 Apr 2014 18:09:50 +0200
Subject: Fix installation paths for Haiku.
@@ -85,10 +85,10 @@ index f0973ac..8de90bd 100644
)
--
1.8.3.4
2.19.0
From 5850bb81673005cf0101b5470749792989a380eb Mon Sep 17 00:00:00 2001
From 627842bf1459274d2cd2b458d5ab8705d9c7e0b7 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 6 Apr 2014 14:34:30 +0200
Subject: Fix claw-config to do the right thing.
@@ -142,17 +142,14 @@ index 73b2b10..c0a8fa5 100755
echo -n "$libdirs"
echo $(print_libraries)
--
1.8.3.4
2.19.0
From 5850bb81673005cf0101b5470749792989a380eb Mon Sep 17 00:00:00 2001
From 37d59f7dd4a70f6bd6ff01210110b73deca90518 Mon Sep 17 00:00:00 2001
From: Julien Jorge <julien.jorge@iscool-e.com>
Date: Thu Apr 24 20:39:18 2014 +0200
Date: Thu, 24 Apr 2014 20:39:18 +0200
Subject: Fix various errors pointed by clang on iOS.
---
claw/impl/box_2d.tpp | 4 ++--
claw/impl/rectangle.tpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/claw/impl/box_2d.tpp b/claw/impl/box_2d.tpp
index e4b6936..71f3883 100644
@@ -183,17 +180,15 @@ index 9e6f14a..3c3c8f3 100644
/*----------------------------------------------------------------------------*/
--
2.17.1
2.19.0
From e00d4b68ebfcd1b0f1e4c4653b3d29f579027f8e Mon Sep 17 00:00:00 2001
From 62e8caaa64da67832b0357e7356ce419d614ab59 Mon Sep 17 00:00:00 2001
From: Julien Jorge <julien.jorge@stuff-o-matic.com>
Date: Wed, 7 Dec 2016 21:36:12 +0100
Subject: [PATCH] Use explicit bool constructor to test an istream in
Subject: Use explicit bool constructor to test an istream in
configuration_file.
---
claw/code/configuration_file.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/claw/code/configuration_file.cpp b/claw/code/configuration_file.cpp
index e7bb26a..47de5e3 100644
@@ -208,3 +203,30 @@ index e7bb26a..47de5e3 100644
if ( result )
{
--
2.19.0
From 9ae4ae48c8fa876cbb92ccacd8126ecbb3b19f6c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 14 Sep 2018 09:17:54 +0200
Subject: Link claw_net against libnetwork.so
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89f0d4e..428a263 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,6 +160,9 @@ add_library( claw_net-static STATIC ${CLAW_NET_SOURCES} )
if( WIN32 )
target_link_libraries( claw_net wsock32 )
endif( WIN32 )
+if( HAIKU )
+ target_link_libraries( claw_net network )
+endif( HAIKU )
# graphic
set( CLAW_GRAPHIC_LIBRARIES )
--
2.19.0