mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 22:00:09 +02:00
233 lines
7.5 KiB
Plaintext
233 lines
7.5 KiB
Plaintext
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.
|
|
|
|
|
|
diff --git a/claw/socket_traits_unix.hpp b/claw/socket_traits_unix.hpp
|
|
index 16761ab..bc471b0 100644
|
|
--- a/claw/socket_traits_unix.hpp
|
|
+++ b/claw/socket_traits_unix.hpp
|
|
@@ -31,6 +31,7 @@
|
|
#define __CLAW_SOCKET_TRAITS_UNIX_HPP__
|
|
|
|
#include <sys/types.h>
|
|
+#include <sys/select.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/stat.h>
|
|
#include <netinet/in.h>
|
|
--
|
|
2.19.0
|
|
|
|
|
|
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.
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 0716825..66607b0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -27,12 +27,20 @@ if(SVN_ENTRIES)
|
|
endif(Subversion_FOUND)
|
|
endif(SVN_ENTRIES)
|
|
|
|
-set( CLAW_CODE_DIR claw/code/ )
|
|
+if (HAIKU)
|
|
+set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/develop/headers/" )
|
|
+set( CLAW_INSTALLDIR_DOC data/doc/libclaw${CLAW_VERSION_MAJOR}/ )
|
|
+set( CLAW_TRANSLATIONS_INSTALL_DIR "data/locale" )
|
|
+set( CLAW_INSTALLDIR_SOURCE develop/headers/claw/ )
|
|
+else()
|
|
set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
|
|
-set( CLAW_INSTALLDIR_SOURCE include/claw/ )
|
|
-set( CLAW_INSTALLDIR_LIB lib/ )
|
|
set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
|
|
set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
|
|
+set( CLAW_INSTALLDIR_SOURCE include/claw/ )
|
|
+endif()
|
|
+
|
|
+set( CLAW_CODE_DIR claw/code/ )
|
|
+set( CLAW_INSTALLDIR_LIB lib/ )
|
|
set( CLAW_EXECUTABLE_DIR bin/ )
|
|
|
|
set( CLAW_LIBRARIES
|
|
diff --git a/cmake-module/CMakeLists.txt b/cmake-module/CMakeLists.txt
|
|
index a08a799..c486c5c 100644
|
|
--- a/cmake-module/CMakeLists.txt
|
|
+++ b/cmake-module/CMakeLists.txt
|
|
@@ -3,7 +3,11 @@ cmake_minimum_required(VERSION 2.6)
|
|
project(claw:cmake-modules)
|
|
|
|
if( NOT CLAW_CMAKE_MODULES_INSTALL_PATH )
|
|
- set( CLAW_CMAKE_MODULES_INSTALL_PATH "share/cmake/libclaw" )
|
|
+ if(HAIKU)
|
|
+ set( CLAW_CMAKE_MODULES_INSTALL_PATH "lib/${CMAKE_HAIKU_SECONDARY_ARCH}/libclaw/cmake/" )
|
|
+ else()
|
|
+ set( CLAW_CMAKE_MODULES_INSTALL_PATH "share/cmake/libclaw" )
|
|
+ endif()
|
|
endif( NOT CLAW_CMAKE_MODULES_INSTALL_PATH )
|
|
|
|
set( CLAW_CMAKE_MODULES
|
|
diff --git a/desktop/locale/libclaw/CMakeLists.txt b/desktop/locale/libclaw/CMakeLists.txt
|
|
index f0973ac..8de90bd 100644
|
|
--- a/desktop/locale/libclaw/CMakeLists.txt
|
|
+++ b/desktop/locale/libclaw/CMakeLists.txt
|
|
@@ -22,7 +22,7 @@ macro(GETTEXT_CREATE_TRANSLATIONS_CUSTOM _targetName _potFile _firstPoFile)
|
|
|
|
install(
|
|
FILES ${_gmoFile}
|
|
- DESTINATION share/locale/${_lang}/LC_MESSAGES
|
|
+ DESTINATION ${CLAW_TRANSLATIONS_INSTALL_DIR}/${_lang}/LC_MESSAGES
|
|
RENAME ${_potBasename}.mo
|
|
)
|
|
|
|
--
|
|
2.19.0
|
|
|
|
|
|
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.
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 66607b0..89f0d4e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -28,19 +28,20 @@ if(SVN_ENTRIES)
|
|
endif(SVN_ENTRIES)
|
|
|
|
if (HAIKU)
|
|
-set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/develop/headers/" )
|
|
-set( CLAW_INSTALLDIR_DOC data/doc/libclaw${CLAW_VERSION_MAJOR}/ )
|
|
-set( CLAW_TRANSLATIONS_INSTALL_DIR "data/locale" )
|
|
-set( CLAW_INSTALLDIR_SOURCE develop/headers/claw/ )
|
|
+ set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/develop/headers/${CMAKE_HAIKU_SECONDARY_ARCH}" )
|
|
+ set( CLAW_INSTALLDIR_DOC data/doc/libclaw${CLAW_VERSION_MAJOR}/ )
|
|
+ set( CLAW_TRANSLATIONS_INSTALL_DIR "data/locale" )
|
|
+ set( CLAW_INSTALLDIR_SOURCE develop/headers/${CMAKE_HAIKU_SECONDARY_ARCH}/claw/ )
|
|
+ set( CLAW_INSTALLDIR_LIB lib/${CMAKE_HAIKU_SECONDARY_ARCH}/ )
|
|
else()
|
|
-set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
|
|
-set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
|
|
-set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
|
|
-set( CLAW_INSTALLDIR_SOURCE include/claw/ )
|
|
+ set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
|
|
+ set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
|
|
+ set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
|
|
+ set( CLAW_INSTALLDIR_SOURCE include/claw/ )
|
|
+ set( CLAW_INSTALLDIR_LIB lib/ )
|
|
endif()
|
|
|
|
set( CLAW_CODE_DIR claw/code/ )
|
|
-set( CLAW_INSTALLDIR_LIB lib/ )
|
|
set( CLAW_EXECUTABLE_DIR bin/ )
|
|
|
|
set( CLAW_LIBRARIES
|
|
diff --git a/claw-config.in b/claw-config.in
|
|
index 73b2b10..c0a8fa5 100755
|
|
--- a/claw-config.in
|
|
+++ b/claw-config.in
|
|
@@ -140,7 +140,7 @@ while test $# -gt 0; do
|
|
echo -I$CLAW_INCLUDE_DIRECTORY
|
|
;;
|
|
--libs)
|
|
- libdirs="-L${exec_prefix}/lib "
|
|
+ libdirs="-L${exec_prefix}/@CLAW_INSTALLDIR_LIB@ "
|
|
|
|
echo -n "$libdirs"
|
|
echo $(print_libraries)
|
|
--
|
|
2.19.0
|
|
|
|
|
|
From 37d59f7dd4a70f6bd6ff01210110b73deca90518 Mon Sep 17 00:00:00 2001
|
|
From: Julien Jorge <julien.jorge@iscool-e.com>
|
|
Date: Thu, 24 Apr 2014 20:39:18 +0200
|
|
Subject: Fix various errors pointed by clang on iOS.
|
|
|
|
|
|
diff --git a/claw/impl/box_2d.tpp b/claw/impl/box_2d.tpp
|
|
index e4b6936..71f3883 100644
|
|
--- a/claw/impl/box_2d.tpp
|
|
+++ b/claw/impl/box_2d.tpp
|
|
@@ -136,8 +136,8 @@ template<typename U>
|
|
claw::math::box_2d<U> claw::math::box_2d<T>::cast_value_type_to() const
|
|
{
|
|
return claw::math::box_2d<U>
|
|
- ( first_point.cast_value_type_to<U>(),
|
|
- second_point.cast_value_type_to<U>() );
|
|
+ ( first_point.template cast_value_type_to<U>(),
|
|
+ second_point.template cast_value_type_to<U>() );
|
|
} // box_2d::cast_value_type_to()
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
diff --git a/claw/impl/rectangle.tpp b/claw/impl/rectangle.tpp
|
|
index 9e6f14a..3c3c8f3 100644
|
|
--- a/claw/impl/rectangle.tpp
|
|
+++ b/claw/impl/rectangle.tpp
|
|
@@ -140,7 +140,7 @@ template<typename U>
|
|
claw::math::rectangle<U> claw::math::rectangle<T>::cast_value_type_to() const
|
|
{
|
|
return claw::math::rectangle<U>
|
|
- ( position.cast_value_type_to<U>(), (U)width, (U)height );
|
|
+ ( position.template cast_value_type_to<U>(), (U)width, (U)height );
|
|
} // rectangle::cast_value_type_to()
|
|
|
|
/*----------------------------------------------------------------------------*/
|
|
--
|
|
2.19.0
|
|
|
|
|
|
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: Use explicit bool constructor to test an istream in
|
|
configuration_file.
|
|
|
|
|
|
diff --git a/claw/code/configuration_file.cpp b/claw/code/configuration_file.cpp
|
|
index e7bb26a..47de5e3 100644
|
|
--- a/claw/code/configuration_file.cpp
|
|
+++ b/claw/code/configuration_file.cpp
|
|
@@ -441,7 +441,7 @@ claw::configuration_file::file_end() const
|
|
bool claw::configuration_file::get_line
|
|
( std::istream& is, const syntax_description& syntax, std::string& line ) const
|
|
{
|
|
- bool result = text::getline(is, line);
|
|
+ const bool result( text::getline(is, line) );
|
|
|
|
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
|
|
|