Fix pkgbuild (sync w/ galactic, drop some cherry-picks)

5 files changed, 60 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebde8b9e08b0..aaeca140e74f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = ros2-git
 	pkgdesc = A set of software libraries and tools for building robot applications (Rolling Distro)
-	pkgver = r224.3d98527
-	pkgrel = 2
+	pkgver = r230.4a36f31
+	pkgrel = 1
 	url = https://docs.ros.org/en/rolling/
 	install = ros2-git.install
 	arch = any
 	license = Apache
 	depends = ros2-arch-deps
+	depends = ros2-pyqt5-sip-compat
+	depends = assimp
 	depends = gmock
 	depends = sip4
-	depends = foonathan_memory
 	source = ros2::git+https://github.com/ros2/ros2#branch=master
-	source = mimick_vendor.patch
-	source = yaml_cpp_vendor.patch
-	sha256sums = SKIP
-	sha256sums = SKIP
+	source = rviz_assimp_vendor.patch
 	sha256sums = SKIP
+	sha256sums = 1c097a78a023956fcf877e53ca35e2949a7956045deaf5f7b049a2b237fb391c
 
 pkgname = ros2-git
diff --git a/PKGBUILD b/PKGBUILD
index f8f1f6269ed0..39332e9440be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,38 @@
 # Maintainer: Mohammad Mostafa Farzan <m2_farzan@yahoo.com>
+# Contributor: mjbogusz <mjbogusz+github@gmail.com>
+# Contributor: yuanyuyuan <az6980522@gmail.com>
+# Contributor: Rémy B. (github.com/KirrimK)
+# Contributor: Renato Caldas (github.com/rmsc)
 # Acknowledgment: This work is hugely based on `ros2-arch-deps` AUR
 # package, maintained by T. Borgert.
 
 pkgname=ros2-git
-pkgver=r224.3d98527
-pkgrel=2
+pkgver=r230.4a36f31
+pkgrel=1
 pkgdesc="A set of software libraries and tools for building robot applications (Rolling Distro)"
 url="https://docs.ros.org/en/rolling/"
 arch=('any')
 license=('Apache')
