diff options
| -rw-r--r-- | media-gfx/digikam/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-1.2.0-r4.ebuild | 6 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-1.8.0.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-1.8.0-tests.patch | 15 |
4 files changed, 27 insertions, 6 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index 13066af49f8d..31e7934cbd3f 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,11 @@ # 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.170 2011/01/28 18:41:26 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.171 2011/01/28 19:15:45 dilfridge Exp $ + + 28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org> + digikam-1.2.0-r4.ebuild, digikam-1.8.0.ebuild, + +files/digikam-1.8.0-tests.patch: + Bump EAPI in 1.2.0-r4, fix building of the tests in 1.8.0 *digikam-1.8.0 (28 Jan 2011) diff --git a/media-gfx/digikam/digikam-1.2.0-r4.ebuild b/media-gfx/digikam/digikam-1.2.0-r4.ebuild index 6effb8bebd0f..f38aa63b1651 100644 --- a/media-gfx/digikam/digikam-1.2.0-r4.ebuild +++ b/media-gfx/digikam/digikam-1.2.0-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# 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.2.0-r4.ebuild,v 1.1 2010/11/08 21:29:51 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r4.ebuild,v 1.2 2011/01/28 19:15:45 dilfridge Exp $ -EAPI="2" +EAPI=3 KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km ko lt lv lb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW" diff --git a/media-gfx/digikam/digikam-1.8.0.ebuild b/media-gfx/digikam/digikam-1.8.0.ebuild index ed9a46db0277..37f50356b6a7 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.1 2011/01/28 18:41:26 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.8.0.ebuild,v 1.2 2011/01/28 19:15:45 dilfridge Exp $ EAPI=3 @@ -64,7 +64,8 @@ DEPEND="${CDEPEND} S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch ) +PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch + "${FILESDIR}/${P}"-tests.patch ) src_prepare() { if use handbook; then diff --git a/media-gfx/digikam/files/digikam-1.8.0-tests.patch b/media-gfx/digikam/files/digikam-1.8.0-tests.patch new file mode 100644 index 000000000000..ce03d2e5887d --- /dev/null +++ b/media-gfx/digikam/files/digikam-1.8.0-tests.patch @@ -0,0 +1,15 @@ +diff -ruN digikam-1.8.0.orig/tests/CMakeLists.txt digikam-1.8.0/tests/CMakeLists.txt +--- digikam-1.8.0.orig/tests/CMakeLists.txt 2011-01-23 20:24:49.000000000 +0100 ++++ digikam-1.8.0/tests/CMakeLists.txt 2011-01-28 19:56:04.000000000 +0100 +@@ -176,9 +176,9 @@ + + SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) + KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS}) +-TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) ++TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES}) + + SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) + KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS}) +-TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) ++TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES}) + |