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

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

[Alexis Ballier]

commit:     e040dedf487492de6191b77c0e664cae7f0889d2
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 12:07:06 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 12:07:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e040dedf

dev-ros/qt_gui_cpp: fix libdir patch

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/qt_gui_cpp/files/libdir.patch | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/dev-ros/qt_gui_cpp/files/libdir.patch b/dev-ros/qt_gui_cpp/files/libdir.patch
index 8c22eed2385..b2656183de9 100644
--- a/dev-ros/qt_gui_cpp/files/libdir.patch
+++ b/dev-ros/qt_gui_cpp/files/libdir.patch
@@ -1,15 +1,13 @@
-Index: qt_gui_core-0.2.26/qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
+Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
 ===================================================================
---- qt_gui_core-0.2.26.orig/qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
-+++ qt_gui_core-0.2.26/qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
-@@ -29,8 +29,8 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
+--- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt
++++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
+@@ -29,7 +29,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
  # maintain context for different named target
  set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS})
  set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 -set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/lib)
--set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/lib\\")
 +set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
-+set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -Wl,-rpath,\\"${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\\")
+ set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
  
  find_package(python_qt_binding REQUIRED)
- include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake)

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

[Alexis Ballier]

commit:     21e668bf18d42511df10864cc0b0a3e06ff1511d
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 09:15:02 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 09:16:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e668bf

dev-ros/qt_gui_cpp: fix rpaths patch

Closes: https://bugs.gentoo.org/748699
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/qt_gui_cpp/files/rpaths.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-ros/qt_gui_cpp/files/rpaths.patch b/dev-ros/qt_gui_cpp/files/rpaths.patch
index 7f95b9e938a..313e3edcb72 100644
--- a/dev-ros/qt_gui_cpp/files/rpaths.patch
+++ b/dev-ros/qt_gui_cpp/files/rpaths.patch
@@ -2,12 +2,14 @@ Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
 ===================================================================
 --- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt
 +++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt
-@@ -29,7 +29,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
+@@ -29,8 +29,8 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES
  # maintain context for different named target
  set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS})
  set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
 -set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+-set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
 +set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS})
- set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
++set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER} -L${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
  
  find_package(python_qt_binding REQUIRED)
+ include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake)