update patch

Signed-off-by: Daisuke Nishimatsu <daisuke@DaisukenoMacBook-Air.local>

Author: Daisuke Nishimatsu

patch/ros-kilted-foxglove-bridge.patch

@@ -1,23 +1,23 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5665ea33..6c0c46e9 100644
+index 611816f..7a16ab2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -70,6 +70,18 @@ else()
+@@ -75,6 +75,18 @@ else()
    elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
      set(FOXGLOVE_SDK_PLATFORM "x86_64-unknown-linux-gnu")
-     set(FOXGLOVE_SDK_SHA "d07ec994e0b07766e6b68323a1f3bd407dc65391084f376b6169564b6d9873f0")
+     set(FOXGLOVE_SDK_SHA "8e4967ec7446a06b5a04c47b54bcd4cecff2ad8776e002ef3803ed4a7076841d")
 +  elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
 +    set(FOXGLOVE_SDK_PLATFORM "aarch64-apple-darwin")
-+    set(FOXGLOVE_SDK_SHA "2ca081fa503211aba4e89fba26f5edf6174e3978620267f95700e1da559922e3")
++    set(FOXGLOVE_SDK_SHA "0799fcb999616fe25d16d7e4b2894adb6f7fa97ce9671bd908d8412505887bec")
 +  elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
 +    set(FOXGLOVE_SDK_PLATFORM "x86_64-apple-darwin")
-+    set(FOXGLOVE_SDK_SHA "c639c62143995bfc79e9cbe9eb9c170269acfa55b733bc2787742a1801d3b7b3")
++    set(FOXGLOVE_SDK_SHA "3e0d7e575e7de9351ae71a0201ede5c00020f2e9d12cc5cd08e2c896033c9fa9")
 +  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
 +    set(FOXGLOVE_SDK_PLATFORM "aarch64-pc-windows-msvc")
-+    set(FOXGLOVE_SDK_SHA "3d1fc78ab0e870ad524cecd53857b9297999fe162548459287c477a307fff832")
++    set(FOXGLOVE_SDK_SHA "9bb816d97a69bf8f5b81559027955bf9277fcd60204cd11495dff352f49cb35e")
 +  elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")
 +    set(FOXGLOVE_SDK_PLATFORM "x86_64-pc-windows-msvc")
