summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander (wired) <alex.alexander@gmail.com>2009-06-02 23:23:55 +0300
committerAlex Alexander (wired) <alex.alexander@gmail.com>2009-06-02 23:32:06 +0300
commit07a37ec7173b3eb4c43183b226b8713ddc370ef9 (patch)
tree234617963407708f46e754ae6744c72753f2c76c
parente7f1d0b9a503bac4273bcf33e1c3213d80c077c3 (diff)
downloadkde-07a37ec7173b3eb4c43183b226b8713ddc370ef9.tar.gz
kde-07a37ec7173b3eb4c43183b226b8713ddc370ef9.tar.bz2
kde-07a37ec7173b3eb4c43183b226b8713ddc370ef9.zip
[kde-base/khotkeys] patch that fixes parallel building
-rw-r--r--kde-base/khotkeys/ChangeLog4
-rw-r--r--kde-base/khotkeys/Manifest5
-rw-r--r--kde-base/khotkeys/files/khotkeys-4-parallel.patch22
-rw-r--r--kde-base/khotkeys/khotkeys-4.2.4.ebuild2
4 files changed, 31 insertions, 2 deletions
diff --git a/kde-base/khotkeys/ChangeLog b/kde-base/khotkeys/ChangeLog
index 57705f795cf..864369d1d37 100644
--- a/kde-base/khotkeys/ChangeLog
+++ b/kde-base/khotkeys/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 Jun 2009; <wired@gentoo.org> khotkeys-4.2.4.ebuild,
+ +files/khotkeys-4-parallel.patch:
+ patch that fixes parallel building
+
29 May 2009; Alexey Shvetsov <alexxy@gentoo.org> -khotkeys-4.2.85.ebuild:
Version removed.
diff --git a/kde-base/khotkeys/Manifest b/kde-base/khotkeys/Manifest
index d8e4d7cc690..855412bf114 100644
--- a/kde-base/khotkeys/Manifest
+++ b/kde-base/khotkeys/Manifest
@@ -1,8 +1,9 @@
+AUX khotkeys-4-parallel.patch 782 RMD160 236d4f15c223d585fdde0343055e80769ae7a26a SHA1 619340da1d6176b5ae043b58925903e3faf52a91 SHA256 5496e98a9d3d0adff7f818837cffcf81c3a85b241198b227842675f247718d23
DIST kdebase-workspace-4.2.4.tar.bz2 50803339 RMD160 ee817ef97015afa1f0e0eef53817f9daebc75fdd SHA1 31f38436736ff73b6ffb9d8bbb93b8342965e894 SHA256 91413f5b166fbdfc307a07a30df16b47f8bb3f67ff9ffbc0756de728b9e19ff4
DIST kdebase-workspace-4.2.88.tar.lzma 50254661 RMD160 0d344cb6a26d79714ceb22c8c4165541264131b7 SHA1 bf8d777080f027c8eba2bca20d984f73cc25831f SHA256 af594eb3ba446ba7662a478f452cd8f06dbe4445ceb3e6b2a39b5333888aa6ba
-EBUILD khotkeys-4.2.4.ebuild 517 RMD160 838c9e2f991058859a93087a97f0c405e1c58936 SHA1 238e2238c04a504752ea3c0810fdc30100e88b61 SHA256 7021c089c8cccdce62bd6d386bf800b550d195ad5aa377fb6c76209600e1eb76
+EBUILD khotkeys-4.2.4.ebuild 570 RMD160 32f3b56b94f93e94bb4910f7d30ebe4bd4919f5f SHA1 d05a7a0817832aef5002a9ebad91a40ecfac7c54 SHA256 5b52a818bb07d5f13b86320a4dd4f844c8d42fbb4dda7437a4b8bfbfd9897ea7
EBUILD khotkeys-4.2.88.ebuild 385 RMD160 decaf2c0c4ded83bdecc5aac6adcc9e5e6372d04 SHA1 2d2f04a60ba0e19e1783bbe703d004e7ce811707 SHA256 f6083f09248969c804d354e7eeeb89f238966323bd3c76aaf859fe3a0aaf059e
EBUILD khotkeys-4.2.9999.ebuild 475 RMD160 64fe28d4e4258a581d7ebf9fc1d76f4af278df12 SHA1 a8deb3f9e21cd3ae0653d74c95f445b72020e262 SHA256 b160b680b53e2cd04675a4a03cdb406f97d6f63094ed871df4bd1f6b2f7cc3b6
EBUILD khotkeys-9999.ebuild 374 RMD160 93b935863faa50c765116114041660b13a596fe6 SHA1 d83045c0e9256a4d2c26a60426ccc7bdcd353964 SHA256 9291152380d96b8c6801dd332d9d949501e1001ce95a12bf69ca1958c1cb8ac9
-MISC ChangeLog 7033 RMD160 8d0387588d0d50520712a6e1e9afde34b0119dc9 SHA1 485fb415a5cf99f93832c570beddd8f218d0f688 SHA256 5932d530e94b3294c7b3e028d9e425754a3486c0e720c06843a1a68ed9988bbe
+MISC ChangeLog 7164 RMD160 5c341601577fd4467f1e11a25afa3c0011e776c0 SHA1 c9d8b0dba6c8f38912a8f98dd0b16644e7263e83 SHA256 4cd0250c69280b097b43d5d5b9bcbe0e821ea45856c2f77cbb62df85f4c133cb
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/khotkeys/files/khotkeys-4-parallel.patch b/kde-base/khotkeys/files/khotkeys-4-parallel.patch
new file mode 100644
index 00000000000..6051c0723ae
--- /dev/null
+++ b/kde-base/khotkeys/files/khotkeys-4-parallel.patch
@@ -0,0 +1,22 @@
+--- khotkeys/update/CMakeLists.txt.old 2009-06-02 23:06:15.604322396 +0300
++++ khotkeys/update/CMakeLists.txt 2009-06-02 23:06:05.516480905 +0300
+@@ -12,6 +12,8 @@
+
+ kde4_add_executable( khotkeys_update ${khotkeys_update_SRCS})
+
++add_dependencies( khotkeys_update kded_khotkeys )
++
+ target_link_libraries( khotkeys_update khotkeysprivate kworkspace ${KDE4_KDE3SUPPORT_LIBS} )
+ if(X11_XTest_FOUND)
+ target_link_libraries( khotkeys_update ${X11_XTest_LIB} )
+--- khotkeys/kcm_hotkeys/CMakeLists.txt.old 2009-06-02 23:05:32.685403364 +0300
++++ khotkeys/kcm_hotkeys/CMakeLists.txt 2009-06-02 23:05:15.410616052 +0300
+@@ -50,6 +50,8 @@
+ ${kcm_hotkeys_PART_SRCS}
+ )
+
++add_dependencies(kcm_hotkeys kded_khotkeys)
++
+ target_link_libraries(
+ kcm_hotkeys
+ khotkeysprivate
diff --git a/kde-base/khotkeys/khotkeys-4.2.4.ebuild b/kde-base/khotkeys/khotkeys-4.2.4.ebuild
index fe433d547ab..57642f9d625 100644
--- a/kde-base/khotkeys/khotkeys-4.2.4.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.2.4.ebuild
@@ -20,3 +20,5 @@ RDEPEND="${DEPEND}"
KMEXTRACTONLY="
libs/kworkspace/
"
+
+PATCHES=( "${FILESDIR}/khotkeys-4-parallel.patch" )