* [gentoo-commits] repo/gentoo:master commit in: dev-ros/qt_gui_cpp/files/, dev-ros/qt_gui_cpp/
@ 2015-09-23 10:12 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2015-09-23 10:12 UTC (permalink / raw
To: gentoo-commits
commit: eb8c87cd0e31ac7b1472e39da8b264c7dc6c9d1b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 10:03:26 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 10:12:07 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8c87cd
dev-ros/qt_gui_cpp: Initial import. Ebuild by me.
Package-Manager: portage-2.2.21
dev-ros/qt_gui_cpp/Manifest | 1 +
dev-ros/qt_gui_cpp/files/libdir.patch | 15 ++++++++++++++
dev-ros/qt_gui_cpp/metadata.xml | 5 +++++
dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild | 32 +++++++++++++++++++++++++++++
dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild | 32 +++++++++++++++++++++++++++++
5 files changed, 85 insertions(+)
diff --git a/dev-ros/qt_gui_cpp/Manifest b/dev-ros/qt_gui_cpp/Manifest
new file mode 100644
index 0000000..85ca418
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/Manifest
@@ -0,0 +1 @@
+DIST qt_gui_core-0.2.29.tar.gz 85881 SHA256 7c51b4fd7e795e37e3f8a4b691a5e520466105fdddbc85e194c10c608fe7448c SHA512 958526a3bd76070e121d75a82c589894aef980870091cb853802fcb60328b54cbc95ee0c9eececa18e24608808cca2c722c5699b662c2a578f150995171d71db WHIRLPOOL f83328ce59fd9cd8db5a066f1a2a93bde54b28268891b18cf73b31d5584b0dc7f932350a39e729c97be3bc3b6780422dd2538321f29b0acd13d06387e0054975
diff --git a/dev-ros/qt_gui_cpp/files/libdir.patch b/dev-ros/qt_gui_cpp/files/libdir.patch
new file mode 100644
index 0000000..8c22eed
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/files/libdir.patch
@@ -0,0 +1,15 @@
+Index: qt_gui_core-0.2.26/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
+ # 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}\\")
+
+ find_package(python_qt_binding REQUIRED)
+ include(${python_qt_binding_EXTRAS_DIR}/sip_helper.cmake)
diff --git a/dev-ros/qt_gui_cpp/metadata.xml b/dev-ros/qt_gui_cpp/metadata.xml
new file mode 100644
index 0000000..c42ea5b
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild
new file mode 100644
index 0000000..1e35552
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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:4
+ >=dev-ros/pluginlib-1.9.23
+ >=dev-ros/qt_gui-0.2.18[${PYTHON_USEDEP}]
+ dev-libs/tinyxml
+ dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+PATCHES=(
+ "${FILESDIR}/libdir.patch"
+)
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
new file mode 100644
index 0000000..1e35552
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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:4
+ >=dev-ros/pluginlib-1.9.23
+ >=dev-ros/qt_gui-0.2.18[${PYTHON_USEDEP}]
+ dev-libs/tinyxml
+ dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+PATCHES=(
+ "${FILESDIR}/libdir.patch"
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/qt_gui_cpp/files/, dev-ros/qt_gui_cpp/
@ 2020-07-15 16:57 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2020-07-15 16:57 UTC (permalink / raw
To: gentoo-commits
commit: e83f50f8373ac8559d86c1cae3c011105ef21c60
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 15 16:55:03 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Jul 15 16:57:13 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83f50f8
dev-ros/qt_gui_cpp: upstream sip patch
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-ros/qt_gui_cpp/files/sip.patch | 25 +++++++++++++++++++++++++
dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild | 1 +
2 files changed, 26 insertions(+)
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 00000000000..8157a9bc68d
--- /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 <johannes@intermodalics.eu>
+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.4.1.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.1.ebuild
index a4e1317260c..722ac827000 100644
--- 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
@@ -30,4 +30,5 @@ DEPEND="${RDEPEND}
"
PATCHES=(
"${FILESDIR}/libdir.patch"
+ "${FILESDIR}/sip.patch"
)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ros/qt_gui_cpp/files/, dev-ros/qt_gui_cpp/
@ 2020-10-13 11:24 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2020-10-13 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 3efdb8ce7f118d456cd864fb40aa43794f8deb76
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 11:17:26 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 11:24:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3efdb8ce
dev-ros/qt_gui_cpp: fix rpath leak
Closes: https://bugs.gentoo.org/741050
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 | 13 +++++++++++++
dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild | 1 +
dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild | 1 +
3 files changed, 15 insertions(+)
diff --git a/dev-ros/qt_gui_cpp/files/rpaths.patch b/dev-ros/qt_gui_cpp/files/rpaths.patch
new file mode 100644
index 00000000000..7f95b9e938a
--- /dev/null
+++ b/dev-ros/qt_gui_cpp/files/rpaths.patch
@@ -0,0 +1,13 @@
+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
+ # 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_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS})
+ set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER})
+
+ find_package(python_qt_binding REQUIRED)
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
index 1f52f6afc83..dac9e5563d6 100644
--- 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
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
"${FILESDIR}/libdir.patch"
+ "${FILESDIR}/rpaths.patch"
)
# FIXME: fails to build with ninja
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 1f52f6afc83..dac9e5563d6 100644
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
"
PATCHES=(
"${FILESDIR}/libdir.patch"
+ "${FILESDIR}/rpaths.patch"
)
# FIXME: fails to build with ninja
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-13 11:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-13 11:24 [gentoo-commits] repo/gentoo:master commit in: dev-ros/qt_gui_cpp/files/, dev-ros/qt_gui_cpp/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2020-07-15 16:57 Alexis Ballier
2015-09-23 10:12 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox