From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-ros/qt_gui_cpp/Manifest | 9 ++++--- dev-ros/qt_gui_cpp/files/sip.patch | 25 +++++++++++++++++++ dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild | 34 -------------------------- dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild | 37 +++++++++++++++++++++++++++++ dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild | 36 ++++++++++++++++++++++++++++ dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild | 14 ++++++----- 6 files changed, 112 insertions(+), 43 deletions(-) create mode 100644 dev-ros/qt_gui_cpp/files/sip.patch delete mode 100644 dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild create mode 100644 dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild create mode 100644 dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild (limited to 'dev-ros/qt_gui_cpp') diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest index c9871715b844..06bd956ecd99 100644 --- a/dev-ros/qt_gui_cpp/Manifest +++ b/dev-ros/qt_gui_cpp/Manifest @@ -1,5 +1,8 @@ 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 +AUX sip.patch 703 BLAKE2B 8ab944d7ebad99070a8f3b9f3f327e5c763a48fe34303771655e498e112d05ae6855a81438e14ead305b6f8818abc996a2d52f1ad24433cfe21cc9f6cec8fd75 SHA512 045f3801407dc59ae50593e6d481afe2ed45abc86845a515d8ade4543710ccc0fa39f6564ea3ad150a06a0d0076647839a15c783da063179c6dc9072e07e2f99 +DIST qt_gui_core-0.4.1.tar.gz 96850 BLAKE2B a8a4325d5462a0788a69661adb20b3bf1bc9e391344ced31468bf9ddbe7114a13a2ecd3dda580986bd0af98c837641bda3e3d6cd3c5d9fa3352c37817ace2ed4 SHA512 0c46f86f88a818107049d08db6682a320f47b1b4983c586e4c944a387c070c7e017fca2f4be9d251f8a907f15be439998b2d559bea51ffc724fa4afc5e75f67c +DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421 +EBUILD qt_gui_cpp-0.4.1.ebuild 797 BLAKE2B c0e7aa99b7438690b5f1d52891705362a10daf64673a44f48fc5bc184125dd65c9fb194acc9bd85013070d80514899f05b17e2693fde7f8c0d62f39f8907752b SHA512 6f6d444d0fa41294a7fb5956deac1f2242be17c197d40f169cf17bdbd6b0902d4dfd49d56ced102e468357a5201752fd445427a69f779a9b857031988f06d877 +EBUILD qt_gui_cpp-0.4.2.ebuild 772 BLAKE2B 5af95a34039ac353072b20e9b5f7b655a4287113fa88fdb6ce8bb9fe50b6ba4e1e98333ca5ef09c9c4f8acc6896df4ac9df98577526af7e5fe834ff8c18ab58b SHA512 57a1de4d91e349cca601b2b1b88de828ecbfd66475521d124acbf02f2246cca66b15940a84b0e9a28014c732ad0e253d45e919c1a61a85306abcddcd3fd4dc60 +EBUILD qt_gui_cpp-9999.ebuild 772 BLAKE2B 5af95a34039ac353072b20e9b5f7b655a4287113fa88fdb6ce8bb9fe50b6ba4e1e98333ca5ef09c9c4f8acc6896df4ac9df98577526af7e5fe834ff8c18ab58b SHA512 57a1de4d91e349cca601b2b1b88de828ecbfd66475521d124acbf02f2246cca66b15940a84b0e9a28014c732ad0e253d45e919c1a61a85306abcddcd3fd4dc60 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810 diff --git a/dev-ros/qt_gui_cpp/files/sip.patch b/dev-ros/qt_gui_cpp/files/sip.patch new file mode 100644 index 000000000000..8157a9bc68d7 --- /dev/null +++ b/dev-ros/qt_gui_cpp/files/sip.patch @@ -0,0 +1,25 @@ +From 5ecb3a219146816916c4a94e32664850548a2085 Mon Sep 17 00:00:00 2001 +From: Johannes Meyer +Date: Tue, 7 Jul 2020 01:20:51 +0200 +Subject: [PATCH] qt_gui_cpp_sip: declare private assignment operator for SIP + (#226) + +--- + qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip b/qt_gui_cpp/src/qt_gui_cpp_sip/plugin_context.sip +index 286d52e6..1d37a37d 100644 +--- a/src/qt_gui_cpp_sip/plugin_context.sip ++++ b/src/qt_gui_cpp_sip/plugin_context.sip +@@ -25,6 +25,10 @@ public: + + void reloadPlugin(); + ++private: ++ ++ PluginContext& operator=(const PluginContext&); ++ + }; + + }; diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild deleted file mode 100644 index 359593ee4556..000000000000 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.3.16.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core" -KEYWORDS="~amd64" -PYTHON_COMPAT=( python2_7 ) -ROS_SUBDIR=${PN} - -inherit ros-catkin - -DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtwidgets:5 - >=dev-ros/pluginlib-1.9.23 - dev-libs/tinyxml2:= - >=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}] - dev-libs/tinyxml - >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}] - dev-libs/boost:= - dev-libs/console_bridge:= -" -DEPEND="${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}/libdir.patch" -) diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild new file mode 100644 index 000000000000..c4d73b4fc0d7 --- /dev/null +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core" +KEYWORDS="~amd64" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + >=dev-ros/pluginlib-1.9.23 + dev-libs/tinyxml2:= + >=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}] + dev-libs/tinyxml + >=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}] + dev-libs/boost:= + dev-libs/console_bridge:= +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}/libdir.patch" + "${FILESDIR}/sip.patch" +) + +# FIXME: fails to build with ninja +CMAKE_MAKEFILE_GENERATOR=emake diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild new file mode 100644 index 000000000000..1f52f6afc836 --- /dev/null +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core" +KEYWORDS="~amd64" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + >=dev-ros/pluginlib-1.9.23 + dev-libs/tinyxml2:= + >=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}] + dev-libs/tinyxml + >=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}] + dev-libs/boost:= + dev-libs/console_bridge:= +" +DEPEND="${RDEPEND} + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}/libdir.patch" +) + +# FIXME: fails to build with ninja +CMAKE_MAKEFILE_GENERATOR=emake diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild index 0216c3788c0b..1f52f6afc836 100644 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild @@ -1,16 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core" KEYWORDS="~amd64" -PYTHON_COMPAT=( python2_7 ) ROS_SUBDIR=${PN} inherit ros-catkin -DESCRIPTION="Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available" +DESCRIPTION="C++-bindings for qt_gui and creates bindings for every generator available" LICENSE="BSD" SLOT="0" IUSE="" @@ -20,9 +19,9 @@ RDEPEND=" dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 dev-libs/tinyxml2:= - >=dev-ros/qt_gui-0.3.0[${PYTHON_USEDEP}] + >=dev-ros/qt_gui-0.3.0[${PYTHON_SINGLE_USEDEP}] dev-libs/tinyxml - >=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}] + >=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}] dev-libs/boost:= dev-libs/console_bridge:= " @@ -32,3 +31,6 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/libdir.patch" ) + +# FIXME: fails to build with ninja +CMAKE_MAKEFILE_GENERATOR=emake -- cgit v1.2.3