From 888b74f3196ac58d099e35deda8e7c0a1aea082f Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sat, 6 May 2023 10:04:51 +0800 Subject: [PATCH 01/13] fix: map package clang-tidy to clang-tools-extra Signed-off-by: will_niutao --- spec_fix/pkg.remap | 1 + 1 file changed, 1 insertion(+) diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index d59f2f3..94e9f2e 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -87,3 +87,4 @@ python3-rosdistro-modules python3-rosdistro qt5-qmake qt5-qtbase-devel python3-qt5-bindings python3-qt5-devel libdw-dev elfutils-devel +clang-tidy clang-tools-extra -- Gitee From 6dda44c41bee2d55879d55985f4fd611a473bcbd Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sat, 6 May 2023 10:33:35 +0800 Subject: [PATCH 02/13] fix: fix yaml description format Signed-off-by: will_niutao --- create-ros-yaml-for-gitee.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/create-ros-yaml-for-gitee.sh b/create-ros-yaml-for-gitee.sh index a6cc85a..cbf94fa 100755 --- a/create-ros-yaml-for-gitee.sh +++ b/create-ros-yaml-for-gitee.sh @@ -30,13 +30,8 @@ main() mkdir -p $class echo "name: $project" >${ROS_SIG_BASE}/$class/$project.yaml - echo "description: The Robot Operating System(ROS) project" >>${ROS_SIG_BASE}/$class/$project.yaml - for i in `cd ${ROS_REPO_BASE}/$project && ls *.spec` - do - sum=`grep "Summary: " ${ROS_REPO_BASE}/$project/$i | awk -F"Summary: " '{print $2}'` - summary=`echo $(echo $sum)` - echo " `echo $i | awk -F".spec" '{print $1}'`: $summary" >>${ROS_SIG_BASE}/$class/$project.yaml - done + specs=`cd ${ROS_REPO_BASE}/$project && ls *.spec | sed -e "s#.spec#,#g" | tr -d '\n' | sed -e "s/,$/./g"` + echo "description: The Robot Operating System(ROS) project, include $specs" >>${ROS_SIG_BASE}/$class/$project.yaml echo "upstream: ${SRC_TAR_BASE_URL}" >>${ROS_SIG_BASE}/$class/$project.yaml echo "branches:" >>${ROS_SIG_BASE}/$class/$project.yaml echo "- name: master" >>${ROS_SIG_BASE}/$class/$project.yaml -- Gitee From 3f693f4fc967b10980e7892e8568f5dfa4d9d936 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sat, 6 May 2023 14:10:47 +0800 Subject: [PATCH 03/13] refactor: delete _multibuild from project which only contain one package --- gen-pkg-spec.sh | 4 ++++ push-projects-to-gitee.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gen-pkg-spec.sh b/gen-pkg-spec.sh index dab5e3e..a749b4f 100755 --- a/gen-pkg-spec.sh +++ b/gen-pkg-spec.sh @@ -272,6 +272,7 @@ main() echo "" >_multibuild fi + pkg_num=0 while read pkg path version do if [ "$GEN_ONE" != "" -a "$pkg" != "$GEN_ONE" ] @@ -325,11 +326,14 @@ main() then echo -e "\t$pkg" >>_multibuild fi + pkg_num=`expr $pkg_num + 1` done < ${OUTPUT}/.repo_pkgs if [ "$GEN_ONE" == "" ] then echo "" >>_multibuild + + [ $pkg_num -lt 2 ] && rm _multibuild fi done diff --git a/push-projects-to-gitee.sh b/push-projects-to-gitee.sh index e7ed555..2663926 100755 --- a/push-projects-to-gitee.sh +++ b/push-projects-to-gitee.sh @@ -38,7 +38,7 @@ main() rm -f * git checkout -- README.md README.en.md cp ${ROS_REPO_BASE}/${project}/* ${ROS_GITEE_BASE}/${project} - git status | grep -qE "modified:|Untracked" + git status | grep -qE "modified:|Untracked|deleted:" if [ $? -ne 0 ] then #info_log "nothing changed of project $project, continue" -- Gitee From 9dc4ba836be7ca50010f4ee735718d77849e9383 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sat, 6 May 2023 17:39:41 +0800 Subject: [PATCH 04/13] fix: fix foros buile error Signed-off-by: will_niutao --- spec_fix/foros.BuildRequires | 2 ++ spec_fix/moveit-ros-visualization.BuildRequires | 1 + spec_fix/pkg.remap | 1 + 3 files changed, 4 insertions(+) create mode 100644 spec_fix/foros.BuildRequires diff --git a/spec_fix/foros.BuildRequires b/spec_fix/foros.BuildRequires new file mode 100644 index 0000000..00ea0a7 --- /dev/null +++ b/spec_fix/foros.BuildRequires @@ -0,0 +1,2 @@ +-leveldb ++leveldb-devel diff --git a/spec_fix/moveit-ros-visualization.BuildRequires b/spec_fix/moveit-ros-visualization.BuildRequires index 99020c3..2d1b4e2 100644 --- a/spec_fix/moveit-ros-visualization.BuildRequires +++ b/spec_fix/moveit-ros-visualization.BuildRequires @@ -1 +1,2 @@ -libqt5-opengl +-libqt5-opengl-dev diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 94e9f2e..99f7b02 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -88,3 +88,4 @@ qt5-qmake qt5-qtbase-devel python3-qt5-bindings python3-qt5-devel libdw-dev elfutils-devel clang-tidy clang-tools-extra +libqt5-opengl-dev qt5-qtbase-devel -- Gitee From 08ca9ddfea66e89377aeb39ce4d762362a261380 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sat, 6 May 2023 18:18:24 +0800 Subject: [PATCH 05/13] fix: map range-v3 to range-v3-devel Signed-off-by: will_niutao --- spec_fix/pkg.remap | 1 + 1 file changed, 1 insertion(+) diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 99f7b02..8c9afb0 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -89,3 +89,4 @@ python3-qt5-bindings python3-qt5-devel libdw-dev elfutils-devel clang-tidy clang-tools-extra libqt5-opengl-dev qt5-qtbase-devel +range-v3 range-v3-devel -- Gitee From cac6333e57552e7ebf9abbe5131dbb2b1883d62d Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sat, 6 May 2023 23:21:29 +0800 Subject: [PATCH 06/13] fix: rename libboost-x to boost-x Signed-off-by: will_niutao --- spec_fix/pkg.remap | 8 ++++++++ spec_fix/random-numbers.BuildRequires | 3 +++ spec_fix/random-numbers.Requires | 2 ++ spec_fix/rsl.BuildRequires | 1 + 4 files changed, 14 insertions(+) create mode 100644 spec_fix/random-numbers.BuildRequires create mode 100644 spec_fix/random-numbers.Requires create mode 100644 spec_fix/rsl.BuildRequires diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 8c9afb0..9a9dd64 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -90,3 +90,11 @@ libdw-dev elfutils-devel clang-tidy clang-tools-extra libqt5-opengl-dev qt5-qtbase-devel range-v3 range-v3-devel +libboost-date-time boost-date-time +libboost-random boost-random +libboost-thread boost-thread +libboost-random-dev boost-devel +libboost-thread-dev boost-devel +libboost-filesystem boost-filesystem +libboost-date-time-dev boost-devel +libboost-system-dev boost-devel diff --git a/spec_fix/random-numbers.BuildRequires b/spec_fix/random-numbers.BuildRequires new file mode 100644 index 0000000..6b931ae --- /dev/null +++ b/spec_fix/random-numbers.BuildRequires @@ -0,0 +1,3 @@ +-libboost-date-time-dev +-libboost-random-dev +-libboost-thread-dev diff --git a/spec_fix/random-numbers.Requires b/spec_fix/random-numbers.Requires new file mode 100644 index 0000000..cb15978 --- /dev/null +++ b/spec_fix/random-numbers.Requires @@ -0,0 +1,2 @@ +-libboost-random-dev +-libboost-thread-dev diff --git a/spec_fix/rsl.BuildRequires b/spec_fix/rsl.BuildRequires new file mode 100644 index 0000000..ac3bbb1 --- /dev/null +++ b/spec_fix/rsl.BuildRequires @@ -0,0 +1 @@ ++Catch2-devel -- Gitee From fbcee81bea7eb3e863c01628b2e0f97c33296869 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sun, 7 May 2023 12:02:35 +0800 Subject: [PATCH 07/13] fix: fix RSL compile error Signed-off-by: will_niutao --- package_fix/rsl/rsl-fix-Catch2-error.patch | 21 +++++++++++++++++++++ package_fix/rsl/source.fix | 2 ++ spec_fix/foros-examples.BuildRequires | 1 + spec_fix/no-debuginfo | 1 + spec_fix/pkg.remap | 1 + 5 files changed, 26 insertions(+) create mode 100644 package_fix/rsl/rsl-fix-Catch2-error.patch create mode 100644 package_fix/rsl/source.fix create mode 100644 spec_fix/foros-examples.BuildRequires diff --git a/package_fix/rsl/rsl-fix-Catch2-error.patch b/package_fix/rsl/rsl-fix-Catch2-error.patch new file mode 100644 index 0000000..ddfc38b --- /dev/null +++ b/package_fix/rsl/rsl-fix-Catch2-error.patch @@ -0,0 +1,21 @@ +diff -Naur ros-humble-rsl-0.2.1_org/tests/CMakeLists.txt ros-humble-rsl-0.2.1/tests/CMakeLists.txt +--- ros-humble-rsl-0.2.1_org/tests/CMakeLists.txt 2023-05-07 11:53:18.215360070 +0800 ++++ ros-humble-rsl-0.2.1/tests/CMakeLists.txt 2023-05-07 11:59:24.986324119 +0800 +@@ -1,7 +1,8 @@ +-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +- +-find_package(Catch2 3.2.0 REQUIRED) + find_package(range-v3 REQUIRED) ++find_package(Catch2 3.2.0 REQUIRED) ++if (NOT Catch2_FOUND) ++ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) ++endif() + + add_executable(test-rsl + algorithm.cpp +@@ -19,4 +20,5 @@ + Catch2::Catch2WithMain + range-v3::range-v3 + ) ++include(Catch) + catch_discover_tests(test-rsl) diff --git a/package_fix/rsl/source.fix b/package_fix/rsl/source.fix new file mode 100644 index 0000000..05682c5 --- /dev/null +++ b/package_fix/rsl/source.fix @@ -0,0 +1,2 @@ + +Patch0: rsl-fix-Catch2-error.patch diff --git a/spec_fix/foros-examples.BuildRequires b/spec_fix/foros-examples.BuildRequires new file mode 100644 index 0000000..6090352 --- /dev/null +++ b/spec_fix/foros-examples.BuildRequires @@ -0,0 +1 @@ ++leveldb-devel diff --git a/spec_fix/no-debuginfo b/spec_fix/no-debuginfo index 25af5e5..f3ca9ef 100644 --- a/spec_fix/no-debuginfo +++ b/spec_fix/no-debuginfo @@ -4,3 +4,4 @@ sophus libnabo rviz-visual-testing-framework magic-enum +fluent-rviz diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 9a9dd64..0dd0631 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -98,3 +98,4 @@ libboost-thread-dev boost-devel libboost-filesystem boost-filesystem libboost-date-time-dev boost-devel libboost-system-dev boost-devel +libqhull qhull-devel -- Gitee From 24c904636c3be68678c93f1593e5ccdf464f7e53 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sun, 7 May 2023 15:04:31 +0800 Subject: [PATCH 08/13] feat: rename project octomap to ros-octomap Signed-off-by: will_niutao --- humble/ros-projects.list | 6 +++--- spec_fix/no-debuginfo | 2 ++ spec_fix/octovis.BuildRequires | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/humble/ros-projects.list b/humble/ros-projects.list index a08cc75..67c85c5 100644 --- a/humble/ros-projects.list +++ b/humble/ros-projects.list @@ -185,7 +185,7 @@ dwb-core https://github.com/ros-planning/navigation2/tree/humble developed 1.1.6 dwb-critics https://github.com/ros-planning/navigation2/tree/humble developed 1.1.6-1 dwb-msgs https://github.com/ros-planning/navigation2/tree/humble developed 1.1.6-1 dwb-plugins https://github.com/ros-planning/navigation2/tree/humble developed 1.1.6-1 -dynamic-edt-3d https://github.com/octomap/octomap/tree/devel maintained 1.9.8-1 +dynamic-edt-3d https://github.com/octomap/ros-octomap/tree/devel maintained 1.9.8-1 dynamixel-sdk https://github.com/ROBOTIS-GIT/DynamixelSDK/tree/ros2 maintained 3.7.60-1 dynamixel-sdk-custom-interfaces https://github.com/ROBOTIS-GIT/DynamixelSDK/tree/ros2 maintained 3.7.60-1 dynamixel-sdk-examples https://github.com/ROBOTIS-GIT/DynamixelSDK/tree/ros2 maintained 3.7.60-1 @@ -529,13 +529,13 @@ novatel-gps-msgs https://github.com/swri-robotics/novatel_gps_driver/tree/dashin ntpd-driver https://github.com/vooon/ntpd_driver/tree/ros2 maintained 2.2.0-1 ntrip-client https://github.com/LORD-MicroStrain/ntrip_client/tree/ros2 developed 1.2.0-1 object-recognition-msgs https://github.com/wg-perception/object_recognition_msgs/tree/ros2 maintained 2.0.0-3 -octomap https://github.com/octomap/octomap/tree/devel maintained 1.9.8-1 +octomap https://github.com/octomap/ros-octomap/tree/devel maintained 1.9.8-1 octomap-mapping https://github.com/OctoMap/octomap_mapping/tree/ros2 maintained 2.0.0-3 octomap-msgs https://github.com/octomap/octomap_msgs/tree/ros2 maintained 2.0.0-3 octomap-ros https://github.com/OctoMap/octomap_ros/tree/ros2 maintained 0.4.3-1 octomap-rviz-plugins https://github.com/OctoMap/octomap_rviz_plugins/tree/ros2 maintained 2.0.0-3 octomap-server https://github.com/OctoMap/octomap_mapping/tree/ros2 maintained 2.0.0-3 -octovis https://github.com/octomap/octomap/tree/devel maintained 1.9.8-1 +octovis https://github.com/octomap/ros-octomap/tree/devel maintained 1.9.8-1 ompl https://github.com/ompl/ompl.git developed 1.6.0-1 open3d-conversions https://github.com/ros-perception/perception_open3d/tree/humble developed 0.2.1-1 orocos-kdl-vendor https://github.com/ros2/orocos_kdl_vendor/tree/humble developed 0.2.5-1 diff --git a/spec_fix/no-debuginfo b/spec_fix/no-debuginfo index f3ca9ef..4d6c0e9 100644 --- a/spec_fix/no-debuginfo +++ b/spec_fix/no-debuginfo @@ -5,3 +5,5 @@ libnabo rviz-visual-testing-framework magic-enum fluent-rviz +dataspeed-can-msg-filters +dataspeed-dbw-common diff --git a/spec_fix/octovis.BuildRequires b/spec_fix/octovis.BuildRequires index 99020c3..704ea8c 100644 --- a/spec_fix/octovis.BuildRequires +++ b/spec_fix/octovis.BuildRequires @@ -1 +1 @@ --libqt5-opengl +-libqglviewer-dev-qt5 -- Gitee From e71c57364c9bcbbde6777bcce162db4b676e054d Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sun, 7 May 2023 16:22:53 +0800 Subject: [PATCH 09/13] fix(octovis): fix compile error Signed-off-by: will_niutao --- package_fix/octovis/octovis-fix-qglviewer.patch | 12 ++++++++++++ package_fix/octovis/source.fix | 2 ++ spec_fix/pkg.remap | 1 + 3 files changed, 15 insertions(+) create mode 100644 package_fix/octovis/octovis-fix-qglviewer.patch create mode 100644 package_fix/octovis/source.fix diff --git a/package_fix/octovis/octovis-fix-qglviewer.patch b/package_fix/octovis/octovis-fix-qglviewer.patch new file mode 100644 index 0000000..16f8f22 --- /dev/null +++ b/package_fix/octovis/octovis-fix-qglviewer.patch @@ -0,0 +1,12 @@ +diff -Naur ros-humble-octovis-1.9.8_org/CMakeModules/FindQGLViewer.cmake ros-humble-octovis-1.9.8/CMakeModules/FindQGLViewer.cmake +--- ros-humble-octovis-1.9.8_org/CMakeModules/FindQGLViewer.cmake 2023-05-07 16:18:21.306554894 +0800 ++++ ros-humble-octovis-1.9.8/CMakeModules/FindQGLViewer.cmake 2023-05-07 16:18:51.832585299 +0800 +@@ -83,7 +83,7 @@ + MESSAGE(STATUS "\t generating Makefile using qmake") + EXECUTE_PROCESS( + WORKING_DIRECTORY ${QGLVIEWER_BASE_DIR} +- COMMAND qmake ++ COMMAND qmake-qt5 + OUTPUT_QUIET + ) + ENDIF(QMAKE-QT4) diff --git a/package_fix/octovis/source.fix b/package_fix/octovis/source.fix new file mode 100644 index 0000000..df0cd6d --- /dev/null +++ b/package_fix/octovis/source.fix @@ -0,0 +1,2 @@ + +Patch0: octovis-fix-qglviewer.patch diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 0dd0631..fe51133 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -99,3 +99,4 @@ libboost-filesystem boost-filesystem libboost-date-time-dev boost-devel libboost-system-dev boost-devel libqhull qhull-devel +libfcl-dev fcl-devel -- Gitee From 2d614f17a834a0233aca9de7c85e78a139fa4509 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sun, 7 May 2023 17:27:17 +0800 Subject: [PATCH 10/13] fix: add packge remap Signed-off-by: will_niutao --- spec_fix/no-debuginfo | 1 + spec_fix/octovis.BuildRequires | 1 + spec_fix/octovis.Requires | 1 + spec_fix/pkg.remap | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/spec_fix/no-debuginfo b/spec_fix/no-debuginfo index 4d6c0e9..ccb42ca 100644 --- a/spec_fix/no-debuginfo +++ b/spec_fix/no-debuginfo @@ -7,3 +7,4 @@ magic-enum fluent-rviz dataspeed-can-msg-filters dataspeed-dbw-common +rosbag2-performance-benchmarking diff --git a/spec_fix/octovis.BuildRequires b/spec_fix/octovis.BuildRequires index 704ea8c..2b3f8e7 100644 --- a/spec_fix/octovis.BuildRequires +++ b/spec_fix/octovis.BuildRequires @@ -1 +1,2 @@ -libqglviewer-dev-qt5 ++mesa-libGLU-devel diff --git a/spec_fix/octovis.Requires b/spec_fix/octovis.Requires index 99020c3..c3b48e1 100644 --- a/spec_fix/octovis.Requires +++ b/spec_fix/octovis.Requires @@ -1 +1,2 @@ -libqt5-opengl +-libqglviewer2-qt5 diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index fe51133..0612119 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -100,3 +100,7 @@ libboost-date-time-dev boost-devel libboost-system-dev boost-devel libqhull qhull-devel libfcl-dev fcl-devel +libusb-1.0-dev libusbx-devel +libdbus-dev dbus-devel +libbluetooth-dev bluez-devel +libjsoncpp-dev jsoncpp-devel -- Gitee From f1f0ae76af4c76d7947bb0426764370bb6b1ebef Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sun, 7 May 2023 20:18:04 +0800 Subject: [PATCH 11/13] fix: change package build type to cmake for moveit-core Signed-off-by: will_niutao --- spec_fix/pkg.remap | 1 + spec_fix/spec-type-fix | 1 + 2 files changed, 2 insertions(+) diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 0612119..25ae61b 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -104,3 +104,4 @@ libusb-1.0-dev libusbx-devel libdbus-dev dbus-devel libbluetooth-dev bluez-devel libjsoncpp-dev jsoncpp-devel +python3-pil python3-pillow diff --git a/spec_fix/spec-type-fix b/spec_fix/spec-type-fix index 836368a..ca7b56f 100644 --- a/spec_fix/spec-type-fix +++ b/spec_fix/spec-type-fix @@ -15,3 +15,4 @@ qt-dotgraph cmake qt-gui-cpp cmake rqt-image-view cmake geodesy cmake +moveit-core cmake -- Gitee From 399c70320643ec23b1e1ebda2fb61dc12ea6dcb6 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Sun, 7 May 2023 22:08:58 +0800 Subject: [PATCH 12/13] fix: fix webots-ros2-driver compile error Signed-off-by: will_niutao --- package_fix/webots-ros2-driver/source.fix | 2 ++ .../webots-ros2-driver-fix-pylibs.patch | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 package_fix/webots-ros2-driver/source.fix create mode 100644 package_fix/webots-ros2-driver/webots-ros2-driver-fix-pylibs.patch diff --git a/package_fix/webots-ros2-driver/source.fix b/package_fix/webots-ros2-driver/source.fix new file mode 100644 index 0000000..0711800 --- /dev/null +++ b/package_fix/webots-ros2-driver/source.fix @@ -0,0 +1,2 @@ + +Patch0: webots-ros2-driver-fix-pylibs.patch diff --git a/package_fix/webots-ros2-driver/webots-ros2-driver-fix-pylibs.patch b/package_fix/webots-ros2-driver/webots-ros2-driver-fix-pylibs.patch new file mode 100644 index 0000000..ed1c88e --- /dev/null +++ b/package_fix/webots-ros2-driver/webots-ros2-driver-fix-pylibs.patch @@ -0,0 +1,11 @@ +--- ros-humble-webots-ros2-driver-2023.0.2/CMakeLists.txt_org 2023-05-07 21:48:41.122774606 +0800 ++++ ros-humble-webots-ros2-driver-2023.0.2/CMakeLists.txt 2023-05-07 21:48:49.619782644 +0800 +@@ -37,7 +37,7 @@ + if($ENV{ROS_DISTRO} MATCHES "foxy") + find_package(PythonLibs 3.8 EXACT REQUIRED) + else() +- find_package(PythonLibs 3.10 EXACT REQUIRED) ++ find_package(PythonLibs 3.9 EXACT REQUIRED) + endif() + + add_custom_target(compile-lib-controller ALL -- Gitee From fdf81e3031aac2a61c88c33b1c6b860a93868b05 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Mon, 8 May 2023 20:57:11 +0800 Subject: [PATCH 13/13] fix(pick-ik): fix compile error Signed-off-by: will_niutao --- .../pick-ik/pick-ik-fix-Catch2-error.patch | 20 ++++++++++++++++++ .../pick-ik/pick-ik-fix-compile-error.patch | 21 +++++++++++++++++++ package_fix/pick-ik/source.fix | 3 +++ spec_fix/pick-ik.BuildRequires | 1 + 4 files changed, 45 insertions(+) create mode 100644 package_fix/pick-ik/pick-ik-fix-Catch2-error.patch create mode 100644 package_fix/pick-ik/pick-ik-fix-compile-error.patch create mode 100644 package_fix/pick-ik/source.fix create mode 100644 spec_fix/pick-ik.BuildRequires diff --git a/package_fix/pick-ik/pick-ik-fix-Catch2-error.patch b/package_fix/pick-ik/pick-ik-fix-Catch2-error.patch new file mode 100644 index 0000000..8943e98 --- /dev/null +++ b/package_fix/pick-ik/pick-ik-fix-Catch2-error.patch @@ -0,0 +1,20 @@ +diff -Naur ros-humble-pick-ik-1.0.0_org/tests/CMakeLists.txt ros-humble-pick-ik-1.0.0/tests/CMakeLists.txt +--- ros-humble-pick-ik-1.0.0_org/tests/CMakeLists.txt 2023-05-08 19:56:51.791390734 +0800 ++++ ros-humble-pick-ik-1.0.0/tests/CMakeLists.txt 2023-05-08 20:01:35.391545184 +0800 +@@ -1,7 +1,8 @@ +-list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) +- + find_package(Catch2 3.1.0 REQUIRED) + ++if (NOT Catch2_FOUND) ++ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) ++endif() + add_executable(test-pick_ik + goal_tests.cpp + ik_tests.cpp +@@ -14,4 +15,5 @@ + Catch2::Catch2WithMain + moveit_core::moveit_test_utils + ) ++include(Catch) + catch_discover_tests(test-pick_ik) diff --git a/package_fix/pick-ik/pick-ik-fix-compile-error.patch b/package_fix/pick-ik/pick-ik-fix-compile-error.patch new file mode 100644 index 0000000..0b89437 --- /dev/null +++ b/package_fix/pick-ik/pick-ik-fix-compile-error.patch @@ -0,0 +1,21 @@ +diff -Naur ros-humble-pick-ik-1.0.0_org/src/ik_memetic.cpp ros-humble-pick-ik-1.0.0/src/ik_memetic.cpp +--- ros-humble-pick-ik-1.0.0_org/src/ik_memetic.cpp 2023-05-08 19:56:51.791390734 +0800 ++++ ros-humble-pick-ik-1.0.0/src/ik_memetic.cpp 2023-05-08 20:50:43.986739066 +0800 +@@ -38,7 +38,7 @@ + static_cast(params.population_size - 1)); + } + inverse_gene_size_ = 1.0 / static_cast(initial_guess.size()); +-}; ++} + + bool MemeticIk::checkWipeout() { + // Handle wipeouts if no progress is being made. +diff -Naur ros-humble-pick-ik-1.0.0_org/src/pick_ik_plugin.cpp ros-humble-pick-ik-1.0.0/src/pick_ik_plugin.cpp +--- ros-humble-pick-ik-1.0.0_org/src/pick_ik_plugin.cpp 2023-05-08 19:56:51.791390734 +0800 ++++ ros-humble-pick-ik-1.0.0/src/pick_ik_plugin.cpp 2023-05-08 20:50:37.026637108 +0800 +@@ -364,4 +364,4 @@ + + } // namespace pick_ik + +-PLUGINLIB_EXPORT_CLASS(pick_ik::PickIKPlugin, kinematics::KinematicsBase); ++PLUGINLIB_EXPORT_CLASS(pick_ik::PickIKPlugin, kinematics::KinematicsBase) diff --git a/package_fix/pick-ik/source.fix b/package_fix/pick-ik/source.fix new file mode 100644 index 0000000..955ad75 --- /dev/null +++ b/package_fix/pick-ik/source.fix @@ -0,0 +1,3 @@ + +Patch0: pick-ik-fix-Catch2-error.patch +Patch1: pick-ik-fix-compile-error.patch diff --git a/spec_fix/pick-ik.BuildRequires b/spec_fix/pick-ik.BuildRequires new file mode 100644 index 0000000..ac3bbb1 --- /dev/null +++ b/spec_fix/pick-ik.BuildRequires @@ -0,0 +1 @@ ++Catch2-devel -- Gitee