From 5c008475b1734f83d47a1428118f35fdbb0f2419 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Fri, 5 May 2023 09:15:18 +0800 Subject: [PATCH 1/4] fix: add python3-rosdistro 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 bce6d9a..4de3add 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -82,3 +82,4 @@ nlohmann-json-dev nlohmann-json-devel clang-format clang python3-catkin-pkg-modules python3-catkin_pkg libopencv-imgproc-dev opencv +python3-rosdistro-modules python3-rosdistro -- Gitee From 4a412cbb640030f1bd5205ba4e8004dc22c488be Mon Sep 17 00:00:00 2001 From: will_niutao Date: Fri, 5 May 2023 09:33:13 +0800 Subject: [PATCH 2/4] ci: update the description of sig ymal Signed-off-by: will_niutao --- create-ros-yaml-for-gitee.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/create-ros-yaml-for-gitee.sh b/create-ros-yaml-for-gitee.sh index 86f2334..a6cc85a 100755 --- a/create-ros-yaml-for-gitee.sh +++ b/create-ros-yaml-for-gitee.sh @@ -30,12 +30,12 @@ main() mkdir -p $class echo "name: $project" >${ROS_SIG_BASE}/$class/$project.yaml - echo "description:" >>${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 " $i : $summary" >>${ROS_SIG_BASE}/$class/$project.yaml + echo " `echo $i | awk -F".spec" '{print $1}'`: $summary" >>${ROS_SIG_BASE}/$class/$project.yaml done echo "upstream: ${SRC_TAR_BASE_URL}" >>${ROS_SIG_BASE}/$class/$project.yaml echo "branches:" >>${ROS_SIG_BASE}/$class/$project.yaml -- Gitee From 8a40266f1e8d267175df2a5b2aa6e639dff58c57 Mon Sep 17 00:00:00 2001 From: will_niutao Date: Fri, 5 May 2023 15:55:57 +0800 Subject: [PATCH 3/4] fix(qt-gui-cpp): fix compile error Signed-off-by: will_niutao --- spec_fix/pkg.remap | 2 ++ spec_fix/qt-gui-cpp.BuildRequires | 1 + spec_fix/qt-gui-cpp.Requires | 1 + 3 files changed, 4 insertions(+) create mode 100644 spec_fix/qt-gui-cpp.BuildRequires create mode 100644 spec_fix/qt-gui-cpp.Requires diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index 4de3add..fa78b60 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -83,3 +83,5 @@ clang-format clang python3-catkin-pkg-modules python3-catkin_pkg libopencv-imgproc-dev opencv python3-rosdistro-modules python3-rosdistro +qt5-qmake qt5-qtbase-devel +python3-qt5-bindings python3-qt5-devel diff --git a/spec_fix/qt-gui-cpp.BuildRequires b/spec_fix/qt-gui-cpp.BuildRequires new file mode 100644 index 0000000..4763c44 --- /dev/null +++ b/spec_fix/qt-gui-cpp.BuildRequires @@ -0,0 +1 @@ ++libXext-devel diff --git a/spec_fix/qt-gui-cpp.Requires b/spec_fix/qt-gui-cpp.Requires new file mode 100644 index 0000000..b575c89 --- /dev/null +++ b/spec_fix/qt-gui-cpp.Requires @@ -0,0 +1 @@ ++libXext -- Gitee From bde7e46b0abfe942a7d3f2018be3d465ecb122bd Mon Sep 17 00:00:00 2001 From: will_niutao Date: Fri, 5 May 2023 22:24:01 +0800 Subject: [PATCH 4/4] fix: map sqlite3 to sqlite Signed-off-by: will_niutao --- spec_fix/pkg.remap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec_fix/pkg.remap b/spec_fix/pkg.remap index fa78b60..d59f2f3 100644 --- a/spec_fix/pkg.remap +++ b/spec_fix/pkg.remap @@ -40,6 +40,7 @@ tbb tbb-devel zbar zbar-devel zlib zlib-devel libsqlite3-dev sqlite-devel +sqlite3 sqlite google-mock gmock-devel benchmark google-benchmark-devel libcunit-dev CUnit-devel @@ -85,3 +86,4 @@ libopencv-imgproc-dev opencv python3-rosdistro-modules python3-rosdistro qt5-qmake qt5-qtbase-devel python3-qt5-bindings python3-qt5-devel +libdw-dev elfutils-devel -- Gitee