sablink/sablink-distro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[dev-python/PyQt4] add QGraphicsLinearLayout patch

Browse Source
This commit is contained in:
Fabio Erculiani
2009-06-25 15:25:02 +02:00
parent 24f9739ef1
commit 706cafc0cb
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-python/PyQt4/Manifest
+2 -1
View File
@@ -1,9 +1,10 @@
AUX PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch 1004 RMD160 5fa5609d31b53978846999be8045c75b940c3dd1 SHA1 a7122535d44bd8a81984870e98322b14521d2ced SHA256 db539a666d834756013fc48012914dd181116df7f5d1d21485ff947e20441eed
AUX PyQt4-4.4_compile.patch 883 RMD160 016122f1e9cbf8c74da760fd094e280fd5ec0257 SHA1 b745edae97d52882b44a53461b98c96e11dbee20 SHA256 dc95ae5b5f7d07431d563c2035d68c6097b8f20dbb2285d2762066938c69e830
AUX PyQt4-4.5-python2.5-support.patch 1849 RMD160 192e5cc4085132c02393ee8e896891dde9cb3f28 SHA1 8bf9284e6e1929c3b968874cb9610b53700d8caf SHA256 10faf28d625a2308aa18b5aa0f476037712dd551dd764fddbf87443421fa4da1
AUX PyQt4-4.5-qgraphicslinearlayout-fix.patch 566 RMD160 544fce32ffebad0562b845bff2446e7e9c1a2b09 SHA1 cf9ed08659261c2ea8f15286b2dd5e700c5c5eb6 SHA256 9e0fd1ef7f7b5529085842f61c62c820e376fabc6236170aafe82c5f589c1763
AUX configure.py.patch 1727 RMD160 31802058d0b0488264cdbcfeebd7ce9aff250957 SHA1 df4fee27f1486422b25d0072cfc388b207814c8f SHA256 06ee44a9fe43615b6bfada4aa7294303c016fd7c378ddf537823e33546306926
AUX fix_license_check.patch 643 RMD160 f8934e527bb8bf4f9edf98e068c07fc7b3380d97 SHA1 41fa9b3962add04c8196695c9d9b82b69d7d3ea8 SHA256 117025432a5db37375554577c66edbe7a6fdef6e120fb865b2f4304961dc2c42
DIST PyQt-x11-gpl-4.5.tar.gz 6941757 RMD160 bf90e4597faa4f117fc217620a706efbf28065b1 SHA1 0c66f55d93c6fbb0c6fe5ae31be57037c1a829e0 SHA256 10ee02736b2020dbf4f23cd782e902ac4e9ded160f18eaa4db99fa9254f17110
EBUILD PyQt4-4.5-r1.ebuild 3170 RMD160 bdcf1a5945b006f6269cd21f8e8d431bda27cf47 SHA1 45d6b26f7c77d34d518be1c3e2f5ea641c10c9df SHA256 303186e395a73127fcfe66e1cb038a2a23f8604766bb8155b215309ba8eb783e
EBUILD PyQt4-4.5-r2.ebuild 3119 RMD160 9f4368e68f3957c01e6272a827ed589231ea1af7 SHA1 53c7d0b9963fed168ff6a2e890a260ed0203676a SHA256 a6c1e29922e8afd7918e192ce05a09bf6e9cc3a2b03c9d3b24b7a9ce368559a3
MISC ChangeLog 8732 RMD160 c7e54d2765665ae3074cc85d93f5c2895e83939a SHA1 e3c792057c87f036de03f44f6c4c52b26ffef74d SHA256 925c72b4990035572641390c572cbcb80917fed8574d8afebb7b471ad2116081
MISC metadata.xml 859 RMD160 3da7dcc5dc212af8ed4f98e73c561f2365081c98 SHA1 f607feed53689fa15b62d474d6763bc674fbcb2a SHA256 00475be82d27e0e1dab95eafcea3751ae70ee39b53a268063772d76752556d8b
dev-python/PyQt4/PyQt4-4.5-r1.ebuild → dev-python/PyQt4/PyQt4-4.5-r2.ebuild
+6 -6
View File
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.ebuild,v 1.1 2009/06/09 18:53:57 hwoarang Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.ebuild,v 1.2 2009/06/16 15:15:35 hwoarang Exp $
EAPI="2"
@@ -16,24 +16,23 @@ SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz
SLOT="0"
LICENSE="|| ( GPL-2 GPL-3 )"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="X assistant +dbus debug doc examples kde opengl phonon +qt3support sql svg webkit xmlpatterns"
IUSE="X assistant +dbus debug doc examples kde opengl phonon sql svg webkit xmlpatterns"
DEPEND=">=dev-python/sip-4.8
>=x11-libs/qt-core-${QTVER}:4[qt3support?]
>=x11-libs/qt-core-${QTVER}:4
>=x11-libs/qt-script-${QTVER}:4
>=x11-libs/qt-test-${QTVER}:4
X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?,qt3support?] )
X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?] )
assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 )
dbus? (
>=dev-python/dbus-python-0.80
>=x11-libs/qt-dbus-${QTVER}:4
)
opengl? ( >=x11-libs/qt-opengl-${QTVER}:4[qt3support?] )
opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 )
phonon? (
!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
kde? ( media-sound/phonon )
)
qt3support? ( >=x11-libs/qt-qt3support-${QTVER}:4 )
sql? ( >=x11-libs/qt-sql-${QTVER}:4 )
svg? ( >=x11-libs/qt-svg-${QTVER}:4 )
webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 )
@@ -46,6 +45,7 @@ PATCHES=(
"${FILESDIR}/configure.py.patch"
"${FILESDIR}/fix_license_check.patch"
"${FILESDIR}/${P}-python2.5-support.patch"
"${FILESDIR}/${P}-qgraphicslinearlayout-fix.patch"
)
pyqt4_use_enable() {
dev-python/PyQt4/files/PyQt4-4.5-qgraphicslinearlayout-fix.patch
+12
View File
@@ -0,0 +1,12 @@
diff -Nurp PyQt-x11-gpl-4.5.orig/sip/QtGui/qgraphicslinearlayout.sip PyQt-x11-gpl-4.5/sip/QtGui/qgraphicslinearlayout.sip
--- PyQt-x11-gpl-4.5.orig/sip/QtGui/qgraphicslinearlayout.sip 2009-06-05 10:50:38.000000000 +0200
+++ PyQt-x11-gpl-4.5/sip/QtGui/qgraphicslinearlayout.sip 2009-06-25 15:22:56.297020424 +0200
@@ -74,7 +74,7 @@ public:
{
PyObject *itmo = sipGetPyObject(itm, sipType_QGraphicsLayoutItem);
- if (itmo)
+ if (itmo && ! itm->ParentItem())
sipTransferBack(itmo);
}
%End