From f70879f30f0affe60c8a42bdbb6e3c9fa97605da Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sat, 17 Jul 2010 20:36:49 +0000 Subject: [PATCH] Add patch for sip 4.10.3. Thanks everyone on bug #328135. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- kde-base/pykde4/ChangeLog | 6 +++++- kde-base/pykde4/Manifest | 5 +++-- .../pykde4/files/pykde4-4.4.92-build-fix-sip.patch | 12 ++++++++++++ kde-base/pykde4/pykde4-4.4.5.ebuild | 5 ++++- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog index 86ddcc5cbb04..3710bf8d4eec 100644 --- a/kde-base/pykde4/ChangeLog +++ b/kde-base/pykde4/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/pykde4 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.78 2010/07/16 11:22:56 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.79 2010/07/17 20:36:49 scarabeus Exp $ + + 17 Jul 2010; Tomáš Chvátal pykde4-4.4.5.ebuild, + +files/pykde4-4.4.92-build-fix-sip.patch: + Add patch for sip 4.10.3. Thanks everyone on bug #328135. 16 Jul 2010; Tomáš Chvátal pykde4-4.4.4.ebuild, pykde4-4.4.5.ebuild: diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest index fcca8ed29942..547b09c8f1d0 100644 --- a/kde-base/pykde4/Manifest +++ b/kde-base/pykde4/Manifest @@ -1,11 +1,12 @@ AUX pykde4-4.3.4-typedefs.sip.patch 8212 RMD160 19788bb5089963ae703b1391e28c649bbc9fea6a SHA1 6d9a569df288d63f1c957e25db562cbe86f2afea SHA256 9b3eafc7e6954c0be578d979713de9874f448b73f3ff51e60568469902ad398d AUX pykde4-4.3.5-fix-pykdeuic4.patch 524 RMD160 e0dad917bcdbc1e4cc52a353c3d6f45c7d712904 SHA1 266460bb633e0756591291fabe61a6c618165cb6 SHA256 a1542fd30d4b5ceba422a3b7b7ae560090590ab1f1ead78c1c272a1d48d6ce38 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2 +AUX pykde4-4.4.92-build-fix-sip.patch 557 RMD160 d9d1c299f6acbc97c75ff8ddc23bd13d1ff0bce6 SHA1 6cb4154b980320fcff792434b8abf7b9fce1ce68 SHA256 0b2fd1753e7fe41698a8c1c0568c4cd52fd14ddc6c010f91f6052fe89044cf6e DIST kdebindings-4.3.5.tar.bz2 4881006 RMD160 96fd389226116717f1ab28e71c788a99a1a15981 SHA1 0273013e4b74a7b1bc4cfc8375c80b5c19cf33e6 SHA256 7ff4a3e95dde89b59bb9fc13cd32feca7bad7b096703c7710bcd82fc326c53be DIST kdebindings-4.4.4.tar.bz2 5091453 RMD160 38725fb1fec359e2b3e3acf23baf07e6d615dfdf SHA1 db5afa2a70558e34838a0f9296f008035e03f064 SHA256 bcfd514e8e4a88f1a36750b8b5fc3cbc52497f5ea22f811ff718301d7687c5f2 DIST kdebindings-4.4.5.tar.bz2 5092007 RMD160 057cafc1922a5ab3999e6dcc532d656dd4cf446c SHA1 2f041c5b050da879e8f5d09f668b56881f9f1bb2 SHA256 c443b59fc4b5fd480bc112c409ac2378147853a59292a8a8404c2243379a1451 EBUILD pykde4-4.3.5-r1.ebuild 2161 RMD160 718b11377d93f7f2a7cfe667ff15a976810d5662 SHA1 7590e2692f569124fd7ab8ca80fef029694bf0e1 SHA256 4f1f20ca0c704d83b574f692f9180855a578aba0c8c36f149729733a1a00a835 EBUILD pykde4-4.4.4.ebuild 1997 RMD160 e0ff8007382566efb77b05c5ca5aed882152dabd SHA1 97624595c0097b0c9729847eba4be2cf6a249e09 SHA256 0fbeedbc0823ad86526e728ef1b0de3745d38887f5ee362ea10ba2da7595d938 -EBUILD pykde4-4.4.5.ebuild 1999 RMD160 d27beb75f5d25fc7d680053444ed4d3d4476ff39 SHA1 a11cf96768b3e2c8ca2854e99c94c7fab1563c6f SHA256 33712ffe3e32f36107a8c72c19b103bfe4d393bf5c31ff6e30213c89bf128d11 -MISC ChangeLog 10106 RMD160 861b463fda0250681ab472eef8bf37eca1ecaff8 SHA1 0a8e6960e80b3be6f619753fbb9491cc88072e71 SHA256 ed1b74cbad5f508fac7f843ce28bd97b4362577df7082d6603e28fa02de03888 +EBUILD pykde4-4.4.5.ebuild 2073 RMD160 5c016ea535ed960df259959e9445c9d6fcabd568 SHA1 766e226a746c6bec5c32c9d9c973a1e9a2cdc739 SHA256 9c52fa256bad3d8236e3d59ef5e4fd9c84bbdad381f234c361e9837db66455a4 +MISC ChangeLog 10287 RMD160 b9ead129e3ce4e9634d048934a890bea1634a481 SHA1 a1585941201e85e6d3ad9c5cd598baf767e74181 SHA256 6895f2be09fe12201162ddf337198ce8bfb6932cf95683016da0c4f0efd06293 MISC metadata.xml 329 RMD160 6424cd6e9a3dffa1ef07462160d03733beff3e02 SHA1 3a06ca30f6526a47772713084e9e36ca8a83e41b SHA256 e449422e44fd1a613b5810fe876de7fbdd4ff9ad97b40057af758061bb2607f8 diff --git a/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch b/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch new file mode 100644 index 000000000000..570eb15fc905 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.4.92-build-fix-sip.patch @@ -0,0 +1,12 @@ +diff -ur pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip +--- pykde4-4.4.92.orig/python/pykde4/sip/akonadi/addressattribute.sip 2010-05-27 19:21:46.000000000 +0200 ++++ pykde4-4.4.92/python/pykde4/sip/akonadi/addressattribute.sip 2010-07-15 06:36:27.000000000 +0200 +@@ -19,7 +19,7 @@ + + namespace Akonadi + { +-class AddressAttribute : Akonadi::Attribute ++class AddressAttribute : Akonadi::Attribute /NoDefaultCtors/ + { + %TypeHeaderCode + #include diff --git a/kde-base/pykde4/pykde4-4.4.5.ebuild b/kde-base/pykde4/pykde4-4.4.5.ebuild index cb0e6f7797c0..164dd2a9fda5 100644 --- a/kde-base/pykde4/pykde4-4.4.5.ebuild +++ b/kde-base/pykde4/pykde4-4.4.5.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/kde-base/pykde4/pykde4-4.4.5.ebuild,v 1.2 2010/07/16 11:22:56 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.4.5.ebuild,v 1.3 2010/07/17 20:36:49 scarabeus Exp $ EAPI="3" @@ -38,6 +38,9 @@ src_prepare() { || die "Failed to disable examples" fi + # See bug 328135 + epatch "${FILESDIR}"/${PN}-4.4.92-build-fix-sip.patch + # See bug 322351 use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch" } -- 2.26.2