summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2009-01-20 22:01:54 +0300
committerAlexey Shvetsov <alexxy@gentoo.org>2009-01-20 22:01:54 +0300
commitf8530dbce03a50b59b56ad30b0202f953d99aa9f (patch)
tree2a7845ad4dcaf4dd17f185c9b20dabb32a911293
parent1c4dd6275e02db8d3cf1cb9cd95272a2c74fd6e4 (diff)
downloadkde-f8530dbce03a50b59b56ad30b0202f953d99aa9f.tar.gz
kde-f8530dbce03a50b59b56ad30b0202f953d99aa9f.tar.bz2
kde-f8530dbce03a50b59b56ad30b0202f953d99aa9f.zip
Add patch to fix linkage to digikam. This fixes bug 255419
(Portage version: 2.2_rc23/git/Linux x86_64) (Unsigned Manifest commit)
-rw-r--r--media-gfx/digikam/ChangeLog5
-rw-r--r--media-gfx/digikam/Manifest5
-rw-r--r--media-gfx/digikam/digikam-0.10.0_beta8.ebuild2
-rw-r--r--media-gfx/digikam/files/digikam-0.10.0_beta8-fix-linkage.patch12
4 files changed, 22 insertions, 2 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index eb90424a910..728bbb9dc2a 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org>
+ +files/digikam-0.10.0_beta8-fix-linkage.patch,
+ digikam-0.10.0_beta8.ebuild:
+ Add patch to fix linkage to digikam. This fixes bug 255419
+
*digikam-0.10.0_beta8 (11 Jan 2009)
11 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index ec69c81aac9..d649700a7fa 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,6 @@
+AUX digikam-0.10.0_beta8-fix-linkage.patch 538 RMD160 5a37e6a137c327523c1a074d3f8ba4bd42f70a5e SHA1 47ef0eff8df5a2951bc1ec100468544c0ae7c0ae SHA256 a09efa91dcc7e19f93792fc4e91bf2548b5b2f5465cebf5a579c86ca2980ade0
DIST digikam-0.10.0-beta8.tar.bz2 10967350 RMD160 903780520232b7fb37207fc5e0cb1f1302f5bf2b SHA1 0682e86ceb7b985ac1a1abbf6532804bf13b6968 SHA256 c5b5e9461a5bd4b1ffbb6cc861ae6adf8d11149460dfd1cb834371b7d9f213db
-EBUILD digikam-0.10.0_beta8.ebuild 1865 RMD160 9b997ed59378634d56de3d1b1d2b5902d6d69422 SHA1 1fc2ea28ebcffb54264592fa711c4f741d8d83c3 SHA256 c1592e9f413a3d570bcf7b079f9725fa048491ece6455c11a314b057502a88ab
+EBUILD digikam-0.10.0_beta8.ebuild 1915 RMD160 6aea151a041f25dd7dc372db3a46238ee4a8d2e2 SHA1 508cd279ff8c7b012b06a53934604782eb920699 SHA256 277f41c3ad132a78ed00a68a8deb2f74842f7d9351c3e16f4aa83ce2482b15e3
EBUILD digikam-9999.ebuild 1675 RMD160 7925731b1ff48de71dd3820d245abf02fa04b545 SHA1 534837d191064d70415a263a6137039d852d0df0 SHA256 a1d30a54ec2b690c306ac002efe7dc93b1f41188281e785eb229012014c749a3
-MISC ChangeLog 1855 RMD160 22a2c69f981417cdd3b29f1f66976eb1a9b59caf SHA1 f7d922b9ef4b65f9b834cabaa9a9c5c525a96f61 SHA256 ecd6a29dcc740bc025cf2d3aebd4fa63c2b72ddc44eedc7684aec045a5fd9036
+MISC ChangeLog 2048 RMD160 586c9fd9cecfa561486dcf6050d4ec9d19775391 SHA1 7fdd644ed68c445e40e199ca9c857fdd76516542 SHA256 2dc4bcab43adc328bfe3a3a96b204ee51721fd260e12ca6925cf03e4c7ee53ac
MISC metadata.xml 376 RMD160 3158e2babdd75064d05a08420e0f1d2d3b318fae SHA1 bf9026c227e27333e688b7a4d639e7eaf7ba5993 SHA256 9ea05856a338312e6d9d3ebe15b935d371bd4bd21eeaa796d71db1a92b4e7231
diff --git a/media-gfx/digikam/digikam-0.10.0_beta8.ebuild b/media-gfx/digikam/digikam-0.10.0_beta8.ebuild
index 1b61479e559..059d7003bdd 100644
--- a/media-gfx/digikam/digikam-0.10.0_beta8.ebuild
+++ b/media-gfx/digikam/digikam-0.10.0_beta8.ebuild
@@ -51,6 +51,8 @@ DEPEND="
#liblensfun when added should be also optional dep.
RDEPEND="${DEPEND}"
+PATHCES=( "${FILESDIR}/${P}-fix-linkage.patch" )
+
src_prepare() {
# fix files collision, use icon from kdebase-data rather that digikam ones
sed -i \
diff --git a/media-gfx/digikam/files/digikam-0.10.0_beta8-fix-linkage.patch b/media-gfx/digikam/files/digikam-0.10.0_beta8-fix-linkage.patch
new file mode 100644
index 00000000000..ce58db6f7b9
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-0.10.0_beta8-fix-linkage.patch
@@ -0,0 +1,12 @@
+--- themedesigner/CMakeLists.txt.orig 2009-01-20 00:29:10.000000000 +0100
++++ themedesigner/CMakeLists.txt 2009-01-20 00:29:29.000000000 +0100
+@@ -85,6 +85,9 @@
+ TARGET_LINK_LIBRARIES(digikamthemedesigner
+ digikamcore
+ digikamdatabase
++ ${KDE4_PHONON_LIBS}
++ ${KDE4_KPARTS_LIBS}
++ ${KDE4_KHTML_LIBS}
+ ${KDE4_KUTILS_LIBS}
+ ${KIPI_LIBRARIES}
+ ${GPHOTO2_LIBRARIES}