summaryrefslogtreecommitdiff
path: root/dev-ros/qt_gui_cpp
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-ros/qt_gui_cpp
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-ros/qt_gui_cpp')
-rw-r--r--dev-ros/qt_gui_cpp/Manifest6
-rw-r--r--dev-ros/qt_gui_cpp/files/libdir.patch12
-rw-r--r--dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild (renamed from dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.11.ebuild)2
3 files changed, 9 insertions, 11 deletions
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
index 49de18ceb811..c9871715b844 100644
--- a/dev-ros/qt_gui_cpp/Manifest
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -1,5 +1,5 @@
-AUX libdir.patch 1151 BLAKE2B f78ed19cff2df00514da0e60b6cfbda581443a0b7b1515a7c40d1a9518391611de3c5ff9eed6091ac2dbbdff168aba14239ac21754657541aa5b6e053e19aa7d SHA512 a6393e452f9a2a2517d35e2edb069f94acc8461dfda631c3183099a9b8bf6aa79bd5747ef1e1275637ad3fbbca67bab0aa9bcb21dce1f3eb67ed2600ceffe657
-DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
-EBUILD qt_gui_cpp-0.3.11.ebuild 745 BLAKE2B b4c55f12bd7cb313436c2267d56d2e9af5ea75d4542053309708a47b4beb0e904f3caac9dfe5a79fcecd5fb990ce73d44405c1277b54789ab44afca1fe3e884c SHA512 7bf57c06abef1e07e5fa74fa5a98f3b8a45da55d5b2c689635d2493433d0d0d8c55b77ba66616c460031443f076113dd5f8809adf9b526719ea4874237ae0006
+AUX libdir.patch 864 BLAKE2B c104517d108824d13455565cecbeac0886c60cc042bcab4ffd9961be7096117342157a0da0bb4912e18179bca5c40d8391be8d162ac9f07a7b4a5c8a3d65f4c5 SHA512 16960a3224f982cf3b55904d5c5370a715aed2a7dfd6f98ecc21af1f70fd527e84b1ee10f127e45251a149abb165aed06e595c73f7deda88f84548fb4c7cb717
+DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
+EBUILD qt_gui_cpp-0.3.16.ebuild 742 BLAKE2B 1fa243ce03487123a5a13af0887b7431da00461c8f658760c2844b646b2c841d9da83d5ffdcc33ae30c62cfebf2084a65d8a8aba69b746ae8adad94bd8b807d7 SHA512 f48f4e4038f50bcc0e3c5786808898fd228b6ff13624c11d49b465434290faf71cc16c431e65de4e5cec65da5b604efb7dd01ff445c79975bb0f3cce10993e9a
EBUILD qt_gui_cpp-9999.ebuild 745 BLAKE2B 2f7e609d3f4336951307b9ba559969a437bf68f44a4695d333791fb9ccc7057a23c85048060812b232bc9c20ffd1a0c3c96bd341c53fb0bbda12230815c6be1d SHA512 776fa23e75d92cbf557fbcee6742f0fd18dbac87af5aa3640aded8e5775c59eac1294c22403bbf86a8ada2c205ca629e88f627ac82bffcd2f01c3e19f2c87060
MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_cpp/files/libdir.patch b/dev-ros/qt_gui_cpp/files/libdir.patch
index 8c22eed2385c..b2656183de95 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)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.11.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild
index a52422eff7b2..359593ee4556 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.11.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5