[gentoo-commits] repo/gentoo:master commit in: dev-ros/hector_geotiff/, dev-ros/hector_geotiff/files/

[Alexis Ballier]

commit:     e8504e012a850c282f3a901f42ca0a85d4b3ae4b
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 28 15:21:28 2018 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 15:21:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8504e01

dev-ros/hector_geotiff: port to qt5

Closes: https://bugs.gentoo.org/644564
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-ros/hector_geotiff/files/qt5.patch             | 91 ++++++++++++++++++++++
 ...-9999.ebuild => hector_geotiff-0.3.5-r2.ebuild} |  9 ++-
 dev-ros/hector_geotiff/hector_geotiff-9999.ebuild  |  9 ++-
 3 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/dev-ros/hector_geotiff/files/qt5.patch b/dev-ros/hector_geotiff/files/qt5.patch
new file mode 100644
index 00000000000..07b44ef23a1
--- /dev/null
+++ b/dev-ros/hector_geotiff/files/qt5.patch
@@ -0,0 +1,91 @@
+Index: hector_geotiff/CMakeLists.txt
+===================================================================
+--- hector_geotiff.orig/CMakeLists.txt
++++ hector_geotiff/CMakeLists.txt
+@@ -9,7 +9,7 @@ find_package(catkin REQUIRED COMPONENTS
+ ## System dependencies are found with CMake's conventions
+ # find_package(Boost REQUIRED COMPONENTS system)
+ 
+-find_package(Qt4 4.6 COMPONENTS QtCore QtGui REQUIRED)
++find_package(Qt5 5.7 COMPONENTS Core Gui Widgets REQUIRED)
+ 
+ # Find Eigen3 (from http://wiki.ros.org/jade/Migration)
+ find_package(Eigen3)
+@@ -24,8 +24,7 @@ else()
+   set(EIGEN3_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+ endif()
+ 
+-include(${QT_USE_FILE})
+-
++add_compile_options(-fPIC)
+ 
+ ## Uncomment this if the package has a setup.py. This macro ensures
+ ## modules and global scripts declared therein get installed
+@@ -82,10 +81,14 @@ include_directories(include include/hect
+ include_directories(
+   ${catkin_INCLUDE_DIRS}
+   ${EIGEN3_INCLUDE_DIRS}
++  ${Qt5Core_INCLUDE_DIRS}
++  ${Qt5Widgets_INCLUDE_DIRS}
++  ${Qt5Gui_INCLUDE_DIRS}
+ )
+ 
+ add_library(geotiff_writer src/geotiff_writer/geotiff_writer.cpp)
+-target_link_libraries(geotiff_writer ${catkin_LIBRARIES} ${QT_LIBRARIES})
++target_link_libraries(geotiff_writer ${catkin_LIBRARIES} ${Qt5Core_LIBRARIES}
++	${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES})
+ add_dependencies(geotiff_writer ${catkin_EXPORTED_TARGETS})
+ 
+ add_executable(geotiff_saver src/geotiff_saver.cpp)
+Index: hector_geotiff/include/hector_geotiff/geotiff_writer.h
+===================================================================
+--- hector_geotiff.orig/include/hector_geotiff/geotiff_writer.h
++++ hector_geotiff/include/hector_geotiff/geotiff_writer.h
+@@ -37,7 +37,7 @@
+ #include <nav_msgs/MapMetaData.h>
+ 
+ #include <QtGui/QImage>
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QFont>
+ #include <QtGui/QPen>
+ 
+Index: hector_geotiff/src/geotiff_node.cpp
+===================================================================
+--- hector_geotiff.orig/src/geotiff_node.cpp
++++ hector_geotiff/src/geotiff_node.cpp
+@@ -40,7 +40,7 @@
+ 
+ #include <Eigen/Geometry>
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ 
+ #include <hector_map_tools/HectorMapTools.h>
+ 
+Index: hector_geotiff/src/geotiff_saver.cpp
+===================================================================
+--- hector_geotiff.orig/src/geotiff_saver.cpp
++++ hector_geotiff/src/geotiff_saver.cpp
+@@ -34,7 +34,7 @@
+ 
+ #include <Eigen/Geometry>
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ 
+ #include <hector_map_tools/HectorMapTools.h>
+ 
+Index: hector_geotiff/src/geotiff_writer/geotiff_writer.cpp
+===================================================================
+--- hector_geotiff.orig/src/geotiff_writer/geotiff_writer.cpp
++++ hector_geotiff/src/geotiff_writer/geotiff_writer.cpp
+@@ -31,7 +31,7 @@
+ 
+ #include <QtGui/QPainter>
+ #include <QtGui/QImageWriter>
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtCore/QFile>
+ //#include <QtCore/QDateTime>
+ #include <QtCore/QTime>

diff --git a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild
similarity index 83%
copy from dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
copy to dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild
index 44e33566e42..1bc71fd4e8b 100644
--- a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
+++ b/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,9 +22,12 @@ RDEPEND="
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:3"
+
+PATCHES=( "${FILESDIR}/qt5.patch" )

diff --git a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild b/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
index 44e33566e42..1bc71fd4e8b 100644
--- a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
+++ b/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,9 +22,12 @@ RDEPEND="
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:3"
+
+PATCHES=( "${FILESDIR}/qt5.patch" )