diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-02-07 21:33:57 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-02-07 21:33:57 +0000 |
| commit | f535a89b77f8a0bc78c1716b464ce89ac32ef54c (patch) | |
| tree | d92716c36f9c55aa9832bedfc760f7aa9a84b429 /media-gfx/digikam | |
| parent | Remove hal dependency (bug 353839) and useless static archives and libtool fi... (diff) | |
| download | gentoo-2-f535a89b77f8a0bc78c1716b464ce89ac32ef54c.tar.gz gentoo-2-f535a89b77f8a0bc78c1716b464ce89ac32ef54c.tar.bz2 gentoo-2-f535a89b77f8a0bc78c1716b464ce89ac32ef54c.zip | |
Added upstream build fix for newer gcc/kde versions (bug 353751)
(Portage version: 2.1.9.37/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-1.8.0.ebuild | 4 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-1.8.0-gcc46.patch | 15 |
3 files changed, 22 insertions, 3 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/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; ++ } ++ + } + } + |