diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-26 19:46:48 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-26 19:46:48 +0000 |
| commit | 088ad0927f638fd4cd953dcee68a017643493ede (patch) | |
| tree | 49b42f0a064363ec9e349bc0f1206c1f09450081 /media-gfx/digikam | |
| parent | Changes to DEPEND wrt bug #380501 thanks to Michael. Added fix for prefix wrt... (diff) | |
| download | gentoo-2-088ad0927f638fd4cd953dcee68a017643493ede.tar.gz gentoo-2-088ad0927f638fd4cd953dcee68a017643493ede.tar.bz2 gentoo-2-088ad0927f638fd4cd953dcee68a017643493ede.zip | |
Fix underlinking and library linking order. Fixes bug 380687, revbump because it might also be related to bug 380287
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-2.0.0-r1.ebuild (renamed from media-gfx/digikam/digikam-2.0.0.ebuild) | 3 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-2.0.0-underlinking.patch | 29 |
3 files changed, 39 insertions, 2 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index 3aa4df7d0ffe..795bc9bc09f0 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,13 @@ # 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.192 2011/08/02 20:47:21 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.193 2011/08/26 19:46:48 dilfridge Exp $ + +*digikam-2.0.0-r1 (26 Aug 2011) + + 26 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> -digikam-2.0.0.ebuild, + +digikam-2.0.0-r1.ebuild, +files/digikam-2.0.0-underlinking.patch: + Fix underlinking and library linking order. Fixes bug 380687, revbump because + it might also be related to bug 380287 02 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-2.0.0.ebuild: Fix semantic-desktop dependency, bug 377167 diff --git a/media-gfx/digikam/digikam-2.0.0.ebuild b/media-gfx/digikam/digikam-2.0.0-r1.ebuild index 4b235a0bdf83..f9e20a1bd631 100644 --- a/media-gfx/digikam/digikam-2.0.0.ebuild +++ b/media-gfx/digikam/digikam-2.0.0-r1.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-2.0.0.ebuild,v 1.3 2011/08/02 20:47:21 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0-r1.ebuild,v 1.1 2011/08/26 19:46:48 dilfridge Exp $ EAPI=4 @@ -70,6 +70,7 @@ S="${WORKDIR}/${MY_P}/core" PATCHES=( "${FILESDIR}/${P}-tests-1.patch" + "${FILESDIR}/${P}-underlinking.patch" ) RESTRICT=test diff --git a/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch b/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch new file mode 100644 index 000000000000..a5f05e08d3ce --- /dev/null +++ b/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch @@ -0,0 +1,29 @@ +commit 772f592f639f52d0c1a991265098b46672fecb6e +Author: Gilles Caulier <caulier.gilles@gmail.com> +Date: Fri Aug 26 11:58:59 2011 +0200 + + Fix order to link gphoto2 library with digiKam shared lib. This must be the last on linker command line... + CCBUGS: 258931 + CCBUGS: 268267 + +diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt +index 42017df..78ca1f1 100644 +--- a/digikam/CMakeLists.txt ++++ b/digikam/CMakeLists.txt +@@ -279,13 +279,15 @@ TARGET_LINK_LIBRARIES(digikam + + ${STRIGI_LIBRARIES} + ${LCMS_LIBRARIES} +- ${GPHOTO2_LIBRARIES} + + digikamcore + digikamdatabase + advancedrename + queuemanager + cameragui ++ ++ # See B.K.O #258931: libgphoto2 library must be the last arg for linker. ++ ${GPHOTO2_LIBRARIES} + ) + + IF (NOT WIN32 AND GPHOTO2_FOUND) |