From 6c7fb60930c508c61086890e80aa19c04fb8e6c1 Mon Sep 17 00:00:00 2001
From: Wolfgang Merkt <w.merkt@gmail.com>
Date: Sun, 15 Mar 2020 23:29:15 +0000
Subject: [PATCH 1/2] [octovis] Update dependencies to Qt5 Recently,
 OCTOVIS_QT5 was set to ON by default. This requires updated package
 dependencies to work on the buildfarm.

---
 octovis/package.xml | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/octovis/package.xml b/octovis/package.xml
index f8e9c72b..863432b6 100644
--- a/octovis/package.xml
+++ b/octovis/package.xml
@@ -20,12 +20,25 @@
   </export>
       
   <build_depend>octomap</build_depend>
-  <build_depend>libqglviewer-qt4-dev</build_depend>
+
+  <!-- Qt5 -->
+  <build_depend>libqt5-core</build_depend>
+  <build_depend>libqt5-opengl-dev</build_depend>
+
+  <!-- Qt4 -->
+  <!-- <build_depend>libqglviewer-qt4-dev</build_depend>
   <build_depend>libqt4-dev</build_depend>
-  <build_depend>libqt4-opengl-dev</build_depend>
+  <build_depend>libqt4-opengl-dev</build_depend> -->
 
   <exec_depend>octomap</exec_depend>
-  <exec_depend>libqglviewer-qt4</exec_depend>
+
+  <!-- Qt5 -->
+  <exec_depend>libqt5-core</exec_depend>
+  <exec_depend>libqt5-opengl</exec_depend>
+  <exec_depend>libqt5-gui</exec_depend>
+
+  <!-- Qt4 -->
+  <!-- <exec_depend>libqglviewer-qt4</exec_depend>
   <exec_depend>libqtgui4</exec_depend>
-  <exec_depend>libqt4-opengl</exec_depend>
+  <exec_depend>libqt4-opengl</exec_depend> -->
 </package>

From 959f2355c80b3ae93719f3d3de04bb1cc662d83a Mon Sep 17 00:00:00 2001
From: Wolfgang Merkt <w.merkt@gmail.com>
Date: Fri, 20 Mar 2020 15:36:58 +0000
Subject: [PATCH 2/2] [octovis] Update required dependencies for Qt5 New keys
 introduced upstream in https://github.com/ros/rosdistro/pull/24097

---
 octovis/package.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/octovis/package.xml b/octovis/package.xml
index 863432b6..c870b169 100644
--- a/octovis/package.xml
+++ b/octovis/package.xml
@@ -22,6 +22,7 @@
   <build_depend>octomap</build_depend>
 
   <!-- Qt5 -->
+  <build_depend>libqglviewer-dev-qt5</build_depend>
   <build_depend>libqt5-core</build_depend>
   <build_depend>libqt5-opengl-dev</build_depend>
 
@@ -33,9 +34,10 @@
   <exec_depend>octomap</exec_depend>
 
   <!-- Qt5 -->
+  <exec_depend>libqglviewer2-qt5</exec_depend>
   <exec_depend>libqt5-core</exec_depend>
-  <exec_depend>libqt5-opengl</exec_depend>
   <exec_depend>libqt5-gui</exec_depend>
+  <exec_depend>libqt5-opengl</exec_depend>
 
   <!-- Qt4 -->
   <!-- <exec_depend>libqglviewer-qt4</exec_depend>