-depends=('ros2-arch-deps'
-         'gmock'
-         'sip4'
-         # AUR
-         'foonathan_memory'
-         )
-source=("ros2::git+https://github.com/ros2/ros2#branch=master"
-        "mimick_vendor.patch"
-        "yaml_cpp_vendor.patch")
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP')
-
+depends=(
+    'ros2-arch-deps'
+    'ros2-pyqt5-sip-compat'
+    'assimp'
+    'gmock'
+    'sip4'
+)
+source=(
+    "ros2::git+https://github.com/ros2/ros2#branch=master"
+    "rviz_assimp_vendor.patch"
+)
+sha256sums=(
+    'SKIP'
+    "1c097a78a023956fcf877e53ca35e2949a7956045deaf5f7b049a2b237fb391c"
+)
 install=ros2-git.install
 
 pkgver() {
-  cd $srcdir/ros2
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd $srcdir/ros2
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
@@ -38,31 +44,31 @@ prepare() {
         exit 1
     fi
 
-    # Create required symlinks (see https://wiki.archlinux.org/index.php/ROS)
-    sudo mkdir -p /usr/share/sip
-    sudo ln -sf /usr/lib/python3.9/site-packages/PyQt5 /usr/share/sip/.
-    sudo ln -sf /usr/lib/python3.9/site-packages/PyQt5/bindings/* /usr/share/sip/PyQt5/.
-
     # Clone the repos
-    rm -rf $srcdir/ros2/src
     mkdir -p $srcdir/ros2/src
     vcs import $srcdir/ros2/src < $srcdir/ros2/ros2.repos
 
     # Fix some issues in the code (TODO: Gradually move to upstream)
-    ## mimick_vendor:
-    patch --forward $srcdir/ros2/src/ros2/mimick_vendor/CMakeLists.txt mimick_vendor.patch
-    ## yaml_cpp_vendor:
-    patch --forward $srcdir/ros2/src/ros2/yaml_cpp_vendor/CMakeLists.txt yaml_cpp_vendor.patch
-    ## ros1_bridge
-    git -C $srcdir/ros2/src/ros2/ros1_bridge revert 81b7610568286ec7b390c64cf6207b362d0a6550 --no-edit
-    ## cyclonedds
-    git -C $srcdir/ros2/src/eclipse-cyclonedds/cyclonedds cherry-pick bdf270a588aae77d0f1a0f0070b53ad1388da61c
-    ## rcl_logging
-    git -C $srcdir/ros2/src/ros2/rcl_logging cherry-pick 77b5b2a6c948a6db1986501edc83f12ceadedba3
+    ## rviz_assimp_vendor
+    git -C $srcdir/ros2/src/ros2/rviz checkout .
+    git -C $srcdir/ros2/src/ros2/rviz apply $srcdir/rviz_assimp_vendor.patch
 }
 
 build() {
-    colcon build --merge-install
+    # Disable parallel build if RAM is low
+    if [[ $(free | grep -Po "Mem:\s+\K\d+") < 16000000 ]]; then
+        printf "\nRAM is smaller than 16 GB. Parallel build will be disabled for stability.\n\n"
+        export COLCON_EXTRA_ARGS="${COLCON_EXTRA_ARGS} --executor sequential"
+    fi
+
+    ## For people with the old version of makepkg.conf
+    unset CPPFLAGS
+    ## For people with the new version of makepkg.conf
+    CFLAGS=$(sed "s/-Wp,-D_FORTIFY_SOURCE=2\s//g" <(echo $CFLAGS))
+    CXXFLAGS=$(sed "s/-Wp,-D_FORTIFY_SOURCE=2\s//g" <(echo $CXXFLAGS))
+
+    # Build
+    colcon build --merge-install ${COLCON_EXTRA_ARGS}
 }
 
 package() {
diff --git a/mimick_vendor.patch b/mimick_vendor.patch
deleted file mode 100644
index d86f3c8d48b5..000000000000
--- a/mimick_vendor.patch
+++ /dev/null
@@ -1,3 +0,0 @@
-10a11,12
->   list(APPEND cmake_configure_args -DCMAKE_C_FLAGS="-O2")
->   list(APPEND cmake_configure_args -DCMAKE_CXX_FLAGS="-O2")
diff --git a/rviz_assimp_vendor.patch b/rviz_assimp_vendor.patch
new file mode 100644
index 000000000000..120499c4f2a1
--- /dev/null
+++ b/rviz_assimp_vendor.patch
@@ -0,0 +1,14 @@
+Credit: https://github.com/ros2/ros2/issues/1222#issuecomment-994207211
+diff --git a/rviz_assimp_vendor/rviz_assimp_vendor-extras.cmake.in b/rviz_assimp_vendor/rviz_assimp_vendor-extras.cmake.in
+index 8e41fe66..929f659c 100644
+--- a/rviz_assimp_vendor/rviz_assimp_vendor-extras.cmake.in
++++ b/rviz_assimp_vendor/rviz_assimp_vendor-extras.cmake.in
+@@ -25,7 +25,7 @@ foreach(library IN LISTS ASSIMP_LIBRARIES)
+   if(IS_ABSOLUTE "${library}")
+     list(APPEND rviz_assimp_vendor_LIBRARIES "${library}")
+   else()
+-    find_library(library_abs ${library} PATHS "${ASSIMP_LIBRARY_DIRS}" NO_DEFAULT_PATH)
++    find_library(library_abs assimp)
+     list(APPEND rviz_assimp_vendor_LIBRARIES "${library_abs}")
+   endif()
+ endforeach()
diff --git a/yaml_cpp_vendor.patch b/yaml_cpp_vendor.patch
deleted file mode 100644
index 64be3f331768..000000000000
--- a/yaml_cpp_vendor.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-18,19c18,19
-<     list(APPEND YAML_C_FLAGS "-w")
-<     list(APPEND YAML_CXX_FLAGS "-std=c++14 -w")
----
->     set(YAML_C_FLAGS "${YAML_C_FLAGS} -w")
->     set(YAML_CXX_FLAGS "${YAML_CXX_FLAGS} -std=c++14 -w")