Added upstream build fix for newer gcc/kde versions (bug 353751)

Package-Manager: portage-2.1.9.37/cvs/Linux x86_64

4 files changed, 38 insertions, 18 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 75a47112370c..32981e84e91d 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.174 2011/02/02 22:11:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.175 2011/02/07 21:33:56 dilfridge Exp $
+
+  07 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  digikam-1.8.0.ebuild, +files/digikam-1.8.0-gcc46.patch:
+  Added upstream build fix for newer gcc/kde versions (bug 353751)
 
   02 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -digikam-1.2.0-r3.ebuild, -digikam-1.7.0.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 13354362c20a..ce982defb491 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -7,28 +7,29 @@ AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d6d2a0e74
 AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
 AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8
 AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
+AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbba SHA1 e3682e8af28233609c12817ec13a120c95a169be SHA256 088709ad10f71266957d237fabba9ee6f1de0f43ba2c5f63badbeb974d140241
 AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.2.0-r4.ebuild 3214 RMD160 a9c5d489d0a461d5e60939dc586137af4199e1c1 SHA1 439586e88f4164feb51a0724d9bcd3286bcbd363 SHA256 ebc5f8f36e91d66b3d5300cee9fcf9073725cd4580991f986e9de2a5f82c5827
-EBUILD digikam-1.8.0.ebuild 3233 RMD160 c49460e169ca6a4ca4e0bc2d7cc375d9bf230d64 SHA1 5a7e9101f55305e9d75ed9555c2a428b2c75bdc2 SHA256 318ccfbca4b7648cd3d135e5d52d24f67920847026a90b095e7ff05763573e39
-MISC ChangeLog 29113 RMD160 4ca4efe0a5bde363b24031a2d2ec17f67c9c31d6 SHA1 40ab5cfad6906334609fdb772b68bd2404a601e0 SHA256 2536fabb1c96172d748dd3206f1db100bef0827f944a10c7810bfb44a15c2fa0
+EBUILD digikam-1.8.0.ebuild 3241 RMD160 884617a745ab70366568128d44a74bfccf76436b SHA1 6ad923d14b28d9ea51aa18ef221d772b767987b1 SHA256 6788a41385e706e6ebd7848646bca30487c484a7d9d8f3db5c0e26db679bcfe4
+MISC ChangeLog 29296 RMD160 bc16d1cd3469354a87fd16f1d8ff5d443bbdee45 SHA1 8c96aaff7626ad62e60425cb90acf6275acff5de SHA256 6ad1dd4ca5f42b7bbea9c3bf26a90dfb823913448557738486a1385076bca17d
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNSdaGAAoJENwGBM22xfferEIP/2OeZOBcPtNbAjpebMvnnxwl
-EgvA+2dGCD/FTbNoTmO1XiWj3jqxT01HfTeoc9yaxh8ARLYcZZCwwejhK4HNXz3m
-caXa45P26qkV+HfYePOda2G3oaH+LHXvgqSfURs0Bzb9xh3KglTo9DpRnOaV1tmC
-5rnDoLZqvHLvmlQMPLbdvvexQomf53v45OClIMUgSrnLNR2mEfrqdL5Mp/CRCOd+
-yG+rJrxqdbRaAxMuxIVAV2RrgtE6uJeFb1hVq/T4/b4xl9YsJ3hgxwobXDf5wSEU
-ib4+NmgbfA0Cg4jaC+G20t0PRVozLFnK8/0dYJVHIglT2V8maPp+/czK1dEGrjXt
-WttYdIUqehkHmdcixdcrIAIi2vr7yqZqE7YTMQk+D0XKYGLHHeg6cK9iFbLrTGN3
-ebExL6NsfROiEwx9Ce079p4p7B+9l4v82sjUxexaH5cAyHPFhg/ceHxskWgpYDGn
-3mPqtn6/HdMKQANL7bGnwYCIBwJ/J72FeciOxgkjmPf/ixXPFnDLzqi7UgbD2fa2
-+tSpvSLuQeDdFVLnYOfWpGgdy65PBNHc9r1YkfZCCN9G0sUmyrGut0hvFx88Nl6d
-mW2gBxgnR0TFNcWxEyi8zfgnpgaJ6Do8aAGsJAN+P2JusyjQ0zSuy7vKRPJoEXAg
-Amhre8v7dVbqFRGiLtdL
-=nvxG
+iQIcBAEBAgAGBQJNUGURAAoJENwGBM22xffeqxQQAJuz7dEqi4BbmvHgiXlGxWXo
+lAFGB4b7MbmvyGlPDE0Vz+uoVeQQshFmwvAhDrwkxK9/z6G0j5Bb8K0FgBb0mC0a
+kYg7VDK0GwsfQEIaF08PBZKq/LlDwHtLDFnNs5ul6HLo295I13axsiWROe3BOBJp
+KUM/3iR1SVxE0/obN4EcSI1amt7p+4GIEup7rSDIyWJ3bWS/i5fF+ep1anY5oGJ3
+E+BgCEtMSmKZB202X0lZSKfAA0Nz5u0uMCj77p8sw8XP66FanxTq4mTBfLWOE3pk
+DoX52Q2LnuwMAXhfCJpqzR5FTcoSBXfnQhEtPXayjtgyzT06/PsM3xpRtEcsiU5/
+Mb7jqgGG+YQs54mLajJkd1YOvDGoFKREhBgmsmUumo14zdOKvnMCKQI4Ku3F00ld
+bOC6Ysk1LtIhrU6DdhOCtBFuf+1j2NT+K1Ap6pe6uuxEid9/QpexxX1u5oYpPPjk
+0FTxbW5pbIGID4gshmTbwLcXaCkaV85MXNxXKOD4nAkAGsfJznMpimcKOdfsjPPX
+/mw8K1r+41FQWBCsvatfkMuvo6kzhPcRfVRarEaowhOO9U+Svb+Ksbsl1N8Z//x6
+SBLl7tu39QnAgeRGaKf6yj+nMlSgeTuyoiKgE4OBCh4uhfD9dug/nEfTfmQP2G4U
+i0YqbD1Ze088U4ACcZIx
+=ixyy
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.8.0.ebuild b/media-gfx/digikam/digikam-1.8.0.ebuild
index 37f50356b6a7..ee6ae5165835 100644
--- a/media-gfx/digikam/digikam-1.8.0.ebuild
+++ b/media-gfx/digikam/digikam-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.8.0.ebuild,v 1.2 2011/01/28 19:15:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.8.0.ebuild,v 1.3 2011/02/07 21:33:56 dilfridge Exp $
 
 EAPI=3
 
@@ -65,7 +65,7 @@ DEPEND="${CDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch
-	"${FILESDIR}/${P}"-tests.patch )
+	"${FILESDIR}/${P}"-{tests,gcc46}.patch )
 
 src_prepare() {
 	if use handbook; then
diff --git a/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch b/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
new file mode 100644
index 000000000000..d9581021281d
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.8.0-gcc46.patch
@@ -0,0 +1,15 @@
+--- trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp	2011/02/06 10:48:24	1219102
++++ trunk/extragear/graphics/digikam/libs/threads/dynamicthread.cpp	2011/02/06 11:02:50	1219103
+@@ -257,6 +257,12 @@
+             kDebug() << "Transition to Running: Invalid Inactive state" << q;
+             return false;
+         }
++        default:
++        {
++            kDebug() << "libs/threads/dynanamicthread.cpp : Should never reach here: assert?" << q;
++            return false;
++        }
++
+     }
+ }
+