diff options
| author |   Dominik Kapusta <ayoy@gentoo.org> | 2010-12-23 18:04:18 +0000 |
|---|---|---|
| committer | Dominik Kapusta <ayoy@gentoo.org> | 2010-12-23 18:04:18 +0000 |
| commit | 72a98eac7a69b9eea83b8db63eb09498443d3db0 (patch) | |
| tree | 20ce4c670faafdd04f82fda066910403a4831c84 /dev-python/pyside | |
| parent | Fixing implementation for the non-kerberos case, patch thanks to Volker Lende... (diff) | |
| download | gentoo-2-72a98eac7a69b9eea83b8db63eb09498443d3db0.tar.gz gentoo-2-72a98eac7a69b9eea83b8db63eb09498443d3db0.tar.bz2 gentoo-2-72a98eac7a69b9eea83b8db63eb09498443d3db0.zip | |
Add patch to fix namespace issue in cmake files (bug #348632). Thanks to tarek for the patch.
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/pyside')
| -rw-r--r-- | dev-python/pyside/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/pyside/files/pyside-cmake-namespace.patch | 13 | ||||
| -rw-r--r-- | dev-python/pyside/pyside-0.4.2.ebuild | 3 |
3 files changed, 21 insertions, 2 deletions
diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog index 9c4846d42092..20c0f0cd0210 100644 --- a/dev-python/pyside/ChangeLog +++ b/dev-python/pyside/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/pyside # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.12 2010/11/25 01:20:31 chiiph Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.13 2010/12/23 18:04:18 ayoy Exp $ + + 23 Dec 2010; Dominik Kapusta <ayoy@gentoo.org> pyside-0.4.2.ebuild, + +files/pyside-cmake-namespace.patch: + Add patch to fix namespace issue in cmake files (bug #348632). Thanks to + tarek for the patch. *pyside-0.4.2 (25 Nov 2010) diff --git a/dev-python/pyside/files/pyside-cmake-namespace.patch b/dev-python/pyside/files/pyside-cmake-namespace.patch new file mode 100644 index 000000000000..92f6de0a43a8 --- /dev/null +++ b/dev-python/pyside/files/pyside-cmake-namespace.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake +index 639a0ab..1686df8 100644 +--- a/cmake/Macros/PySideModules.cmake ++++ b/cmake/Macros/PySideModules.cmake +@@ -58,7 +58,7 @@ macro(check_qt_class module class global_sources) + endif () + string(TOLOWER ${class} _class) + string(TOUPPER ${module} _module) +- if (${namespace}) ++ if (_namespace) + set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_namespace}_${_class}_wrapper.cpp) + else () + set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_class}_wrapper.cpp) diff --git a/dev-python/pyside/pyside-0.4.2.ebuild b/dev-python/pyside/pyside-0.4.2.ebuild index ee62564eda7e..c78d1ae68eec 100644 --- a/dev-python/pyside/pyside-0.4.2.ebuild +++ b/dev-python/pyside/pyside-0.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.4.2.ebuild,v 1.1 2010/11/25 01:20:31 chiiph Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.4.2.ebuild,v 1.2 2010/12/23 18:04:18 ayoy Exp $ EAPI="2" @@ -41,6 +41,7 @@ S="${WORKDIR}/${MY_P}" src_prepare() { epatch "${FILESDIR}/${PN}-find-kde-phonon.patch" + epatch "${FILESDIR}/${PN}-cmake-namespace.patch" } src_install() { |