Compatibility for Python11

pryre · Jun 3, 2023 · e0301b6 · e0301b6
1 parent 7d8e0e2
commit e0301b6
Show file tree

Hide file tree

Showing 3 changed files with 125 additions and 5 deletions.
diff --git a/x86_64/ros2/ros2-arch-deps/PKGBUILD b/x86_64/ros2/ros2-arch-deps/PKGBUILD
@@ -34,7 +34,9 @@ depends=('asio'
          'python-pyqt5'
          'python-pytest-repeat'
          'python-setuptools'
-         'python-sip4'
+         'pyside2'
+         'shiboken2'
+         #'python-sip4'
          'python-yaml'
          'qt5-base' 
          'qt5-svg'
@@ -66,11 +68,11 @@ depends=('asio'
          'python-colcon-test-result'
          'python-colcon-zsh'         
          'python-colcon-common-extensions'
-         'python-pyqt5-sip4'
+         #'python-pyqt5-sip4'
          'python-rospkg'
          'python-rosdistro'
          'python-rosdep'
-		 'sip4'
+		 #'sip4'
  )
 optdepends=('python-pydot: running the node graph in rqt'
             'python-pyqtgraph: for plotting in rqt'

diff --git a/x86_64/ros2/ros2-humble/PKGBUILD b/x86_64/ros2/ros2-humble/PKGBUILD
@@ -18,7 +18,7 @@ arch=('any')
 license=('Apache')
 depends=(
     'ros2-arch-deps'
-    'python-pyqt5-sip4'
+    #'python-pyqt5-sip'
     'assimp'
     'gmock'
 )
@@ -33,7 +33,7 @@ install=ros2-humble.install
 prepare() {
     # Check locale according to
     # https://docs.ros.org/en/rolling/Installation/Ubuntu-Development-Setup.html#set-locale
-        if ! locale | grep LANG | grep 'UTF-8\|utf8' > /dev/null; then
+    if ! locale | grep LANG | grep 'UTF-8\|utf8' > /dev/null; then
         echo 'Your locale must support UTF-8. See ' \
              'https://wiki.archlinux.org/index.php/locale and ' \
              'https://docs.ros.org/en/rolling/Installation/Ubuntu-Development-Setup.html#set-locale'
@@ -43,6 +43,9 @@ prepare() {
     # Clone the repos
     mkdir -p $srcdir/ros2/src
     vcs import $srcdir/ros2/src < $srcdir/ros2/ros2.repos
+
+	# Patch for Python 11 compat until supported by upstream
+	patch --directory="$srcdir" --forward --strip=1 --input="python_11_support.patch"
 }
 
 build() {

diff --git a/x86_64/ros2/ros2-humble/python_11_support.patch b/x86_64/ros2/ros2-humble/python_11_support.patch
@@ -0,0 +1,115 @@
+Only in src: build
+Only in src: install
+Only in src: log
+Only in src/ros2: .git
+Only in src/ros2: .github
+Only in src/ros2: README.md
+Only in src/ros2: ros2.repos
+diff '--color=auto' --unified --recursive --text src_unpatched/ros2/src/eProsima/Fast-DDS/include/fastdds/rtps/transport/TransportDescriptorInterface.h src/ros2/src/eProsima/Fast-DDS/include/fastdds/rtps/transport/TransportDescriptorInterface.h
+--- src_unpatched/ros2/src/eProsima/Fast-DDS/include/fastdds/rtps/transport/TransportDescriptorInterface.h	2023-06-03 12:07:41.663312439 +1000
++++ src/ros2/src/eProsima/Fast-DDS/include/fastdds/rtps/transport/TransportDescriptorInterface.h	2023-06-03 12:27:03.027756124 +1000
+@@ -17,9 +17,7 @@
+
+ #include <fastrtps/fastrtps_dll.h>
+
+-#ifdef _WIN32
+ #include <cstdint>
+-#endif // ifdef _WIN32
+ #include <vector>
+ #include <string>
+
+diff '--color=auto' --unified --recursive --text src_unpatched/ros2/src/eProsima/Fast-DDS/include/fastrtps/types/TypeNamesGenerator.h src/ros2/src/eProsima/Fast-DDS/include/fastrtps/types/TypeNamesGenerator.h
+--- src_unpatched/ros2/src/eProsima/Fast-DDS/include/fastrtps/types/TypeNamesGenerator.h	2023-06-03 12:07:41.673312404 +1000
++++ src/ros2/src/eProsima/Fast-DDS/include/fastrtps/types/TypeNamesGenerator.h	2023-06-03 12:23:12.112318959 +1000
+@@ -4,6 +4,7 @@
+ #include <fastrtps/fastrtps_dll.h>
+
+ #include <string>
++#include <cstdint>
+ #include <vector>
+
+ namespace eprosima {
+diff '--color=auto' --unified --recursive --text src_unpatched/ros2/src/ros2/pybind11_vendor/CMakeLists.txt src/ros2/src/ros2/pybind11_vendor/CMakeLists.txt
+--- src_unpatched/ros2/src/ros2/pybind11_vendor/CMakeLists.txt	2023-06-03 12:07:42.226643773 +1000
++++ src/ros2/src/ros2/pybind11_vendor/CMakeLists.txt	2023-06-03 14:49:45.513287214 +1000
+@@ -55,7 +55,7 @@
+   include(ExternalProject)
+   ExternalProject_Add(pybind11-2.9.1
+     GIT_REPOSITORY https://github.com/pybind/pybind11.git
+-    GIT_TAG ffa346860b306c9bbfb341aed9c14c067751feb8  # v2.9.1
++    GIT_TAG 5b0a6fc2017fcc176545afe3e09c9f9885283242  # v2.10.4
+     GIT_CONFIG advice.detachedHead=false
+     # Suppress git update due to https://gitlab.kitware.com/cmake/cmake/-/issues/16419
+     # See https://github.com/ament/uncrustify_vendor/pull/22 for details
+@@ -72,9 +72,9 @@
+     # definitions for Py_DEBUG, which MSVC complains about.  This patch switches
+     # the internal pybind11 variable to be called PYBIND11_DEBUG, which avoids
+     # the issue.
+-    PATCH_COMMAND
+-      ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn
+-        ${CMAKE_CURRENT_SOURCE_DIR}/pybind11-2.9.1-fix-windows-debug.patch
++    # PATCH_COMMAND
++    #   ${CMAKE_COMMAND} -E chdir <SOURCE_DIR> git apply -p1 --ignore-space-change --whitespace=nowarn
++    #     ${CMAKE_CURRENT_SOURCE_DIR}/pybind11-2.9.1-fix-windows-debug.patch
+   )
+
+   # The external project will install to the build folder, but we'll install that on make install.
+diff '--color=auto' --unified --recursive --text src_unpatched/ros2/src/ros2/rclcpp/rclcpp/include/rclcpp/context.hpp src/ros2/src/ros2/rclcpp/rclcpp/include/rclcpp/context.hpp
+--- src_unpatched/ros2/src/ros2/rclcpp/rclcpp/include/rclcpp/context.hpp	2023-06-03 12:07:42.259976988 +1000
++++ src/ros2/src/ros2/rclcpp/rclcpp/include/rclcpp/context.hpp	2023-06-03 14:31:32.403365013 +1000
+@@ -26,6 +26,7 @@
+ #include <unordered_set>
+ #include <utility>
+ #include <vector>
++#include <stdexcept>
+
+ #include "rcl/context.h"
+ #include "rcl/guard_condition.h"
+diff '--color=auto' --unified --recursive --text src_unpatched/ros2/src/ros2/rclcpp/rclcpp/src/rclcpp/logging_mutex.cpp src/ros2/src/ros2/rclcpp/rclcpp/src/rclcpp/logging_mutex.cpp
+--- src_unpatched/ros2/src/ros2/rclcpp/rclcpp/src/rclcpp/logging_mutex.cpp	2023-06-03 12:07:42.263310309 +1000
++++ src/ros2/src/ros2/rclcpp/rclcpp/src/rclcpp/logging_mutex.cpp	2023-06-03 15:18:58.352455885 +1000
+@@ -14,6 +14,7 @@
+
+ #include <memory>
+ #include <mutex>
++#include <stdexcept>
+
+ #include "rcutils/macros.h"
+
+diff '--color=auto' --unified --recursive --text src_unpatched/ros2/src/ros2/rcpputils/include/rcpputils/filesystem_helper.hpp src/ros2/src/ros2/rcpputils/include/rcpputils/filesystem_helper.hpp
+--- src_unpatched/ros2/src/ros2/rcpputils/include/rcpputils/filesystem_helper.hpp	2023-06-03 12:07:42.286643560 +1000
++++ src/ros2/src/ros2/rcpputils/include/rcpputils/filesystem_helper.hpp	2023-06-03 12:27:46.770853730 +1000
+@@ -41,6 +41,7 @@
+
+ #include <string>
+ #include <vector>
++#include <cstdint>
+
+ #include "rcpputils/visibility_control.hpp"
+
+diff '--color=auto' --unified --recursive --text src_unpatched/ros2/src/ros2/rosbag2/rosbag2_compression/include/rosbag2_compression/compression_options.hpp src/ros2/src/ros2/rosbag2/rosbag2_compression/include/rosbag2_compression/compression_options.hpp
+--- src_unpatched/ros2/src/ros2/rosbag2/rosbag2_compression/include/rosbag2_compression/compression_options.hpp	2023-06-03 12:07:42.389976526 +1000
++++ src/ros2/src/ros2/rosbag2/rosbag2_compression/include/rosbag2_compression/compression_options.hpp	2023-06-03 16:16:35.587635598 +1000
+@@ -16,6 +16,7 @@
+ #define ROSBAG2_COMPRESSION__COMPRESSION_OPTIONS_HPP_
+
+ #include <string>
++#include <cstdint>
+
+ #include "visibility_control.hpp"
+
+Only in src/ros2/src/ros2/rosidl/rosidl_generator_c/rosidl_generator_c: __pycache__
+Only in src/ros2/src/ros2/rosidl/rosidl_generator_cpp/rosidl_generator_cpp: __pycache__
+Only in src/ros2/src/ros2/rosidl_python/rosidl_generator_py/rosidl_generator_py: __pycache__
+Only in src/ros2/src/ros2/rviz/rviz_visual_testing_framework: test
+diff '--color=auto' --unified --recursive --text src_unpatched/ros2/src/ros-tooling/libstatistics_collector/include/libstatistics_collector/moving_average_statistics/types.hpp src/ros2/src/ros-tooling/libstatistics_collector/include/libstatistics_collector/moving_average_statistics/types.hpp
+--- src_unpatched/ros2/src/ros-tooling/libstatistics_collector/include/libstatistics_collector/moving_average_statistics/types.hpp	2023-06-03 12:07:41.956644732 +1000
++++ src/ros2/src/ros-tooling/libstatistics_collector/include/libstatistics_collector/moving_average_statistics/types.hpp	2023-06-03 14:28:42.271053558 +1000
+@@ -16,6 +16,7 @@
+ #define LIBSTATISTICS_COLLECTOR__MOVING_AVERAGE_STATISTICS__TYPES_HPP_
+
+ #include <cmath>
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+