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 | f95c69529b7ddb7f052b2bfe90b952dd0b11f731 (patch) | |
| tree | a7b441d31801453caa3a0049abdf1abc5821c3b5 /dev-python | |
| parent | Fixing implementation for the non-kerberos case, patch thanks to Volker Lende... (diff) | |
| download | historical-f95c69529b7ddb7f052b2bfe90b952dd0b11f731.tar.gz historical-f95c69529b7ddb7f052b2bfe90b952dd0b11f731.tar.bz2 historical-f95c69529b7ddb7f052b2bfe90b952dd0b11f731.zip | |
Add patch to fix namespace issue in cmake files (bug #348632). Thanks to tarek for the patch.
Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pyside/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-python/pyside/Manifest | 15 | ||||
| -rw-r--r-- | dev-python/pyside/files/pyside-cmake-namespace.patch | 13 | ||||
| -rw-r--r-- | dev-python/pyside/pyside-0.4.2.ebuild | 3 |
4 files changed, 34 insertions, 4 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/Manifest b/dev-python/pyside/Manifest index 3736b10eedad..9307513210ed 100644 --- a/dev-python/pyside/Manifest +++ b/dev-python/pyside/Manifest @@ -1,5 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX pyside-cmake-namespace.patch 598 RMD160 d78f42b4f8a9e7b0804b9daa0212b2d3fbbc905d SHA1 12c030b36f683d14886ac122a14e5bb4949cf699 SHA256 8e56ee57bd064f8533d74f38689e08a0070eaf54f3dfa4866133e7ad76293917 AUX pyside-find-kde-phonon.patch 832 RMD160 3daabd0773e0e82bef823f952e061082048daf4c SHA1 618764612b24e168b78cebdf830c0e337e060bb9 SHA256 6157d26abce5fd43d96a4e399fcf7ea50e7a146b9406e516073fadf57a8805ba DIST pyside-qt4.7+0.4.2.tar.bz2 845917 RMD160 f9c09445ef6001803fdd7c54f2da99cd1c928d73 SHA1 4df28477ae2191768edf90b9d8589b7dd3c17310 SHA256 d5041df8a5a2492f094b1bcc1a5f556a4682a686451f74b8994d12fb948436e9 -EBUILD pyside-0.4.2.ebuild 1192 RMD160 57c2adf1c67e24d11886ad882d7399f758e6f4a6 SHA1 4d542e0807be28793e49c438349f763c0eecf4d9 SHA256 365e99d3361c66e295afc37f18ca4ae8fee6ee76f7a8d71f5ab5dbde494a3570 -MISC ChangeLog 2152 RMD160 51cc9d3e37c7799784340f9c5d5c263658a0a5e2 SHA1 5914518142f61155d00c67fe1423ec31658bd10a SHA256 e2583852dacb06bc078379a418c184c0e79cb31564c9e024863265ce5950d890 +EBUILD pyside-0.4.2.ebuild 1240 RMD160 0ff8a3fc4efedbdea00ab746f46fb0a2a84fc0af SHA1 920f5fc7cad65f69d16b967ce8f3f3bd4cdd7c0b SHA256 fc31057fe91270309fc74c780d3c1402707cf075a7417ddeccba71f28f650639 +MISC ChangeLog 2358 RMD160 0282a81edb50ed4062aebe0626eb865ff5881aef SHA1 1f4f91dc7cd7fd064b088a7172c3a8382eba1391 SHA256 f9845b9703db48b6e69b63d2df58a1c6da0a9c74dab2c1ffb276c28298656679 MISC metadata.xml 299 RMD160 2817d6e5370fefb9f2696eb770c9ff49399d6744 SHA1 f7badb6c31b2bf048766ad33bfda5b957fb32c2f SHA256 3c3fbe2f47e5a8e7ff708d354dd82f18b10e8dfd84dfa1673a8f95dd4a07eac2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAk0TjyoACgkQ+CZEqwt+F6btQQCfb5Ceq59Dpk+jUTRxCpx7fr+b +USMAn0FqZth+xd1Bkx4+coOQRqY9VS2f +=U5Zb +-----END PGP SIGNATURE----- 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() { |