| 1 |
commit: 6865d1f84a82750b90c88b9578fe077380037f8b |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 7 18:09:10 2017 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 7 18:09:10 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=6865d1f8 |
| 7 |
|
| 8 |
dev-python/pyside: handle QtMultimediaWidgets module |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-python/pyside/metadata.xml | 2 +- |
| 13 |
dev-python/pyside/pyside-9999.ebuild | 7 ++++--- |
| 14 |
2 files changed, 5 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml |
| 17 |
index 6dff63cb..a4b07195 100644 |
| 18 |
--- a/dev-python/pyside/metadata.xml |
| 19 |
+++ b/dev-python/pyside/metadata.xml |
| 20 |
@@ -11,7 +11,7 @@ |
| 21 |
<flag name="designer">Build QtDesigner and QtUiTools modules</flag> |
| 22 |
<flag name="gui">Build QtGui module</flag> |
| 23 |
<flag name="help">Build QtHelp module</flag> |
| 24 |
- <flag name="multimedia">Build QtMultimedia module</flag> |
| 25 |
+ <flag name="multimedia">Build QtMultimedia and QtMultimediaWidgets modules</flag> |
| 26 |
<flag name="network">Build QtNetwork module</flag> |
| 27 |
<flag name="opengl">Build QtOpenGL module</flag> |
| 28 |
<flag name="printsupport">Build QtPrintSupport module</flag> |
| 29 |
|
| 30 |
diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild |
| 31 |
index e928ede9..add5ade8 100644 |
| 32 |
--- a/dev-python/pyside/pyside-9999.ebuild |
| 33 |
+++ b/dev-python/pyside/pyside-9999.ebuild |
| 34 |
@@ -50,7 +50,7 @@ REQUIRED_USE=" |
| 35 |
# find_package(Qt5 ${QT_PV} REQUIRED COMPONENTS Core) |
| 36 |
QT_PV="5.6*:5" |
| 37 |
|
| 38 |
-RDEPEND=" |
| 39 |
+DEPEND=" |
| 40 |
${PYTHON_DEPS} |
| 41 |
>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}] |
| 42 |
=dev-qt/qtcore-${QT_PV} |
| 43 |
@@ -79,7 +79,7 @@ RDEPEND=" |
| 44 |
testlib? ( =dev-qt/qttest-${QT_PV} ) |
| 45 |
widgets? ( =dev-qt/qtwidgets-${QT_PV} ) |
| 46 |
" |
| 47 |
-DEPEND="${RDEPEND}" |
| 48 |
+RDEPEND="${DEPEND}" |
| 49 |
|
| 50 |
src_prepare() { |
| 51 |
#FIXME: Remove the following "sed" patch after this upstream issue is closed: |
| 52 |
@@ -102,7 +102,7 @@ src_configure() { |
| 53 |
# For each line of the form "CHECK_PACKAGE_FOUND(${PACKAGE_NAME} opt)" in |
| 54 |
# PySide2/CMakeLists.txt defining an optional dependency, an option of the |
| 55 |
# form "-DCMAKE_DISABLE_FIND_PACKAGE_${PACKAGE_NAME}=$(usex !${USE_FLAG})" |
| 56 |
- # is passed to "cmake" here conditionally disabling this dependency. |
| 57 |
+ # is passed to cmake here conditionally disabling this dependency. |
| 58 |
local mycmakeargs=( |
| 59 |
-DBUILD_TESTS=$(usex test) |
| 60 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent) |
| 61 |
@@ -111,6 +111,7 @@ src_configure() { |
| 62 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer) |
| 63 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help) |
| 64 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia) |
| 65 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia) |
| 66 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network) |
| 67 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5OpenGL=$(usex !opengl) |
| 68 |
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !declarative) |
Archives