Update to version 2.0.0-6

4 files changed, 67 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 669f7c09a8bc..ca5f74c5fa24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Dec 19 18:45:15 UTC 2017
+# Thu Dec 21 22:29:48 UTC 2017
 pkgbase = ros-ardent-rviz-common
 	pkgdesc = ROS - Common rviz API, used by rviz plugins and applications.
 	pkgver = 2.0.0
@@ -10,23 +10,27 @@ pkgbase = ros-ardent-rviz-common
 	makedepends = cmake
 	makedepends = ros-build-tools
 	makedepends = ros-ardent-ament-cmake
-	makedepends = ros-ardent-rviz-assimp-vendor
+	depends = ros-ardent-tinyxml-vendor
 	depends = ros-ardent-std-msgs
-	depends = ros-ardent-resource-retriever
 	depends = ros-ardent-pluginlib
+	depends = ros-ardent-rviz-yaml-cpp-vendor
 	depends = ros-ardent-rviz-rendering
-	depends = ros-ardent-tf2
-	depends = ros-ardent-tf2-ros
-	depends = ros-ardent-rclcpp
 	depends = ros-ardent-sensor-msgs
-	depends = ros-ardent-tinyxml-vendor
+	depends = ros-ardent-rclcpp
+	depends = ros-ardent-tf2-geometry-msgs
+	depends = ros-ardent-tf2-ros
 	depends = ros-ardent-urdf
-	depends = ros-ardent-rviz-yaml-cpp-vendor
+	depends = ros-ardent-rviz-assimp-vendor
+	depends = ros-ardent-resource-retriever
+	depends = ros-ardent-tf2
 	depends = ros-ardent-geometry-msgs
-	depends = ros-ardent-tf2-geometry-msgs
 	depends = qt5-base
 	source = ros-ardent-rviz-common-2.0.0-5.tar.gz::https://github.com/ros2-gbp/rviz-release/archive/release/ardent/rviz_common/2.0.0-5.tar.gz
+	source = break_fix.patch
+	source = compiler_flag_fix.patch
 	sha256sums = 0cd5a7dc61ee7f8a70e685d657de969222f015c21454260ba14211f79cd2adb4
+	sha256sums = b963257bc10323d4ae3a7ec21ea16e6b710c9bcb9b9fce86676ee90f4e5fee15
+	sha256sums = 0ae7d1d356613cbb691c3cb71b65506e63837d81da88551bcef3bc26a92e40f5
 
 pkgname = ros-ardent-rviz-common
 
diff --git a/PKGBUILD b/PKGBUILD
index eb942ea8fb79..b1cc79df5616 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,24 +10,24 @@ arch=('any')
 pkgrel=6
 license=('BSD')
 
-ros_makedepends=(ros-ardent-ament-cmake
-  ros-ardent-rviz-assimp-vendor)
+ros_makedepends=(ros-ardent-ament-cmake)
 makedepends=('cmake' 'ros-build-tools'
   ${ros_makedepends[@]})
 
-ros_depends=(ros-ardent-std-msgs
-  ros-ardent-resource-retriever
+ros_depends=(ros-ardent-tinyxml-vendor
+  ros-ardent-std-msgs
   ros-ardent-pluginlib
+  ros-ardent-rviz-yaml-cpp-vendor
   ros-ardent-rviz-rendering
-  ros-ardent-tf2
-  ros-ardent-tf2-ros
-  ros-ardent-rclcpp
   ros-ardent-sensor-msgs
-  ros-ardent-tinyxml-vendor
+  ros-ardent-rclcpp
+  ros-ardent-tf2-geometry-msgs
+  ros-ardent-tf2-ros
   ros-ardent-urdf
-  ros-ardent-rviz-yaml-cpp-vendor
-  ros-ardent-geometry-msgs
-  ros-ardent-tf2-geometry-msgs)
+  ros-ardent-rviz-assimp-vendor
+  ros-ardent-resource-retriever
+  ros-ardent-tf2
+  ros-ardent-geometry-msgs)
 depends=(${ros_depends[@]}
   qt5-base)
 