-+    set(FOXGLOVE_SDK_SHA "f45238d567a9d576ba201f5bc407f0240bbb987f3c2e7cebda562269c7c1c310")
++    set(FOXGLOVE_SDK_SHA "219f84aa184eb1224d8ba35bc84412dc253137e65b3d6c5f0ffd80a8b0c2dbd2")
    else()
      message(FATAL_ERROR "Unsupported platform/architecture combination: ${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
    endif()

patch/ros-kilted-rosx-introspection.unix.patch

@@ -1,236 +1,14 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab44d1c..07e3e9f 100644
+index 40bc803..937b6cf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -97,6 +97,9 @@ endif()
+@@ -114,6 +114,9 @@ endif()
  if(CMAKE_THREAD_LIBS_INIT)
    target_link_libraries(urcl PUBLIC "${CMAKE_THREAD_LIBS_INIT}")
  endif()
 +if(UNIX AND NOT APPLE)
 +  target_link_libraries(urcl PUBLIC "rt")
 +endif()
 
- ##
- ## Build testing if enabled by option
-diff --git a/include/ur_client_library/comm/bin_parser.h b/include/ur_client_library/comm/bin_parser.h
-index e13aba6..83f8e6c 100644
---- a/include/ur_client_library/comm/bin_parser.h
-+++ b/include/ur_client_library/comm/bin_parser.h
-@@ -21,7 +21,6 @@
- #pragma once
- 
- #include <assert.h>
--#include <endian.h>
- #include <inttypes.h>
- #include <array>
- #include <bitset>
-@@ -29,6 +28,7 @@
- #include <cstring>
- #include <string>
- #include <memory>
-+#include "ur_client_library/portable_endian.h"
- #include "ur_client_library/log.h"
- #include "ur_client_library/types.h"
- #include "ur_client_library/exceptions.h"
-diff --git a/include/ur_client_library/comm/package_serializer.h b/include/ur_client_library/comm/package_serializer.h
-index 01fa857..29fb196 100644
---- a/include/ur_client_library/comm/package_serializer.h
-+++ b/include/ur_client_library/comm/package_serializer.h
-@@ -29,11 +29,11 @@
- #ifndef UR_CLIENT_LIBRARY_PACKAGE_SERIALIZER_H_INCLUDED
- #define UR_CLIENT_LIBRARY_PACKAGE_SERIALIZER_H_INCLUDED
- 
--#include <endian.h>
- #include <cstdint>
- #include <cstring>
- #include <string>
- 
-+#include "ur_client_library/portable_endian.h"
- #include "ur_client_library/types.h"
- 
- namespace urcl
-diff --git a/include/ur_client_library/control/reverse_interface.h b/include/ur_client_library/control/reverse_interface.h
-index 8220207..665f26d 100644
---- a/include/ur_client_library/control/reverse_interface.h
-+++ b/include/ur_client_library/control/reverse_interface.h
-@@ -36,9 +36,9 @@
- #include "ur_client_library/ur/robot_receive_timeout.h"
- #include "ur_client_library/ur/version_information.h"
- #include <cstring>
--#include <endian.h>
- #include <condition_variable>
- #include <list>
-+#include "ur_client_library/portable_endian.h"
- 
- namespace urcl
- {
-diff --git a/include/ur_client_library/portable_endian.h b/include/ur_client_library/portable_endian.h
-new file mode 100644
-index 0000000..2b43378
---- /dev/null
-+++ b/include/ur_client_library/portable_endian.h
-@@ -0,0 +1,118 @@
-+// "License": Public Domain
-+// I, Mathias Panzenböck, place this file hereby into the public domain. Use it at your own risk for whatever you like.
-+// In case there are jurisdictions that don't support putting things in the public domain you can also consider it to
-+// be "dual licensed" under the BSD, MIT and Apache licenses, if you want to. This code is trivial anyway. Consider it
-+// an example on how to get the endian conversion functions on different platforms.
-+
-+#ifndef PORTABLE_ENDIAN_H__
-+#define PORTABLE_ENDIAN_H__
-+
-+#if (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__)
-+
-+#	define __WINDOWS__
-+
-+#endif
-+
-+#if defined(__linux__) || defined(__CYGWIN__)
-+
-+#	include <endian.h>
-+
-+#elif defined(__APPLE__)
-+
-+#	include <libkern/OSByteOrder.h>
-+
-+#	define htobe16(x) OSSwapHostToBigInt16(x)
-+#	define htole16(x) OSSwapHostToLittleInt16(x)
-+#	define be16toh(x) OSSwapBigToHostInt16(x)
-+#	define le16toh(x) OSSwapLittleToHostInt16(x)
-+
-+#	define htobe32(x) OSSwapHostToBigInt32(x)
-+#	define htole32(x) OSSwapHostToLittleInt32(x)
-+#	define be32toh(x) OSSwapBigToHostInt32(x)
-+#	define le32toh(x) OSSwapLittleToHostInt32(x)
-+
-+#	define htobe64(x) OSSwapHostToBigInt64(x)
-+#	define htole64(x) OSSwapHostToLittleInt64(x)
-+#	define be64toh(x) OSSwapBigToHostInt64(x)
-+#	define le64toh(x) OSSwapLittleToHostInt64(x)
-+
-+#	define __BYTE_ORDER    BYTE_ORDER
-+#	define __BIG_ENDIAN    BIG_ENDIAN
-+#	define __LITTLE_ENDIAN LITTLE_ENDIAN
-+#	define __PDP_ENDIAN    PDP_ENDIAN
-+
-+#elif defined(__OpenBSD__)
-+
-+#	include <sys/endian.h>
-+
-+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+
-+#	include <sys/endian.h>
-+
-+#	define be16toh(x) betoh16(x)
-+#	define le16toh(x) letoh16(x)
-+
-+#	define be32toh(x) betoh32(x)
-+#	define le32toh(x) letoh32(x)
-+
-+#	define be64toh(x) betoh64(x)
-+#	define le64toh(x) letoh64(x)
-+
-+#elif defined(__WINDOWS__)
-+
-+#	include <winsock2.h>
-+#	include <sys/param.h>
-+
-+#	if BYTE_ORDER == LITTLE_ENDIAN
-+
-+#		define htobe16(x) htons(x)
-+#		define htole16(x) (x)
-+#		define be16toh(x) ntohs(x)
-+#		define le16toh(x) (x)
-+
-+#		define htobe32(x) htonl(x)
-+#		define htole32(x) (x)
-+#		define be32toh(x) ntohl(x)
-+#		define le32toh(x) (x)
-+
-+#		define htobe64(x) htonll(x)
-+#		define htole64(x) (x)
-+#		define be64toh(x) ntohll(x)
-+#		define le64toh(x) (x)
-+
-+#	elif BYTE_ORDER == BIG_ENDIAN
-+
-+		/* that would be xbox 360 */
-+#		define htobe16(x) (x)
-+#		define htole16(x) __builtin_bswap16(x)
-+#		define be16toh(x) (x)
-+#		define le16toh(x) __builtin_bswap16(x)
-+
-+#		define htobe32(x) (x)
-+#		define htole32(x) __builtin_bswap32(x)
-+#		define be32toh(x) (x)
-+#		define le32toh(x) __builtin_bswap32(x)
-+
-+#		define htobe64(x) (x)
-+#		define htole64(x) __builtin_bswap64(x)
-+#		define be64toh(x) (x)
-+#		define le64toh(x) __builtin_bswap64(x)
-+
-+#	else
-+
-+#		error byte order not supported
-+
-+#	endif
-+
-+#	define __BYTE_ORDER    BYTE_ORDER
-+#	define __BIG_ENDIAN    BIG_ENDIAN
-+#	define __LITTLE_ENDIAN LITTLE_ENDIAN
-+#	define __PDP_ENDIAN    PDP_ENDIAN
-+
-+#else
-+
-+#	error platform not supported
-+
-+#endif
-+
-+#endif
-diff --git a/include/ur_client_library/primary/package_header.h b/include/ur_client_library/primary/package_header.h
-index cd64bda..440b2e4 100644
---- a/include/ur_client_library/primary/package_header.h
-+++ b/include/ur_client_library/primary/package_header.h
-@@ -32,7 +32,7 @@
- 
- #include <inttypes.h>
- #include <cstddef>
--#include <endian.h>
-+#include "ur_client_library/portable_endian.h"
- #include "ur_client_library/types.h"
- 
- namespace urcl
-diff --git a/include/ur_client_library/rtde/package_header.h b/include/ur_client_library/rtde/package_header.h
-index f910a08..eb509ea 100644
---- a/include/ur_client_library/rtde/package_header.h
-+++ b/include/ur_client_library/rtde/package_header.h
-@@ -31,7 +31,7 @@
- #define UR_CLIENT_LIBRARY_RTDE__HEADER_H_INCLUDED
- 
- #include <cstddef>
--#include <endian.h>
-+#include "ur_client_library/portable_endian.h"
- #include "ur_client_library/types.h"
- #include "ur_client_library/comm/package_serializer.h"
- 
-diff --git a/src/comm/tcp_socket.cpp b/src/comm/tcp_socket.cpp
-index de18910..7e3c196 100644
---- a/src/comm/tcp_socket.cpp
-+++ b/src/comm/tcp_socket.cpp
-@@ -20,7 +20,6 @@
-  * limitations under the License.
-  */
- 
--#include <endian.h>
- #include <chrono>
- #include <cstring>
- #include <sstream>
-@@ -31,6 +30,7 @@
- #  include <netinet/tcp.h>
- #endif
- 
-+#include "ur_client_library/portable_endian.h"
- #include "ur_client_library/log.h"
- #include "ur_client_library/comm/tcp_socket.h"
- 
+ # When warnings are treated as errors, also enable high warning level for all targets
+ if(CMAKE_COMPILE_WARNING_AS_ERROR)