@@ -39,8 +39,14 @@ depends=(${ros_depends[@]}
 
 # Tarball version (faster download)
 _dir="rviz-release-release-ardent-rviz_common-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/rviz-release/archive/release/ardent/rviz_common/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('0cd5a7dc61ee7f8a70e685d657de969222f015c21454260ba14211f79cd2adb4')
+source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros2-gbp/rviz-release/archive/release/ardent/rviz_common/${pkgver}-${_pkgver_patch}.tar.gz" "break_fix.patch" "compiler_flag_fix.patch")
+sha256sums=('0cd5a7dc61ee7f8a70e685d657de969222f015c21454260ba14211f79cd2adb4' "b963257bc10323d4ae3a7ec21ea16e6b710c9bcb9b9fce86676ee90f4e5fee15" "0ae7d1d356613cbb691c3cb71b65506e63837d81da88551bcef3bc26a92e40f5")
+
+prepare() {
+  cd "${srcdir}"
+  patch -Np1 -i "break_fix.patch"
+  patch -Np1 -i "compiler_flag_fix.patch"
+}
 
 build() {
   # Use ROS environment variables
@@ -54,17 +60,14 @@ build() {
   # Fix Python2/Python3 conflicts
   /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 "${srcdir}/${_dir}"
 
+  export PYTHONPATH=/opt/ros/ardent/lib/python3.6/site-packages
+  export AMENT_PREFIX_PATH=/opt/ros/ardent
+
   # Build project
   cmake "${srcdir}/${_dir}" \
         -DCMAKE_BUILD_TYPE=Release \
-        -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-        -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python3.5m \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.5m.so \
-        -DPYTHON_BASENAME=.cpython-35m \
-        -DSETUPTOOLS_DEB_LAYOUT=OFF \
-        -DCATKIN_ENABLE_TESTING=OFF
+        -DBUILD_TESTING=Off \
+        -DCMAKE_INSTALL_PREFIX=/opt/ros/ardent
   make
 }
 
diff --git a/break_fix.patch b/break_fix.patch
new file mode 100644
index 000000000000..c9e7c139ac3f
--- /dev/null
+++ b/break_fix.patch
@@ -0,0 +1,11 @@
+diff -ura orig/rviz-release-release-ardent-rviz_common-2.0.0-5/src/rviz_common/config.cpp patched/rviz-release-release-ardent-rviz_common-2.0.0-5/src/rviz_common/config.cpp
+--- orig/rviz-release-release-ardent-rviz_common-2.0.0-5/src/rviz_common/config.cpp	2017-12-09 10:13:11.000000000 +0100
++++ patched/rviz-release-release-ardent-rviz_common-2.0.0-5/src/rviz_common/config.cpp	2017-12-21 22:58:35.831305759 +0100
+@@ -143,6 +143,7 @@
+         for (int i = 0; i < num_children; i++) {
+           listAppendNew().copy(source.listChildAt(i));
+         }
++        break;
+       }
+     case Value:
+       setValue(source.getValue());
diff --git a/compiler_flag_fix.patch b/compiler_flag_fix.patch
new file mode 100644
index 000000000000..a5ecf218cbf4
--- /dev/null
+++ b/compiler_flag_fix.patch
@@ -0,0 +1,19 @@
+Only in patched: build
+diff -ura orig/rviz-release-release-ardent-rviz_common-2.0.0-5/CMakeLists.txt patched/rviz-release-release-ardent-rviz_common-2.0.0-5/CMakeLists.txt
+--- orig/rviz-release-release-ardent-rviz_common-2.0.0-5/CMakeLists.txt	2017-12-09 10:13:11.000000000 +0100
++++ patched/rviz-release-release-ardent-rviz_common-2.0.0-5/CMakeLists.txt	2017-12-21 22:55:41.276995739 +0100
+@@ -17,13 +17,13 @@
+ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-  add_compile_options(-Wall -Wextra -Wpedantic -Werror)
+   # TODO(wjwwood): try to remove this -- currently needed to pass on CI
+   include(CheckCXXCompilerFlag)
+   check_cxx_compiler_flag(-Wno-gnu-zero-variadic-macro-arguments HAS_W_FLAG)
+   if(HAS_W_FLAG)
+     add_compile_options(-Wno-gnu-zero-variadic-macro-arguments)
+   endif()
++  add_compile_options(-Wall -Wextra -Wpedantic -Werror)
+ endif()
+ 
+ find_package(ament_cmake REQUIRED)