diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-28 19:42:08 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-28 19:42:08 +0000 |
| commit | 4a724d63c5db7684032b83a1beeb01481b4bc5d0 (patch) | |
| tree | dbc4be852ac4df341dbaebaf2f6a0d5a24509d5d /kde-base/kdelibs | |
| parent | Remove old versions. (diff) | |
| download | gentoo-2-4a724d63c5db7684032b83a1beeb01481b4bc5d0.tar.gz gentoo-2-4a724d63c5db7684032b83a1beeb01481b4bc5d0.tar.bz2 gentoo-2-4a724d63c5db7684032b83a1beeb01481b4bc5d0.zip | |
Remove old versions.
(Portage version: 2.1_rc3)
(Signed Manifest commit)
Diffstat (limited to 'kde-base/kdelibs')
30 files changed, 82 insertions, 4461 deletions
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index fc78cef290cf..3c4bbb669769 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -1,49 +1,98 @@ -MD5 c6e7deea777332e3a1c9250e429e7da0 ChangeLog 53344 -MD5 9cca33d11b8344231d13330e0ccffe36 files/digest-kdelibs-3.3.2-r10 1873 -MD5 c9cf9449167d9dfb76d6d964f43224ba files/digest-kdelibs-3.4.1-r1 247 -MD5 c9cf9449167d9dfb76d6d964f43224ba files/digest-kdelibs-3.4.1-r2 247 -MD5 f4447fad3889217284cbb7467845c1de files/digest-kdelibs-3.4.2 250 -MD5 f4447fad3889217284cbb7467845c1de files/digest-kdelibs-3.4.2-r1 250 -MD5 a54667078c47d39ce6d23cb9cda9fed8 files/digest-kdelibs-3.4.3 250 -MD5 a54667078c47d39ce6d23cb9cda9fed8 files/digest-kdelibs-3.4.3-r1 250 -MD5 85fd726353f691cf1582d2d026621525 files/digest-kdelibs-3.5.2-r2 250 -MD5 85fd726353f691cf1582d2d026621525 files/digest-kdelibs-3.5.2-r3 250 -MD5 278ff9ac32b7ca6efb3e76996ad8e962 files/digest-kdelibs-3.5.2-r4 542 -MD5 278ff9ac32b7ca6efb3e76996ad8e962 files/digest-kdelibs-3.5.2-r5 542 -MD5 60bd7d1d1c33663cd4c3c98ef261d11a files/digest-kdelibs-3.5.2-r6 810 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX kde3-dcopidlng.patch 681 RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 SHA1 102b786b497b61e6bce22c67f2b505aaea6b5b03 SHA256 5ecc91e40a6e33b9f2a5057867409bc88e350f16595d02a756803c5e5d169bbe MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681 +RMD160 ed51b79d085abf13a6883a313c02fbe9fad946e0 files/kde3-dcopidlng.patch 681 +SHA256 5ecc91e40a6e33b9f2a5057867409bc88e350f16595d02a756803c5e5d169bbe files/kde3-dcopidlng.patch 681 +AUX kdelibs-3.3.2-anchor-fix.patch 5947 RMD160 9bfa0b6a09aa60a7c52b3f2897b8f9d2e7479c70 SHA1 235dc4db7a3d438023b9bbb445b3ec86415ba866 SHA256 581d8dbb36681b9455e9479f3b5b1c2df13442a84ce0469b709148edd7ced770 MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947 +RMD160 9bfa0b6a09aa60a7c52b3f2897b8f9d2e7479c70 files/kdelibs-3.3.2-anchor-fix.patch 5947 +SHA256 581d8dbb36681b9455e9479f3b5b1c2df13442a84ce0469b709148edd7ced770 files/kdelibs-3.3.2-anchor-fix.patch 5947 +AUX kdelibs-3.3.2-aspell-dir.patch 467 RMD160 955e64a9c0e01926fcc842338496f718e3bcaa8d SHA1 ad257c33603ee5ac59aaba42b3ec6affd8fb8f6c SHA256 c35e1706ad5687921de1f7d38f9729df4cc812c470e9cde26348fdc5d1a15f63 MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467 +RMD160 955e64a9c0e01926fcc842338496f718e3bcaa8d files/kdelibs-3.3.2-aspell-dir.patch 467 +SHA256 c35e1706ad5687921de1f7d38f9729df4cc812c470e9cde26348fdc5d1a15f63 files/kdelibs-3.3.2-aspell-dir.patch 467 +AUX kdelibs-3.3.2-ppc64.patch 957 RMD160 c362fecc45636d7a2d25f79c0d2225bf98543677 SHA1 779aaaccafbcc98c4fce0c1a8baeceec5c6e7400 SHA256 c2492a503e41b8b652c91ee0bdbe36cb81401aa5c2aee899d3596fce873e2e02 MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957 +RMD160 c362fecc45636d7a2d25f79c0d2225bf98543677 files/kdelibs-3.3.2-ppc64.patch 957 +SHA256 c2492a503e41b8b652c91ee0bdbe36cb81401aa5c2aee899d3596fce873e2e02 files/kdelibs-3.3.2-ppc64.patch 957 +AUX kdelibs-3.4.1-configure.patch 4558 RMD160 37ae02ce1da2b281b6a7a65b72b5749a5f599ed3 SHA1 7c5c454ccddad090a7fe7320e1736a26283ca95b SHA256 0a8baf8c4467ca1234b94c6a9a423519a980cc505d6bd8b5e19dd7ef672d5eec MD5 581be8df4ecfd3cf649bb36b6f57e35a files/kdelibs-3.4.1-configure.patch 4558 -MD5 b291a4a134cac9072ad1140a78eee9ce files/kdelibs-3.4.1-kntlm.patch 1323 -MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215 -MD5 4f827df22c4b05fdb50535c985ff5cb1 files/kdelibs-3.4.2-gmail-fix.patch 724 +RMD160 37ae02ce1da2b281b6a7a65b72b5749a5f599ed3 files/kdelibs-3.4.1-configure.patch 4558 +SHA256 0a8baf8c4467ca1234b94c6a9a423519a980cc505d6bd8b5e19dd7ef672d5eec files/kdelibs-3.4.1-configure.patch 4558 +AUX kdelibs-3.4.3-inttypes.patch 365 RMD160 168a3826787553cb018ea8f282eedaa203563690 SHA1 c3a5850bc3cc57c2273148ff0ed49258be652bdc SHA256 8ad8265109186cc5fa10a85f8006f3147517c102e2129d5a7b4b690f3a77d103 MD5 b0a18256a9bb33e81f45573f07a341e1 files/kdelibs-3.4.3-inttypes.patch 365 +RMD160 168a3826787553cb018ea8f282eedaa203563690 files/kdelibs-3.4.3-inttypes.patch 365 +SHA256 8ad8265109186cc5fa10a85f8006f3147517c102e2129d5a7b4b690f3a77d103 files/kdelibs-3.4.3-inttypes.patch 365 +AUX kdelibs-3.5.0-bindnow.patch 1363 RMD160 e0c25c7ac4bb4d0be389a529aded621499a844cc SHA1 30e750ba36966e96e64f12d1da442fd344145f82 SHA256 243fc766daf2e324ccc7984843c9fe27aa463acacedb35e848eec645f1a232a4 MD5 15d3d3042e0bb2c9b640e8993aa234b1 files/kdelibs-3.5.0-bindnow.patch 1363 +RMD160 e0c25c7ac4bb4d0be389a529aded621499a844cc files/kdelibs-3.5.0-bindnow.patch 1363 +SHA256 243fc766daf2e324ccc7984843c9fe27aa463acacedb35e848eec645f1a232a4 files/kdelibs-3.5.0-bindnow.patch 1363 +AUX kdelibs-3.5.0-kicker-crash.patch 1298 RMD160 d21a8d865fb3dc94dd597221ef14e43b878864b4 SHA1 1d395877a4c838a5f3cd33f13da98976dd7b9c94 SHA256 55c03dec7736a84e0ef217bef71491a223c0d4d7f9315f2f05cb935ad96b3bd8 MD5 091d05a08330372ddbaf5ef9d426be53 files/kdelibs-3.5.0-kicker-crash.patch 1298 -MD5 4173e2f4114839a4f378835b6a52ed74 files/kdelibs-3.5.2-kate-fixes-2.diff 16521 -MD5 b90114903755198fb136b739697819eb files/kdelibs-3.5.2-kate-fixes.diff 14651 -MD5 f80013d47f75d05b7d79c2a8aa93f19c files/kdelibs-3.5.2-kio-errror-handling.diff 3919 -MD5 60558f20708e58f343461af74915f9de files/kdelibs-3.5.2-kio-fixes.diff 6739 +RMD160 d21a8d865fb3dc94dd597221ef14e43b878864b4 files/kdelibs-3.5.0-kicker-crash.patch 1298 +SHA256 55c03dec7736a84e0ef217bef71491a223c0d4d7f9315f2f05cb935ad96b3bd8 files/kdelibs-3.5.0-kicker-crash.patch 1298 +AUX kdelibs-3.5.2-kssl-3des.patch 646 RMD160 aeaaf92fea1a2d77ef8f6ad8e2c8ae1cc9230586 SHA1 5c153f06469bbd9a342f3d40847a8a2e52ea24fb SHA256 530465d629efd42a1fe0b70810d427805e0d36f722b45f32a6a0f8c38871b9b9 MD5 2a7911545111281454eac6f4a396d498 files/kdelibs-3.5.2-kssl-3des.patch 646 -MD5 4f014cb61aa0d8d73fed1ff7201ae9ec files/kdelibs-3.5.2-misc-fixes-2.diff 14433 -MD5 c35ed694c280285e9ecaffc3f3f2fc75 files/kdelibs-3.5.2-misc-fixes-3.diff 34479 -MD5 3327af3adbdebae3ca8fc90f992d4e2c files/kdelibs-3.5.2-misc-fixes.diff 14127 +RMD160 aeaaf92fea1a2d77ef8f6ad8e2c8ae1cc9230586 files/kdelibs-3.5.2-kssl-3des.patch 646 +SHA256 530465d629efd42a1fe0b70810d427805e0d36f722b45f32a6a0f8c38871b9b9 files/kdelibs-3.5.2-kssl-3des.patch 646 +AUX kdelibs-3.5.2-xorg7-rgbtxt.patch 633 RMD160 778c7cbf959ec1ed49ced9c1883d77c178f5c7b5 SHA1 9f19d635cd8d3568ce23930630a000259e2bf090 SHA256 a16796bcda093dcbb51fb62c7e7bd0db1d174cc7b691a6bdbd863fd803d4ed25 MD5 073d3bf868dd8f07df2029d692308cb4 files/kdelibs-3.5.2-xorg7-rgbtxt.patch 633 -MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989 +RMD160 778c7cbf959ec1ed49ced9c1883d77c178f5c7b5 files/kdelibs-3.5.2-xorg7-rgbtxt.patch 633 +SHA256 a16796bcda093dcbb51fb62c7e7bd0db1d174cc7b691a6bdbd863fd803d4ed25 files/kdelibs-3.5.2-xorg7-rgbtxt.patch 633 +AUX post-3.3.2-kdelibs-kate.diff 2212 RMD160 78afa73da3f39e123a4d24aa216a5260f2484372 SHA1 d5f23539d489ff1e34450de09cda962e320511ff SHA256 7f02119f028936033afe7e7e49aa661c73a1b7af6801a281c832544d76b37ea1 MD5 138c3252883171d55ec24ed0318950fd files/post-3.3.2-kdelibs-kate.diff 2212 +RMD160 78afa73da3f39e123a4d24aa216a5260f2484372 files/post-3.3.2-kdelibs-kate.diff 2212 +SHA256 7f02119f028936033afe7e7e49aa661c73a1b7af6801a281c832544d76b37ea1 files/post-3.3.2-kdelibs-kate.diff 2212 +AUX post-3.4.3-kdelibs-kjs.diff 1570 RMD160 95a341acfe20ac53f528c31be17e50dba2163f8d SHA1 4869c00f7f725a87d0223d684f09fe7e08c0e46d SHA256 2031efa2a5e4a747d5e2630ccd0cae62d7413de025786069931c01b07fc5a724 MD5 ecc0ec13ce3b06e94e35aa8e937e02bf files/post-3.4.3-kdelibs-kjs.diff 1570 +RMD160 95a341acfe20ac53f528c31be17e50dba2163f8d files/post-3.4.3-kdelibs-kjs.diff 1570 +SHA256 2031efa2a5e4a747d5e2630ccd0cae62d7413de025786069931c01b07fc5a724 files/post-3.4.3-kdelibs-kjs.diff 1570 +DIST kdelibs-3.3.2.tar.bz2 15623180 RMD160 66d8bf05cff7aaf875a640a08b1a259085385036 SHA256 1bb530480f1d55449a0ff3a1138d25ba4c49e983c6ddfd513f2f52a72579ccf4 +DIST kdelibs-3.4.3.tar.bz2 16877867 RMD160 3bf89c0694f0fbabe46ae75d49f3eaf651fc2a90 SHA256 9da649b27e5b94ce932bb5da1fe6096b1230d82405564e62486ca4f68437df39 +DIST kdelibs-3.5.2-patchset.tar.bz2 17026 RMD160 07093c155a11256ba8e0df3144899ca1696db063 SHA1 94c5dbeee9b4a93c4a85b20f5ed247b2b7cd447d SHA256 c3e4d921bfe963ab49a11081fbd5b0b8fe3d1190054a22bb3933c64d51becf04 +DIST kdelibs-3.5.2.tar.bz2 15442103 RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 SHA1 c895d3473307b90ebfd3c4d40b3813f9243d69fb SHA256 d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b +DIST kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 RMD160 acd244fad5168ddf683dc988e7d51607641acd47 SHA1 084e9b9fcb156699b6a1f576455aba561df5d1fa SHA256 7d0fc597c9c3a9062cbbe38017907ec53b0d2ea1699402d35ab4b690c54f0876 +DIST post-3.3.2-kdelibs-dcop.patch 1903 RMD160 26ebee924300f534d0e6926ecdde95899e08fc4c SHA256 d8bed24494034a17883878d2b27b06601cf573828c202c6cf03b37a4138a3e79 +DIST post-3.3.2-kdelibs-htmlframes2.patch 1202 RMD160 c1bd1cbe03386ee23e12e1e2fac4d9f123082681 SHA256 832a02d84c34f5213c250569023514a75dff83dec2ff6f41e8d0442ef4224328 +DIST post-3.3.2-kdelibs-idn-2.patch 4212 RMD160 48d8fb5eecd76c068ec0926efc69f8fad7e776e4 SHA256 014835a04688402c8c06a1f7b1830674303842c355c8f76ea51aaaca4cdfb9d0 +DIST post-3.3.2-kdelibs-kimgio-fixed.diff 53212 RMD160 1e34a3c6a768593a9274a32fea8682dffc2a541f SHA256 f56b7cf541b47be6151fd87821c6ce81c5b0e84231eeb9bd6067b7fa3b649f49 +DIST post-3.3.2-kdelibs-kio.diff 1640 RMD160 49f724bdfb24cc3cd6ecfbc482fb1a17006de7bd SHA256 fa8a42db08f4418edf3c7de7dd24a2ca1c6fcda19fb98d36604e6781ddb10726 +DIST post-3.3.2-kdelibs-kioslave.patch 663 RMD160 9834572d7ac2536d1c43ee22cf52f97b1fec749e SHA256 183a960d36a7bdfa23c2af554057b88198e947950b34828eb8816d36df95ec2b +EBUILD kdelibs-3.3.2-r10.ebuild 4318 RMD160 e6323e26050b02ff98f888659fa6c1017b7cf9e1 SHA1 9c9be89f7bb7b144de368ee28a8ceb4bd66d1342 SHA256 a1f09717ba0e7b34c4aa6b0f3ff0b26ab63dfdf2e19f67dcc276f78a7a0e40e5 MD5 a0a423eb46bcca9f140b0a97645a0177 kdelibs-3.3.2-r10.ebuild 4318 -MD5 176460cf9160b02b1a157612af59e346 kdelibs-3.4.1-r1.ebuild 3363 -MD5 b75b773aa95374e55799e86e678173d6 kdelibs-3.4.1-r2.ebuild 3364 -MD5 12b3f3cc444cc940ed50e352054ccb7f kdelibs-3.4.2-r1.ebuild 3341 -MD5 2fd53a7c014e4527505ec32ec5425575 kdelibs-3.4.2.ebuild 3346 +RMD160 e6323e26050b02ff98f888659fa6c1017b7cf9e1 kdelibs-3.3.2-r10.ebuild 4318 +SHA256 a1f09717ba0e7b34c4aa6b0f3ff0b26ab63dfdf2e19f67dcc276f78a7a0e40e5 kdelibs-3.3.2-r10.ebuild 4318 +EBUILD kdelibs-3.4.3-r1.ebuild 3481 RMD160 9d807e8decea2fe8b2193bec5557d8d788ec689c SHA1 52f1568be44c115d79773d24439922938f85b1e1 SHA256 6157936a48799baf75da7264fe1bf3fbff5a6009c94af65c896303230d26f247 MD5 2c50f5fde5dce4194f6b3dd5e21dfe4a kdelibs-3.4.3-r1.ebuild 3481 -MD5 8118ed2fe88987c7ed81197599658246 kdelibs-3.4.3.ebuild 3383 -MD5 a16c66fff6c663988a028192d97a00db kdelibs-3.5.2-r2.ebuild 4092 -MD5 18775b90e73dcefd4db71497d6017420 kdelibs-3.5.2-r3.ebuild 4123 -MD5 089cd3566acc95b1bdb233c6cb058e5b kdelibs-3.5.2-r4.ebuild 5054 -MD5 1048447b0822e4735b004830fb2cb2b9 kdelibs-3.5.2-r5.ebuild 5057 +RMD160 9d807e8decea2fe8b2193bec5557d8d788ec689c kdelibs-3.4.3-r1.ebuild 3481 +SHA256 6157936a48799baf75da7264fe1bf3fbff5a6009c94af65c896303230d26f247 kdelibs-3.4.3-r1.ebuild 3481 +EBUILD kdelibs-3.5.2-r6.ebuild 5070 RMD160 1c261575949902dff7170ecc79c5d07d99ed072d SHA1 854ba5fd481283324e84c4d00ec9e101d58c6b67 SHA256 d4c9f63a4242ffc4561a30aecf10008c644108e7d6d798ec6de862d98006d128 MD5 3754d59a41ddb9c49b96ec23b4a8d028 kdelibs-3.5.2-r6.ebuild 5070 +RMD160 1c261575949902dff7170ecc79c5d07d99ed072d kdelibs-3.5.2-r6.ebuild 5070 +SHA256 d4c9f63a4242ffc4561a30aecf10008c644108e7d6d798ec6de862d98006d128 kdelibs-3.5.2-r6.ebuild 5070 +MISC ChangeLog 54117 RMD160 50ee31738bec9ca2066dc0784f9c9543dd2c73a9 SHA1 af5a6c9178003235cca5cb221b7df19275fb253c SHA256 6f7c59ea84672a82104a8d431bd0e16c03c8b32307c3e7b5b29bbe9ea53a19e3 +MD5 7d6fd8d93b0af1713dae34cc42297e30 ChangeLog 54117 +RMD160 50ee31738bec9ca2066dc0784f9c9543dd2c73a9 ChangeLog 54117 +SHA256 6f7c59ea84672a82104a8d431bd0e16c03c8b32307c3e7b5b29bbe9ea53a19e3 ChangeLog 54117 +MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 +SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156 +MD5 9cca33d11b8344231d13330e0ccffe36 files/digest-kdelibs-3.3.2-r10 1873 +RMD160 5e20d89b831c7e864a7fecc865b130c7188e8551 files/digest-kdelibs-3.3.2-r10 1873 +SHA256 d35a4d9c6eba4d9f786f7dd4eed6698bdda2c67a6536f0c86fa226f2f1572ee4 files/digest-kdelibs-3.3.2-r10 1873 +MD5 a54667078c47d39ce6d23cb9cda9fed8 files/digest-kdelibs-3.4.3-r1 250 +RMD160 922cbca97e18d784a348df95019c15567b84f71e files/digest-kdelibs-3.4.3-r1 250 +SHA256 05461bdc60c44b05dce6e71b4ffe0f8cc9b32733469a2f97462bb3690e27c9d5 files/digest-kdelibs-3.4.3-r1 250 +MD5 60bd7d1d1c33663cd4c3c98ef261d11a files/digest-kdelibs-3.5.2-r6 810 +RMD160 147e6cca005f9bd3d3ea8e7276af30bc317ca7e2 files/digest-kdelibs-3.5.2-r6 810 +SHA256 4fd83cc3e6a0521a0d7cf3b0d0ce0344830603682c7e5a11fda2350b35c40346 files/digest-kdelibs-3.5.2-r6 810 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEef0JAiZjviIA2XgRAh+lAKCFjlTvCA3CjWtFQ8ob4Qax2ZJScgCcDlXV +9Yue7cjtHHlgYXL96pVQrt0= +=lR+k +-----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r1 deleted file mode 100644 index ee6d024a8804..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3f5ffd972e6725f08012451fb0199073 kdelibs-3.4.1.tar.bz2 3751768 -RMD160 5d0be86cf984b1391793aa0798466c7fd43e9915 kdelibs-3.4.1.tar.bz2 3751768 -SHA256 ca329e3a039ee1b963f91bb62c0af42cf4bb9cdd181e49235506e0d40356cf2e kdelibs-3.4.1.tar.bz2 3751768 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r2 deleted file mode 100644 index ee6d024a8804..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3f5ffd972e6725f08012451fb0199073 kdelibs-3.4.1.tar.bz2 3751768 -RMD160 5d0be86cf984b1391793aa0798466c7fd43e9915 kdelibs-3.4.1.tar.bz2 3751768 -SHA256 ca329e3a039ee1b963f91bb62c0af42cf4bb9cdd181e49235506e0d40356cf2e kdelibs-3.4.1.tar.bz2 3751768 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.4.2 b/kde-base/kdelibs/files/digest-kdelibs-3.4.2 deleted file mode 100644 index 201200b561e9..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.4.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fe69f2f5c66dffd8fc741dcff221b80c kdelibs-3.4.2.tar.bz2 16878510 -RMD160 c418d9cd437db9c0f3fd3ef4653fd887c382cb56 kdelibs-3.4.2.tar.bz2 16878510 -SHA256 95e35aa3a36899728eabae0a90b1faded9033892fa51a2410a674fa245ffe08b kdelibs-3.4.2.tar.bz2 16878510 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.4.2-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.4.2-r1 deleted file mode 100644 index 201200b561e9..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.4.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fe69f2f5c66dffd8fc741dcff221b80c kdelibs-3.4.2.tar.bz2 16878510 -RMD160 c418d9cd437db9c0f3fd3ef4653fd887c382cb56 kdelibs-3.4.2.tar.bz2 16878510 -SHA256 95e35aa3a36899728eabae0a90b1faded9033892fa51a2410a674fa245ffe08b kdelibs-3.4.2.tar.bz2 16878510 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.4.3 b/kde-base/kdelibs/files/digest-kdelibs-3.4.3 deleted file mode 100644 index 4304e568f8c7..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.4.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 0cd7c0c8a81e5d11b91b407a4aaaf3ff kdelibs-3.4.3.tar.bz2 16877867 -RMD160 3bf89c0694f0fbabe46ae75d49f3eaf651fc2a90 kdelibs-3.4.3.tar.bz2 16877867 -SHA256 9da649b27e5b94ce932bb5da1fe6096b1230d82405564e62486ca4f68437df39 kdelibs-3.4.3.tar.bz2 16877867 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r2 deleted file mode 100644 index bdb95ed89968..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 15442103 -RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 kdelibs-3.5.2.tar.bz2 15442103 -SHA256 d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b kdelibs-3.5.2.tar.bz2 15442103 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r3 b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r3 deleted file mode 100644 index bdb95ed89968..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 15442103 -RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 kdelibs-3.5.2.tar.bz2 15442103 -SHA256 d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b kdelibs-3.5.2.tar.bz2 15442103 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r4 b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r4 deleted file mode 100644 index 0fc3cb73e025..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r4 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 15442103 -RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 kdelibs-3.5.2.tar.bz2 15442103 -SHA256 d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b kdelibs-3.5.2.tar.bz2 15442103 -MD5 97f0e949a2512e6f8b3b25303a0779f3 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 -RMD160 acd244fad5168ddf683dc988e7d51607641acd47 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 -SHA256 7d0fc597c9c3a9062cbbe38017907ec53b0d2ea1699402d35ab4b690c54f0876 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r5 b/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r5 deleted file mode 100644 index 0fc3cb73e025..000000000000 --- a/kde-base/kdelibs/files/digest-kdelibs-3.5.2-r5 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 367738696dc468859cf90d5a6e8f18a9 kdelibs-3.5.2.tar.bz2 15442103 -RMD160 29b4837837e68b47b74b2aefa4b29d2b9ad46414 kdelibs-3.5.2.tar.bz2 15442103 -SHA256 d0c252b7f14086f32e126761be55b6661dd9c9f7172f5eb369bd31c6ed19e14b kdelibs-3.5.2.tar.bz2 15442103 -MD5 97f0e949a2512e6f8b3b25303a0779f3 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 -RMD160 acd244fad5168ddf683dc988e7d51607641acd47 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 -SHA256 7d0fc597c9c3a9062cbbe38017907ec53b0d2ea1699402d35ab4b690c54f0876 kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 diff --git a/kde-base/kdelibs/files/kdelibs-3.4.1-kntlm.patch b/kde-base/kdelibs/files/kdelibs-3.4.1-kntlm.patch deleted file mode 100644 index 2d9c6859fba5..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.4.1-kntlm.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- kio/misc/kntlm/kntlm.cpp 2005/05/04 06:07:06 409205 -+++ kio/misc/kntlm/kntlm.cpp 2005/06/15 15:33:51 425786 -@@ -1,5 +1,5 @@ - /* This file is part of the KDE libraries -- Copyright (c) 2004 Szombathelyi György <gyurco@freemail.hu> -+ Copyright (c) 2004 Szombathelyi Gy�gy <gyurco@freemail.hu> - - The implementation is based on the documentation and sample code - at http://davenport.sourceforge.net/ntlm.html -@@ -77,10 +77,10 @@ - - void KNTLM::addBuf( QByteArray &buf, SecBuf &secbuf, QByteArray &data ) - { -- secbuf.offset = buf.size(); -+ secbuf.offset = (buf.size() + 1) & 0xfffffffe; - secbuf.len = data.size(); - secbuf.maxlen = data.size(); -- buf.resize( buf.size() + data.size() ); -+ buf.resize( secbuf.offset + data.size() ); - memcpy( buf.data() + secbuf.offset, data.data(), data.size() ); - } - -@@ -130,7 +130,7 @@ - ((Auth*) rbuf.data())->flags = ch->flags; - QByteArray targetInfo = getBuf( challenge, ch->targetInfo ); - -- if ( forceNTLMv2 || !targetInfo.isEmpty() /* may support NTLMv2 */ ) { -+ if ( forceNTLMv2 || (!targetInfo.isEmpty() && (ch->flags & Negotiate_Target_Info)) /* may support NTLMv2 */ ) { - if ( ch->flags & Negotiate_NTLM ) { - if ( targetInfo.isEmpty() ) return false; - response = getNTLMv2Response( dom, user, password, targetInfo, ch->challengeData ); diff --git a/kde-base/kdelibs/files/kdelibs-3.4.1-ktoolbar-crash.patch b/kde-base/kdelibs/files/kdelibs-3.4.1-ktoolbar-crash.patch deleted file mode 100644 index a2ee9ec7be00..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.4.1-ktoolbar-crash.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- kdeui/ktoolbar.cpp 2005/05/04 06:07:06 409205 -+++ kdeui/ktoolbar.cpp 2005/06/14 19:54:36 425455 -@@ -664,6 +664,11 @@ - - void KToolBar::clear () - { -+ /* Delete any idle buttons, so QToolBar doesn't delete them itself, making a mess */ -+ for(QWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next()) -+ w->blockSignals(false); -+ d->idleButtons.clear(); -+ - QToolBar::clear(); - widget2id.clear(); - id2widget.clear(); -Index: kdeui/ktoolbarbutton.h -=================================================================== ---- kdeui/ktoolbarbutton.h (revision 419598) -+++ kdeui/ktoolbarbutton.h (working copy) -@@ -311,6 +311,8 @@ - protected: - virtual void virtual_hook( int id, void* data ); - private: -+ friend class KToolBar; -+ void forceIconLoad(); - KToolBarButtonPrivate *d; - }; - -Index: kdeui/ktoolbar.cpp -=================================================================== ---- kdeui/ktoolbar.cpp (revision 425455) -+++ kdeui/ktoolbar.cpp (working copy) -@@ -704,6 +704,13 @@ - widget2id.remove( w ); - widgets.removeRef( w ); - - w->blockSignals(true); -+ /** -+ Ensure that the lazily removed buttons do not hang on to lazy icon loaders, -+ since their KInstance/KIconLoader may be destroyed -+ */ -+ if (KToolBarButton* button = ::qt_cast<KToolBarButton*>(w)) -+ button->forceIconLoad(); -+ - d->idleButtons.append(w); - layoutTimer->start( 50, true ); -Index: kdeui/ktoolbarbutton.cpp -=================================================================== ---- kdeui/ktoolbarbutton.cpp (revision 419598) -+++ kdeui/ktoolbarbutton.cpp (working copy) -@@ -290,6 +290,15 @@ - d->m_iconName, KIcon::Toolbar, d->m_iconSize )); - } - -+/* Internal hook for KToolBar's delayed removal anti-flicker hack -- force instantiation of the icon*/ -+void KToolBarButton::forceIconLoad() -+{ -+ bool wasLazyLoading = d->m_instance->iconLoader()->isDelayedIconSetLoadingEnabled(); -+ d->m_instance->iconLoader()->enableDelayedIconSetLoading(false); -+ setIcon(d->m_iconName); -+ d->m_instance->iconLoader()->enableDelayedIconSetLoading(wasLazyLoading); -+} -+ - void KToolBarButton::setIconSet( const QIconSet &iconset ) - { - QToolButton::setIconSet( iconset ); diff --git a/kde-base/kdelibs/files/kdelibs-3.4.2-gmail-fix.patch b/kde-base/kdelibs/files/kdelibs-3.4.2-gmail-fix.patch deleted file mode 100644 index 7f977661e716..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.4.2-gmail-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur kdelibs-3.4.2.orig/khtml/ecma/kjs_events.cpp kdelibs-3.4.2/khtml/ecma/kjs_events.cpp ---- kdelibs-3.4.2.orig/khtml/ecma/kjs_events.cpp 2005-05-23 14:16:24.000000000 +0200 -+++ kdelibs-3.4.2/khtml/ecma/kjs_events.cpp 2005-07-26 15:35:02.000000000 +0200 -@@ -635,6 +635,9 @@ - return Boolean(static_cast<DOM::MouseEvent>(event).metaKey()); - case Button: - { -+ if ( exec->interpreter()->compatMode() == Interpreter::NetscapeCompat ) { -+ return Number(static_cast<DOM::MouseEvent>(event).button()); -+ } - // Tricky. The DOM (and khtml) use 0 for LMB, 1 for MMB and 2 for RMB - // but MSIE uses 1=LMB, 2=RMB, 4=MMB, as a bitfield - int domButton = static_cast<DOM::MouseEvent>(event).button(); diff --git a/kde-base/kdelibs/files/kdelibs-3.5.2-kate-fixes-2.diff b/kde-base/kdelibs/files/kdelibs-3.5.2-kate-fixes-2.diff deleted file mode 100644 index a2abc7b1febf..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.5.2-kate-fixes-2.diff +++ /dev/null @@ -1,366 +0,0 @@ ---- kdelibs/kate/part/katedocument.cpp 2006/01/08 19:00:12 495724 -+++ kdelibs/kate/part/katedocument.cpp 2006/04/02 12:12:26 525537 -@@ -699,6 +699,10 @@ - - bool replacetabs = ( config()->configFlags() & KateDocumentConfig::cfReplaceTabsDyn && ! m_isInUndo ); - uint tw = config()->tabWidth(); -+ uint insertPosExpanded = insertPos; -+ KateTextLine::Ptr l = m_buffer->line( line ); -+ if (l != 0) -+ insertPosExpanded = l->cursorX( insertPos, tw ); - - for (uint pos = 0; pos < len; pos++) - { -@@ -706,28 +710,30 @@ - - if (ch == '\n') - { -+ editInsertText (line, insertPos, buf); -+ - if ( !blockwise ) - { -- editInsertText (line, insertPos, buf); - editWrapLine (line, insertPos + buf.length()); -+ insertPos = insertPosExpanded = 0; - } - else - { -- editInsertText (line, col, buf); -- - if ( line == lastLine() ) -- editWrapLine (line, col + buf.length()); -+ editWrapLine (line, insertPos + buf.length()); - } - - line++; -- insertPos = 0; - buf.truncate(0); -+ l = m_buffer->line( line ); -+ if (l) -+ insertPosExpanded = l->cursorX( insertPos, tw ); - } - else - { - if ( replacetabs && ch == '\t' ) - { -- uint tr = tw - ( ((blockwise?col:insertPos)+buf.length())%tw ); //### -+ uint tr = tw - ( insertPosExpanded+buf.length() )%tw; - for ( uint i=0; i < tr; i++ ) - buf += ' '; - } -@@ -736,10 +742,7 @@ - } - } - -- if ( !blockwise ) -- editInsertText (line, insertPos, buf); -- else -- editInsertText (line, col, buf); -+ editInsertText (line, insertPos, buf); - - editEnd (); - emit textInserted(line,insertPos); -@@ -3097,29 +3100,7 @@ - if (pos < 0 || pos >= (int)colX) - { - // only spaces on left side of cursor -- // search a line with less spaces -- int y = line; -- while (--y >= 0) -- { -- // this is save, y <= line, and line was already success -- textLine = m_buffer->plainLine(y); -- -- pos = textLine->firstChar(); -- -- if (pos >= 0) -- { -- pos = textLine->cursorX(pos, config()->tabWidth()); -- if (pos < (int)colX) -- { -- replaceWithOptimizedSpace(line, col, pos, config()->configFlags()); -- break; -- } -- } -- } -- if (y < 0) { -- // FIXME: what shoud we do in this case? -- removeText(line, 0, line, col+complement); -- } -+ indent( view, line, -1); - } - else - removeText(line, col-1, line, col+complement); ---- kdelibs/kate/data/ada.xml 2005/07/26 18:54:59 438982 -+++ kdelibs/kate/data/ada.xml 2006/04/01 13:39:45 525264 -@@ -73,14 +73,16 @@ - <context attribute="Normal Text" lineEndContext="#stay" name="Default"> - <RegExpr attribute="Keyword" context="#stay" String="if " insensitive="TRUE" beginRegion="Region1" firstNonSpace="true"/> - <StringDetect attribute="Keyword" context="#stay" String="end if" insensitive="TRUE" endRegion="Region1"/> -- <RegExpr attribute="Keyword" context="#stay" String="case " insensitive="TRUE" beginRegion="Region2" firstNonSpace="true"/> -- <StringDetect attribute="Keyword" context="#stay" String="end case" insensitive="TRUE" endRegion="Region2"/> - <RegExpr attribute="Keyword" context="#stay" String="\sloop\s+" insensitive="TRUE" beginRegion="Region3"/> - <RegExpr attribute="Keyword" context="#stay" String="\sloop$" insensitive="TRUE" beginRegion="Region3"/> - <StringDetect attribute="Keyword" context="#stay" String="end loop;" insensitive="TRUE" endRegion="Region3"/> - <RegExpr attribute="Keyword" context="#stay" String="\sselect\s+" insensitive="TRUE" beginRegion="Region4"/> - <RegExpr attribute="Keyword" context="#stay" String="\sselect$" insensitive="TRUE" beginRegion="Region4"/> - <StringDetect attribute="Keyword" context="#stay" String="end select;" insensitive="TRUE" endRegion="Region4"/> -+ <RegExpr attribute="Keyword" context="#stay" String="\b(begin|case|record)\b" insensitive="true" beginRegion="Region5"/> -+ <RegExpr attribute="Keyword" context="#stay" String="\bend(?=((\{[^}]*(\}|$)|\(\*.*(\*\)|$))*)([.;\s]|$)|//|$)" insensitive="true" endRegion="Region5"/> -+ <StringDetect attribute="Region Marker" context="Region Marker" String="-- BEGIN" beginRegion="RegionMarker" firstNonSpace="true" /> -+ <StringDetect attribute="Region Marker" context="Region Marker" String="-- END" endRegion="RegionMarker" firstNonSpace="true" /> - <keyword attribute="Keyword" context="#stay" String="keywords"/> - <Float attribute="Float" context="#stay"/> - <Int attribute="Decimal" context="#stay"/> -@@ -88,6 +90,7 @@ - <DetectChar attribute="String" context="String" char="""/> - <Detect2Chars attribute="Comment" context="Comment" char="-" char1="-"/> - </context> -+ <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker"/> - <context attribute="String" lineEndContext="#pop" name="String"> - <DetectChar attribute="String" context="#pop" char="""/> - </context> -@@ -102,6 +105,7 @@ - <itemData name="Char" defStyleNum="dsChar" /> - <itemData name="String" defStyleNum="dsString" /> - <itemData name="Comment" defStyleNum="dsComment" /> -+ <itemData name="Region Marker" defStyleNum="dsRegionMarker" /> - </itemDatas> - </highlighting> - <general> ---- kdelibs/kate/data/cpp.xml 2006/01/02 21:02:02 493660 -+++ kdelibs/kate/data/cpp.xml 2006/04/01 13:39:45 525264 -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE language SYSTEM "language.dtd"> --<language name="C++" version="1.34" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9"> -+<language name="C++" version="1.36" kateversion="2.4" section="Sources" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9"> - <highlighting> - <list name="keywords"> - <item> asm </item> -@@ -31,6 +31,7 @@ - <item> private </item> - <item> protected </item> - <item> public </item> -+ <item> qobject_cast </item> - <item> reinterpret_cast </item> - <item> return </item> - <item> sizeof </item> -@@ -79,6 +80,33 @@ - <item> Q_OVERRIDE </item> - <item> Q_PROPERTY </item> - <item> Q_SETS </item> -+ <item> Q_SIGNALS </item> -+ <item> Q_SLOTS </item> -+ <item> Q_FOREACH </item> -+ <item> Q_DECLARE_FLAGS </item> -+ <item> Q_INIT_RESOURCE </item> -+ <item> Q_CLEANUP_RESOURCE </item> -+ <item> Q_GLOBAL_STATIC </item> -+ <item> Q_GLOBAL_STATIC_WITH_ARGS </item> -+ <item> Q_DECLARE_TYPEINFO </item> -+ <item> Q_DECLARE_SHARED </item> -+ <item> Q_DECLARE_FLAGS </item> -+ <item> Q_DECLARE_OPERATORS_FOR_FLAGS </item> -+ <item> Q_FOREVER </item> -+ <item> Q_DECLARE_PRIVATE </item> -+ <item> Q_DECLARE_PUBLIC </item> -+ <item> Q_D </item> -+ <item> Q_Q </item> -+ <item> Q_DISABLE_COPY </item> -+ <item> Q_INTERFACES </item> -+ <item> Q_FLAGS </item> -+ <item> Q_SCRIPTABLE </item> -+ <item> Q_INVOKABLE </item> -+ <item> Q_GADGET </item> -+ <item> Q_ARG </item> -+ <item> Q_RETURN_ARG </item> -+ <item> Q_ASSERT </item> -+ <item> Q_ASSERT_X </item> - <item> TRUE </item> - <item> FALSE </item> - <item> connect </item> -@@ -87,6 +115,7 @@ - <item> signals </item> - <item> slots </item> - <item> foreach </item> -+ <item> forever </item> - </list> - <list name="types"> - <item> auto </item> ---- kdelibs/kate/data/logtalk.xml 2005/07/26 18:54:59 438982 -+++ kdelibs/kate/data/logtalk.xml 2006/04/01 13:39:45 525264 -@@ -1,7 +1,7 @@ - <?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE language SYSTEM "language.dtd"> - --<language name="Logtalk" version="1.40" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0"> -+<language name="Logtalk" version="1.51" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0"> - - <highlighting> - -@@ -17,11 +17,11 @@ - <!-- Reflection --> - <RegExpr String = "\b(current_predicate|predicate_property)(?=[(])" attribute = "Built-in" context = "#stay" /> - <!-- DCGs --> -- <RegExpr String = "\b(expand_term|phrase)(?=[(])" attribute = "Built-in" context = "#stay" /> -+ <RegExpr String = "\b(expand_term|term_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" /> - <!-- Entity --> - <RegExpr String = "\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\b(object|protocol|category)_property(?=[(])" attribute = "Built-in" context = "#stay" /> -- <!-- Event handlers --> -+ <!-- Entity relations --> - <RegExpr String = "\bextends_(object|protocol)(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\bimplements_protocol(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\b(instantiates|specializes)_class(?=[(])" attribute = "Built-in" context = "#stay" /> -@@ -48,7 +48,7 @@ - <RegExpr String = "\b(rem|mod|abs|sign)(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\bfloat(_(integer|fractional)_part)?(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\b(floor|truncate|round|ceiling)(?=[(])" attribute = "Built-in" context = "#stay" /> -- <!-- Other arithemtic functors --> -+ <!-- Other arithmetic functors --> - <RegExpr String = "\b(cos|atan|exp|log|s(in|qrt))(?=[(])" attribute = "Built-in" context = "#stay" /> - <!-- Term testing --> - <RegExpr String = "\b(var|atom(ic)?|integer|float|compound|n(onvar|umber))(?=[(])" attribute = "Built-in" context = "#stay" /> -@@ -149,15 +149,16 @@ - <!-- Entity directives --> - <RegExpr String = "\b(category|object|protocol)(?=[(])" attribute = "Directive" context = "entityrelations" beginRegion = "Entity"/> - <RegExpr String = "\bend_(category|object|protocol)[.]" attribute = "Directive" context = "#pop" endRegion = "Entity" /> -+ <RegExpr String = "\bmodule(?=[(])" attribute = "Directive" context = "#pop"/> - <!-- Predicate scope directives --> - <RegExpr String = "\bp(ublic|r(otected|ivate))(?=[(])" attribute = "Directive" context = "#pop" /> - <!-- Other directives --> -- <RegExpr String = "\bencoding(?=[(])" attribute = "Directive" context = "#pop" /> -+ <RegExpr String = "\be(ncoding|xport)(?=[(])" attribute = "Directive" context = "#pop" /> - <RegExpr String = "\bin(fo|itialization)(?=[(])" attribute = "Directive" context = "#pop" /> - <RegExpr String = "\bdynamic[.]" attribute = "Directive" context = "#pop" /> -- <RegExpr String = "\b(alias|d(ynamic|iscontiguous)|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" /> -+ <RegExpr String = "\b(alias|d(ynamic|iscontiguous)|meta_predicate|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" /> - <RegExpr String = "\bop(?=[(])" attribute = "Directive" context = "#pop" /> -- <RegExpr String = "\b(calls|uses)(?=[(])" attribute = "Directive" context = "#pop" /> -+ <RegExpr String = "\b(calls|use(s|_module))(?=[(])" attribute = "Directive" context = "#pop" /> - </context> - - <context name = "entityrelations" attribute = "Normal" lineEndContext = "#stay" > ---- kdelibs/kate/data/lua.xml 2005/07/26 18:54:59 438982 -+++ kdelibs/kate/data/lua.xml 2006/04/01 13:39:45 525264 -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE language SYSTEM "language.dtd"> --<language name="Lua" version="0.22" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua"> -+<language name="Lua" version="0.23" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua"> - <highlighting> - <list name="keywords"> - <item> and </item> -@@ -19,7 +19,7 @@ - <item> else </item> - <item> or </item> - <item> while </item> -- <item> elsif </item> -+ <item> elseif </item> - <item> in </item> - <item> repeat </item> - </list> ---- kdelibs/kate/data/php.xml 2005/09/29 19:26:30 465432 -+++ kdelibs/kate/data/php.xml 2006/04/01 13:39:45 525264 -@@ -1,6 +1,12 @@ - <?xml version="1.0" encoding="UTF-8"?> -+<!-- -+ Changes: version 1.25 -> 1.26 -+ Date: 26/01/2006 -+ Change author: Nicola Gigante -+ Added alternative syntax control structures and named logical operators (and or xor) -+--> - <!DOCTYPE language SYSTEM "language.dtd"> --<language name="PHP/PHP" version="1.25" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true"> -+<language name="PHP/PHP" version="1.26" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true"> - <highlighting> - <list name="control structures"> - <item>as</item> -@@ -21,6 +27,11 @@ - <item>include</item> - <item>require_once</item> - <item>include_once</item> -+ <item>endif</item> -+ <item>endwhile</item> -+ <item>endfor</item> -+ <item>endforeach</item> -+ <item>endswitch</item> - </list> - <list name="keywords"> - <item> abstract </item> -@@ -42,6 +53,9 @@ - <item> public </item> - <item> throw </item> - <item> try </item> -+ <item> and </item> -+ <item> or </item> -+ <item> xor </item> - <item> var </item> - <item> __FILE__ </item> - <item> __LINE__ </item> ---- kdelibs/kate/data/ruby.xml 2006/02/14 17:22:27 509424 -+++ kdelibs/kate/data/ruby.xml 2006/03/28 19:38:13 523673 -@@ -34,7 +34,7 @@ - --> - - <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". --> --<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi)" license="LGPL"> -+<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rjs;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi)" license="LGPL"> - - <highlighting> - ---- kdelibs/kate/part/katedialogs.cpp 2005/12/26 02:23:26 491408 -+++ kdelibs/kate/part/katedialogs.cpp 2006/04/06 12:43:37 526985 -@@ -1634,7 +1634,7 @@ - // Start a KProcess that creates a diff - KProcIO *p = new KProcIO(); - p->setComm( KProcess::All ); -- *p << "diff" << "-ub" << "-" << m_doc->url().path(); -+ *p << "diff" << "-u" << "-" << m_doc->url().path(); - connect( p, SIGNAL(processExited(KProcess*)), this, SLOT(slotPDone(KProcess*)) ); - connect( p, SIGNAL(readReady(KProcIO*)), this, SLOT(slotPRead(KProcIO*)) ); - -@@ -1644,7 +1644,7 @@ - - uint lastln = m_doc->numLines(); - for ( uint l = 0; l < lastln; l++ ) -- p->writeStdin( m_doc->textLine( l ), l < lastln ); -+ p->writeStdin( m_doc->textLine( l ) ); - - p->closeWhenDone(); - } -@@ -1656,15 +1656,32 @@ - m_tmpfile = new KTempFile(); - // put all the data we have in it - QString stmp; -+ bool dataRead = false; - while ( p->readln( stmp, false ) > -1 ) -+ { - *m_tmpfile->textStream() << stmp << endl; -+ dataRead = true; -+ } - -- p->ackRead(); -+ // dominik: only ackRead(), when we *really* read data, otherwise, this slot -+ // is called initity times, which leads to a crash -+ if( dataRead ) -+ p->ackRead(); - } - - void KateModOnHdPrompt::slotPDone( KProcess *p ) - { - setCursor( ArrowCursor ); -+ if( ! m_tmpfile ) -+ { -+ // dominik: there were only whitespace changes, so that the diff returned by -+ // diff(1) has 0 bytes. So slotPRead() is never called, as there is -+ // no data, so that m_tmpfile was never created and thus is NULL. -+ // NOTE: would be nice, if we could produce a fake-diff, so that kompare -+ // tells us "The files are identical". Right now, we get an ugly -+ // "Could not parse diff output". -+ m_tmpfile = new KTempFile(); -+ } - m_tmpfile->close(); - - if ( ! p->normalExit() /*|| p->exitStatus()*/ ) diff --git a/kde-base/kdelibs/files/kdelibs-3.5.2-kate-fixes.diff b/kde-base/kdelibs/files/kdelibs-3.5.2-kate-fixes.diff deleted file mode 100644 index 8b528566b784..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.5.2-kate-fixes.diff +++ /dev/null @@ -1,312 +0,0 @@ ---- kdelibs/kate/part/katedocument.cpp 2006/01/08 19:00:12 495724 -+++ kdelibs/kate/part/katedocument.cpp 2006/04/02 12:12:26 525537 -@@ -699,6 +699,10 @@ - - bool replacetabs = ( config()->configFlags() & KateDocumentConfig::cfReplaceTabsDyn && ! m_isInUndo ); - uint tw = config()->tabWidth(); -+ uint insertPosExpanded = insertPos; -+ KateTextLine::Ptr l = m_buffer->line( line ); -+ if (l != 0) -+ insertPosExpanded = l->cursorX( insertPos, tw ); - - for (uint pos = 0; pos < len; pos++) - { -@@ -706,28 +710,30 @@ - - if (ch == '\n') - { -+ editInsertText (line, insertPos, buf); -+ - if ( !blockwise ) - { -- editInsertText (line, insertPos, buf); - editWrapLine (line, insertPos + buf.length()); -+ insertPos = insertPosExpanded = 0; - } - else - { -- editInsertText (line, col, buf); -- - if ( line == lastLine() ) -- editWrapLine (line, col + buf.length()); -+ editWrapLine (line, insertPos + buf.length()); - } - - line++; -- insertPos = 0; - buf.truncate(0); -+ l = m_buffer->line( line ); -+ if (l) -+ insertPosExpanded = l->cursorX( insertPos, tw ); - } - else - { - if ( replacetabs && ch == '\t' ) - { -- uint tr = tw - ( ((blockwise?col:insertPos)+buf.length())%tw ); //### -+ uint tr = tw - ( insertPosExpanded+buf.length() )%tw; - for ( uint i=0; i < tr; i++ ) - buf += ' '; - } -@@ -736,10 +742,7 @@ - } - } - -- if ( !blockwise ) -- editInsertText (line, insertPos, buf); -- else -- editInsertText (line, col, buf); -+ editInsertText (line, insertPos, buf); - - editEnd (); - emit textInserted(line,insertPos); -@@ -3097,29 +3100,7 @@ - if (pos < 0 || pos >= (int)colX) - { - // only spaces on left side of cursor -- // search a line with less spaces -- int y = line; -- while (--y >= 0) -- { -- // this is save, y <= line, and line was already success -- textLine = m_buffer->plainLine(y); -- -- pos = textLine->firstChar(); -- -- if (pos >= 0) -- { -- pos = textLine->cursorX(pos, config()->tabWidth()); -- if (pos < (int)colX) -- { -- replaceWithOptimizedSpace(line, col, pos, config()->configFlags()); -- break; -- } -- } -- } -- if (y < 0) { -- // FIXME: what shoud we do in this case? -- removeText(line, 0, line, col+complement); -- } -+ indent( view, line, -1); - } - else - removeText(line, col-1, line, col+complement); ---- kdelibs/kate/data/ada.xml 2005/07/26 18:54:59 438982 -+++ kdelibs/kate/data/ada.xml 2006/04/01 13:39:45 525264 -@@ -73,14 +73,16 @@ - <context attribute="Normal Text" lineEndContext="#stay" name="Default"> - <RegExpr attribute="Keyword" context="#stay" String="if " insensitive="TRUE" beginRegion="Region1" firstNonSpace="true"/> - <StringDetect attribute="Keyword" context="#stay" String="end if" insensitive="TRUE" endRegion="Region1"/> -- <RegExpr attribute="Keyword" context="#stay" String="case " insensitive="TRUE" beginRegion="Region2" firstNonSpace="true"/> -- <StringDetect attribute="Keyword" context="#stay" String="end case" insensitive="TRUE" endRegion="Region2"/> - <RegExpr attribute="Keyword" context="#stay" String="\sloop\s+" insensitive="TRUE" beginRegion="Region3"/> - <RegExpr attribute="Keyword" context="#stay" String="\sloop$" insensitive="TRUE" beginRegion="Region3"/> - <StringDetect attribute="Keyword" context="#stay" String="end loop;" insensitive="TRUE" endRegion="Region3"/> - <RegExpr attribute="Keyword" context="#stay" String="\sselect\s+" insensitive="TRUE" beginRegion="Region4"/> - <RegExpr attribute="Keyword" context="#stay" String="\sselect$" insensitive="TRUE" beginRegion="Region4"/> - <StringDetect attribute="Keyword" context="#stay" String="end select;" insensitive="TRUE" endRegion="Region4"/> -+ <RegExpr attribute="Keyword" context="#stay" String="\b(begin|case|record)\b" insensitive="true" beginRegion="Region5"/> -+ <RegExpr attribute="Keyword" context="#stay" String="\bend(?=((\{[^}]*(\}|$)|\(\*.*(\*\)|$))*)([.;\s]|$)|//|$)" insensitive="true" endRegion="Region5"/> -+ <StringDetect attribute="Region Marker" context="Region Marker" String="-- BEGIN" beginRegion="RegionMarker" firstNonSpace="true" /> -+ <StringDetect attribute="Region Marker" context="Region Marker" String="-- END" endRegion="RegionMarker" firstNonSpace="true" /> - <keyword attribute="Keyword" context="#stay" String="keywords"/> - <Float attribute="Float" context="#stay"/> - <Int attribute="Decimal" context="#stay"/> -@@ -88,6 +90,7 @@ - <DetectChar attribute="String" context="String" char="""/> - <Detect2Chars attribute="Comment" context="Comment" char="-" char1="-"/> - </context> -+ <context attribute="Region Marker" lineEndContext="#pop" name="Region Marker"/> - <context attribute="String" lineEndContext="#pop" name="String"> - <DetectChar attribute="String" context="#pop" char="""/> - </context> -@@ -102,6 +105,7 @@ - <itemData name="Char" defStyleNum="dsChar" /> - <itemData name="String" defStyleNum="dsString" /> - <itemData name="Comment" defStyleNum="dsComment" /> -+ <itemData name="Region Marker" defStyleNum="dsRegionMarker" /> - </itemDatas> - </highlighting> - <general> ---- kdelibs/kate/data/cpp.xml 2006/01/02 21:02:02 493660 -+++ kdelibs/kate/data/cpp.xml 2006/04/01 13:39:45 525264 -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE language SYSTEM "language.dtd"> --<language name="C++" version="1.34" kateversion="2.4" section="Sources" extensions="*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9"> -+<language name="C++" version="1.36" kateversion="2.4" section="Sources" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9"> - <highlighting> - <list name="keywords"> - <item> asm </item> -@@ -31,6 +31,7 @@ - <item> private </item> - <item> protected </item> - <item> public </item> -+ <item> qobject_cast </item> - <item> reinterpret_cast </item> - <item> return </item> - <item> sizeof </item> -@@ -79,6 +80,33 @@ - <item> Q_OVERRIDE </item> - <item> Q_PROPERTY </item> - <item> Q_SETS </item> -+ <item> Q_SIGNALS </item> -+ <item> Q_SLOTS </item> -+ <item> Q_FOREACH </item> -+ <item> Q_DECLARE_FLAGS </item> -+ <item> Q_INIT_RESOURCE </item> -+ <item> Q_CLEANUP_RESOURCE </item> -+ <item> Q_GLOBAL_STATIC </item> -+ <item> Q_GLOBAL_STATIC_WITH_ARGS </item> -+ <item> Q_DECLARE_TYPEINFO </item> -+ <item> Q_DECLARE_SHARED </item> -+ <item> Q_DECLARE_FLAGS </item> -+ <item> Q_DECLARE_OPERATORS_FOR_FLAGS </item> -+ <item> Q_FOREVER </item> -+ <item> Q_DECLARE_PRIVATE </item> -+ <item> Q_DECLARE_PUBLIC </item> -+ <item> Q_D </item> -+ <item> Q_Q </item> -+ <item> Q_DISABLE_COPY </item> -+ <item> Q_INTERFACES </item> -+ <item> Q_FLAGS </item> -+ <item> Q_SCRIPTABLE </item> -+ <item> Q_INVOKABLE </item> -+ <item> Q_GADGET </item> -+ <item> Q_ARG </item> -+ <item> Q_RETURN_ARG </item> -+ <item> Q_ASSERT </item> -+ <item> Q_ASSERT_X </item> - <item> TRUE </item> - <item> FALSE </item> - <item> connect </item> -@@ -87,6 +115,7 @@ - <item> signals </item> - <item> slots </item> - <item> foreach </item> -+ <item> forever </item> - </list> - <list name="types"> - <item> auto </item> ---- kdelibs/kate/data/logtalk.xml 2005/07/26 18:54:59 438982 -+++ kdelibs/kate/data/logtalk.xml 2006/04/01 13:39:45 525264 -@@ -1,7 +1,7 @@ - <?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE language SYSTEM "language.dtd"> - --<language name="Logtalk" version="1.40" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0"> -+<language name="Logtalk" version="1.51" kateversion="2.4" section="Sources" extensions="*.lgt;*.config" mimetype="text/x-logtalk" author="Paulo Moura (pmoura@logtalk.org)" license="Artistic License 2.0"> - - <highlighting> - -@@ -17,11 +17,11 @@ - <!-- Reflection --> - <RegExpr String = "\b(current_predicate|predicate_property)(?=[(])" attribute = "Built-in" context = "#stay" /> - <!-- DCGs --> -- <RegExpr String = "\b(expand_term|phrase)(?=[(])" attribute = "Built-in" context = "#stay" /> -+ <RegExpr String = "\b(expand_term|term_expansion|phrase)(?=[(])" attribute = "Built-in" context = "#stay" /> - <!-- Entity --> - <RegExpr String = "\b(abolish|c(reate|urrent))_(object|protocol|category)(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\b(object|protocol|category)_property(?=[(])" attribute = "Built-in" context = "#stay" /> -- <!-- Event handlers --> -+ <!-- Entity relations --> - <RegExpr String = "\bextends_(object|protocol)(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\bimplements_protocol(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\b(instantiates|specializes)_class(?=[(])" attribute = "Built-in" context = "#stay" /> -@@ -48,7 +48,7 @@ - <RegExpr String = "\b(rem|mod|abs|sign)(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\bfloat(_(integer|fractional)_part)?(?=[(])" attribute = "Built-in" context = "#stay" /> - <RegExpr String = "\b(floor|truncate|round|ceiling)(?=[(])" attribute = "Built-in" context = "#stay" /> -- <!-- Other arithemtic functors --> -+ <!-- Other arithmetic functors --> - <RegExpr String = "\b(cos|atan|exp|log|s(in|qrt))(?=[(])" attribute = "Built-in" context = "#stay" /> - <!-- Term testing --> - <RegExpr String = "\b(var|atom(ic)?|integer|float|compound|n(onvar|umber))(?=[(])" attribute = "Built-in" context = "#stay" /> -@@ -149,15 +149,16 @@ - <!-- Entity directives --> - <RegExpr String = "\b(category|object|protocol)(?=[(])" attribute = "Directive" context = "entityrelations" beginRegion = "Entity"/> - <RegExpr String = "\bend_(category|object|protocol)[.]" attribute = "Directive" context = "#pop" endRegion = "Entity" /> -+ <RegExpr String = "\bmodule(?=[(])" attribute = "Directive" context = "#pop"/> - <!-- Predicate scope directives --> - <RegExpr String = "\bp(ublic|r(otected|ivate))(?=[(])" attribute = "Directive" context = "#pop" /> - <!-- Other directives --> -- <RegExpr String = "\bencoding(?=[(])" attribute = "Directive" context = "#pop" /> -+ <RegExpr String = "\be(ncoding|xport)(?=[(])" attribute = "Directive" context = "#pop" /> - <RegExpr String = "\bin(fo|itialization)(?=[(])" attribute = "Directive" context = "#pop" /> - <RegExpr String = "\bdynamic[.]" attribute = "Directive" context = "#pop" /> -- <RegExpr String = "\b(alias|d(ynamic|iscontiguous)|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" /> -+ <RegExpr String = "\b(alias|d(ynamic|iscontiguous)|meta_predicate|m(etapredicate|ode|ultifile))(?=[(])" attribute = "Directive" context = "#pop" /> - <RegExpr String = "\bop(?=[(])" attribute = "Directive" context = "#pop" /> -- <RegExpr String = "\b(calls|uses)(?=[(])" attribute = "Directive" context = "#pop" /> -+ <RegExpr String = "\b(calls|use(s|_module))(?=[(])" attribute = "Directive" context = "#pop" /> - </context> - - <context name = "entityrelations" attribute = "Normal" lineEndContext = "#stay" > ---- kdelibs/kate/data/lua.xml 2005/07/26 18:54:59 438982 -+++ kdelibs/kate/data/lua.xml 2006/04/01 13:39:45 525264 -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="UTF-8"?> - <!DOCTYPE language SYSTEM "language.dtd"> --<language name="Lua" version="0.22" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua"> -+<language name="Lua" version="0.23" kateversion="2.3" section="Scripts" extensions="*.lua" mimetype="text/x-lua"> - <highlighting> - <list name="keywords"> - <item> and </item> -@@ -19,7 +19,7 @@ - <item> else </item> - <item> or </item> - <item> while </item> -- <item> elsif </item> -+ <item> elseif </item> - <item> in </item> - <item> repeat </item> - </list> ---- kdelibs/kate/data/php.xml 2005/09/29 19:26:30 465432 -+++ kdelibs/kate/data/php.xml 2006/04/01 13:39:45 525264 -@@ -1,6 +1,12 @@ - <?xml version="1.0" encoding="UTF-8"?> -+<!-- -+ Changes: version 1.25 -> 1.26 -+ Date: 26/01/2006 -+ Change author: Nicola Gigante -+ Added alternative syntax control structures and named logical operators (and or xor) -+--> - <!DOCTYPE language SYSTEM "language.dtd"> --<language name="PHP/PHP" version="1.25" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true"> -+<language name="PHP/PHP" version="1.26" kateversion="2.4" section="Scripts" extensions="" priority="5" mimetype="" hidden="true"> - <highlighting> - <list name="control structures"> - <item>as</item> -@@ -21,6 +27,11 @@ - <item>include</item> - <item>require_once</item> - <item>include_once</item> -+ <item>endif</item> -+ <item>endwhile</item> -+ <item>endfor</item> -+ <item>endforeach</item> -+ <item>endswitch</item> - </list> - <list name="keywords"> - <item> abstract </item> -@@ -42,6 +53,9 @@ - <item> public </item> - <item> throw </item> - <item> try </item> -+ <item> and </item> -+ <item> or </item> -+ <item> xor </item> - <item> var </item> - <item> __FILE__ </item> - <item> __LINE__ </item> ---- kdelibs/kate/data/ruby.xml 2006/02/14 17:22:27 509424 -+++ kdelibs/kate/data/ruby.xml 2006/03/28 19:38:13 523673 -@@ -34,7 +34,7 @@ - --> - - <!-- Hold the "language" opening tag on a single line, as mentioned in "language.dtd". --> --<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi)" license="LGPL"> -+<language name="Ruby" version="1.17" kateversion="2.4" section="Scripts" extensions="*.rb;*.rjs;*.rxml" mimetype="application/x-ruby" author="Stefan Lang (langstefan@gmx.at), Sebastian Vuorinen (sebastian.vuorinen@helsinki.fi)" license="LGPL"> - - <highlighting> - diff --git a/kde-base/kdelibs/files/kdelibs-3.5.2-kio-errror-handling.diff b/kde-base/kdelibs/files/kdelibs-3.5.2-kio-errror-handling.diff deleted file mode 100644 index b9a085aa8239..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.5.2-kio-errror-handling.diff +++ /dev/null @@ -1,87 +0,0 @@ ---- kdelibs/kio/kio/job.cpp 2006/02/27 23:07:01 514315 -+++ kdelibs/kio/kio/job.cpp 2006/03/24 13:29:00 522108 -@@ -2786,7 +2786,7 @@ - { - m_conflictError = job->error(); - if ( (m_conflictError == ERR_DIR_ALREADY_EXIST) -- || (m_conflictError == ERR_FILE_ALREADY_EXIST) ) -+ || (m_conflictError == ERR_FILE_ALREADY_EXIST) ) // can't happen? - { - KURL oldURL = ((SimpleJob*)job)->url(); - // Should we skip automatically ? -@@ -3050,7 +3050,8 @@ - m_conflictError = job->error(); // save for later - // Existing dest ? - if ( ( m_conflictError == ERR_FILE_ALREADY_EXIST ) -- || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) ) -+ || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) -+ || ( m_conflictError == ERR_IDENTICAL_FILES ) ) - { - subjobs.remove( job ); - assert ( subjobs.isEmpty() ); -@@ -3132,7 +3133,8 @@ - m_reportTimer->stop(); - - if ( ( m_conflictError == ERR_FILE_ALREADY_EXIST ) -- || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) ) -+ || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) -+ || ( m_conflictError == ERR_IDENTICAL_FILES ) ) - { - // Its modification time: - time_t destmtime = (time_t)-1; -@@ -3161,6 +3163,7 @@ - // Offer overwrite only if the existing thing is a file - // If src==dest, use "overwrite-itself" - RenameDlg_Mode mode; -+ bool isDir = true; - - if( m_conflictError == ERR_DIR_ALREADY_EXIST ) - mode = (RenameDlg_Mode) 0; -@@ -3172,6 +3175,7 @@ - mode = M_OVERWRITE_ITSELF; - else - mode = M_OVERWRITE; -+ isDir = false; - } - - if ( m_bSingleFileCopy ) -@@ -3179,7 +3183,7 @@ - else - mode = (RenameDlg_Mode) ( mode | M_MULTI | M_SKIP ); - -- res = Observer::self()->open_RenameDlg( this, m_conflictError == ERR_FILE_ALREADY_EXIST ? -+ res = Observer::self()->open_RenameDlg( this, !isDir ? - i18n("File Already Exists") : i18n("Already Exists as Folder"), - (*it).uSource.url(), - (*it).uDest.url(), -@@ -3602,7 +3606,9 @@ - // In that case it's the _same_ dir, we don't want to copy+del (data loss!) - if ( m_currentSrcURL.isLocalFile() && m_currentSrcURL.url(-1) != dest.url(-1) && - m_currentSrcURL.url(-1).lower() == dest.url(-1).lower() && -- ( err == ERR_FILE_ALREADY_EXIST || err == ERR_DIR_ALREADY_EXIST ) ) -+ ( err == ERR_FILE_ALREADY_EXIST || -+ err == ERR_DIR_ALREADY_EXIST || -+ err == ERR_IDENTICAL_FILES ) ) - { - kdDebug(7007) << "Couldn't rename directly, dest already exists. Detected special case of lower/uppercase renaming in same dir, try with 2 rename calls" << endl; - QCString _src( QFile::encodeName(m_currentSrcURL.path()) ); -@@ -3643,7 +3649,9 @@ - Q_ASSERT( m_currentSrcURL == *m_currentStatSrc ); - - // Existing dest? -- if ( ( err == ERR_DIR_ALREADY_EXIST || err == ERR_FILE_ALREADY_EXIST ) -+ if ( ( err == ERR_DIR_ALREADY_EXIST || -+ err == ERR_FILE_ALREADY_EXIST || -+ err == ERR_IDENTICAL_FILES ) - && isInteractive() ) - { - if (m_reportTimer) -@@ -3693,7 +3701,7 @@ - - RenameDlg_Result r = Observer::self()->open_RenameDlg( - this, -- err == ERR_FILE_ALREADY_EXIST ? i18n("File Already Exists") : i18n("Already Exists as Folder"), -+ err != ERR_DIR_ALREADY_EXIST ? i18n("File Already Exists") : i18n("Already Exists as Folder"), - m_currentSrcURL.url(), - dest.url(), - mode, newPath, diff --git a/kde-base/kdelibs/files/kdelibs-3.5.2-kio-fixes.diff b/kde-base/kdelibs/files/kdelibs-3.5.2-kio-fixes.diff deleted file mode 100644 index 54df574a23d2..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.5.2-kio-fixes.diff +++ /dev/null @@ -1,177 +0,0 @@ ---- kdelibs/kio/kio/job.cpp 2006/02/27 23:07:01 514315 -+++ kdelibs/kio/kio/job.cpp 2006/03/24 13:29:00 522108 -@@ -2786,7 +2786,7 @@ - { - m_conflictError = job->error(); - if ( (m_conflictError == ERR_DIR_ALREADY_EXIST) -- || (m_conflictError == ERR_FILE_ALREADY_EXIST) ) -+ || (m_conflictError == ERR_FILE_ALREADY_EXIST) ) // can't happen? - { - KURL oldURL = ((SimpleJob*)job)->url(); - // Should we skip automatically ? -@@ -3050,7 +3050,8 @@ - m_conflictError = job->error(); // save for later - // Existing dest ? - if ( ( m_conflictError == ERR_FILE_ALREADY_EXIST ) -- || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) ) -+ || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) -+ || ( m_conflictError == ERR_IDENTICAL_FILES ) ) - { - subjobs.remove( job ); - assert ( subjobs.isEmpty() ); -@@ -3132,7 +3133,8 @@ - m_reportTimer->stop(); - - if ( ( m_conflictError == ERR_FILE_ALREADY_EXIST ) -- || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) ) -+ || ( m_conflictError == ERR_DIR_ALREADY_EXIST ) -+ || ( m_conflictError == ERR_IDENTICAL_FILES ) ) - { - // Its modification time: - time_t destmtime = (time_t)-1; -@@ -3161,6 +3163,7 @@ - // Offer overwrite only if the existing thing is a file - // If src==dest, use "overwrite-itself" - RenameDlg_Mode mode; -+ bool isDir = true; - - if( m_conflictError == ERR_DIR_ALREADY_EXIST ) - mode = (RenameDlg_Mode) 0; -@@ -3172,6 +3175,7 @@ - mode = M_OVERWRITE_ITSELF; - else - mode = M_OVERWRITE; -+ isDir = false; - } - - if ( m_bSingleFileCopy ) -@@ -3179,7 +3183,7 @@ - else - mode = (RenameDlg_Mode) ( mode | M_MULTI | M_SKIP ); - -- res = Observer::self()->open_RenameDlg( this, m_conflictError == ERR_FILE_ALREADY_EXIST ? -+ res = Observer::self()->open_RenameDlg( this, !isDir ? - i18n("File Already Exists") : i18n("Already Exists as Folder"), - (*it).uSource.url(), - (*it).uDest.url(), -@@ -3602,7 +3606,9 @@ - // In that case it's the _same_ dir, we don't want to copy+del (data loss!) - if ( m_currentSrcURL.isLocalFile() && m_currentSrcURL.url(-1) != dest.url(-1) && - m_currentSrcURL.url(-1).lower() == dest.url(-1).lower() && -- ( err == ERR_FILE_ALREADY_EXIST || err == ERR_DIR_ALREADY_EXIST ) ) -+ ( err == ERR_FILE_ALREADY_EXIST || -+ err == ERR_DIR_ALREADY_EXIST || -+ err == ERR_IDENTICAL_FILES ) ) - { - kdDebug(7007) << "Couldn't rename directly, dest already exists. Detected special case of lower/uppercase renaming in same dir, try with 2 rename calls" << endl; - QCString _src( QFile::encodeName(m_currentSrcURL.path()) ); -@@ -3643,7 +3649,9 @@ - Q_ASSERT( m_currentSrcURL == *m_currentStatSrc ); - - // Existing dest? -- if ( ( err == ERR_DIR_ALREADY_EXIST || err == ERR_FILE_ALREADY_EXIST ) -+ if ( ( err == ERR_DIR_ALREADY_EXIST || -+ err == ERR_FILE_ALREADY_EXIST || -+ err == ERR_IDENTICAL_FILES ) - && isInteractive() ) - { - if (m_reportTimer) -@@ -3693,7 +3701,7 @@ - - RenameDlg_Result r = Observer::self()->open_RenameDlg( - this, -- err == ERR_FILE_ALREADY_EXIST ? i18n("File Already Exists") : i18n("Already Exists as Folder"), -+ err != ERR_DIR_ALREADY_EXIST ? i18n("File Already Exists") : i18n("Already Exists as Folder"), - m_currentSrcURL.url(), - dest.url(), - mode, newPath, ---- kdelibs/kio/kio/authinfo.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kio/kio/authinfo.cpp 2006/04/05 22:35:54 526917 -@@ -326,6 +326,7 @@ - } - - delete [] buf; -+ fclose (fstream); - close (fd); - return true; - } ---- kdelibs/kio/kio/forwardingslavebase.cpp 2006/02/27 23:07:01 514315 -+++ kdelibs/kio/kio/forwardingslavebase.cpp 2006/04/12 09:57:56 528985 -@@ -69,10 +69,8 @@ - kdDebug() << "ForwardingSlaveBase::prepareUDSEntry: listing==" - << listing << endl; - -- bool mimetype_found = false; -- bool name_found = false; - bool url_found = false; -- QString name, mimetype; -+ QString name; - KURL url; - - KIO::UDSEntry::iterator it = entry.begin(); -@@ -85,7 +83,6 @@ - switch( (*it).m_uds ) - { - case KIO::UDS_NAME: -- name_found = true; - name = (*it).m_str; - kdDebug() << "Name = " << name << endl; - break; -@@ -100,36 +97,7 @@ - kdDebug() << "URL = " << url << endl; - kdDebug() << "New URL = " << (*it).m_str << endl; - break; -- case KIO::UDS_MIME_TYPE: -- mimetype_found = true; -- mimetype = (*it).m_str; -- kdDebug() << "Mimetype = " << (*it).m_str << endl; -- break; -- } -- } -- -- if (!mimetype_found) -- { -- KURL new_url = m_processedURL; -- if (url_found && listing) -- { -- new_url.addPath( url.fileName() ); -- } -- else if (name_found && listing) -- { -- new_url.addPath( name ); - } -- -- KMimeType::Ptr mime = KMimeType::findByURL(new_url); -- mimetype = mime->name(); -- -- KIO::UDSAtom atom; -- atom.m_uds = KIO::UDS_MIME_TYPE; -- atom.m_long = 0; -- atom.m_str = mimetype; -- entry.append(atom); -- -- kdDebug() << "New Mimetype = " << mime->name() << endl; - } - - if ( m_processedURL.isLocalFile() ) ---- kdelibs/kio/misc/kpac/kpac_dhcp_helper.c 2005/12/09 20:37:46 487225 -+++ kdelibs/kio/misc/kpac/kpac_dhcp_helper.c 2006/04/14 14:45:22 529823 -@@ -94,6 +94,7 @@ - exit(1); - - if (setsockopt(sock, SOL_SOCKET, SO_BROADCAST, &bcast, sizeof(bcast)) == -1 || -+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &bcast, sizeof(bcast)) == -1 || - bind(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) - exit(1); - ---- kdelibs/kio/kssl/ksslinfodlg.cc 2005/09/29 09:47:40 465272 -+++ kdelibs/kio/kssl/ksslinfodlg.cc 2006/04/13 14:57:25 529483 -@@ -433,7 +433,7 @@ - KURLLabel *mail = new KURLLabel(tmp, tmp, _frame); - connect(mail, SIGNAL(leftClickedURL(const QString &)), mailCatcher, SLOT(mailClicked(const QString &))); - } else { -- new QLabel(tmp, _frame); -+ label = new QLabel(tmp, _frame); - } - } - if (label && viewport()) {
\ No newline at end of file diff --git a/kde-base/kdelibs/files/kdelibs-3.5.2-misc-fixes-2.diff b/kde-base/kdelibs/files/kdelibs-3.5.2-misc-fixes-2.diff deleted file mode 100644 index 32af99920097..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.5.2-misc-fixes-2.diff +++ /dev/null @@ -1,446 +0,0 @@ ---- kdelibs/kparts/factory.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kparts/factory.cpp 2006/04/05 22:48:19 526923 -@@ -64,7 +64,7 @@ - if ( !factory ) - return 0; - KParts::Factory *pfactory = dynamic_cast<KParts::Factory *>( factory ); -- if ( !factory ) -+ if ( !pfactory ) - return 0; - return pfactory->partInstance(); - } ---- kdelibs/kdeui/kcmodule.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdeui/kcmodule.cpp 2006/04/05 17:22:08 526823 -@@ -79,7 +79,12 @@ - { - init(); - d->_instance = instance; -- KGlobal::locale()->insertCatalogue(instance->instanceName()); -+ -+ if (instance) -+ { -+ KGlobal::locale()->insertCatalogue(instance->instanceName()); -+ } -+ - d->_hasOwnInstance = false; - KGlobal::setActiveInstance(this->instance()); - } ---- kdelibs/kdeui/kcolordialog.cpp 2006/02/14 13:21:59 509356 -+++ kdelibs/kdeui/kcolordialog.cpp 2006/04/07 13:50:45 527264 -@@ -242,7 +242,7 @@ - p = (uint *) image.scanLine( ySize - s - 1 ); - for( h = 0; h < xSize; h++ ) - { -- col.setHsv( 359*h/(xSize-1), 255*s/(ySize-1), 192 ); -+ col.setHsv( 359*h/(xSize-1), 255*s/((ySize == 1) ? 1 : ySize-1), 192 ); - *p = col.rgb(); - p++; - } -@@ -305,7 +305,7 @@ - - for( int x = 0; x < xSize; x++ ) - { -- col.setHsv( _hue, _sat, 255*x/(xSize-1) ); -+ col.setHsv( _hue, _sat, 255*x/((xSize == 1) ? 1 : xSize-1) ); - rgb = col.rgb(); - *p++ = rgb; - } -@@ -317,7 +317,7 @@ - for ( int v = 0; v < ySize; v++ ) - { - p = (uint *) image.scanLine( ySize - v - 1 ); -- col.setHsv( _hue, _sat, 255*v/(ySize-1) ); -+ col.setHsv( _hue, _sat, 255*v/((ySize == 1) ? 1 : ySize-1) ); - rgb = col.rgb(); - for ( int i = 0; i < xSize; i++ ) - *p++ = rgb; -@@ -426,7 +426,7 @@ - - void KColorCells::mouseMoveEvent( QMouseEvent *e ) - { -- if( !(e->state() && LeftButton)) return; -+ if( !(e->state() & LeftButton)) return; - - if(inMouse) { - int delay = KGlobalSettings::dndEventDelay(); -@@ -530,7 +530,7 @@ - void KColorPatch::mouseMoveEvent( QMouseEvent *e ) - { - // Drag color object -- if( !(e->state() && LeftButton)) return; -+ if( !(e->state() & LeftButton)) return; - KColorDrag *d = new KColorDrag( color, this); - d->dragCopy(); - } -@@ -1253,30 +1253,26 @@ - void - KColorDialog::readSettings() - { -- KConfig* config = KGlobal::config(); -+ KConfigGroup group( KGlobal::config(), "Colors" ); - -- QString oldgroup = config->group(); -- -- config->setGroup("Colors"); -- QString palette = config->readEntry("CurrentPalette"); -+ QString palette = group.readEntry("CurrentPalette"); - d->table->setPalette(palette); -- config->setGroup( oldgroup ); - } - - void - KColorDialog::slotWriteSettings() - { -- KConfig* config = KGlobal::config(); -- config->setGroup("Colors"); -+ KConfigGroup group( KGlobal::config(), "Colors" ); -+ - QString palette = d->table->palette(); -- if (!config->hasDefault("CurrentPalette") && -+ if (!group.hasDefault("CurrentPalette") && - (d->table->palette() == d->originalPalette)) - { -- config->revertToDefault("CurrentPalette"); -+ group.revertToDefault("CurrentPalette"); - } - else - { -- config->writeEntry("CurrentPalette", d->table->palette()); -+ group.writeEntry("CurrentPalette", d->table->palette()); - } - } - ---- kdelibs/kdeui/kdialogbase.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdeui/kdialogbase.cpp 2006/04/05 16:45:10 526809 -@@ -668,7 +668,7 @@ - return; - } - -- if( style < 0 || style > ActionStyleMAX ) { style = ActionStyle0; } -+ if( style < 0 || style >= ActionStyleMAX ) { style = ActionStyle0; } - d->mButton.style = style; - - const int *layout; ---- kdelibs/kdecore/kglobalaccel_x11.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdecore/kglobalaccel_x11.cpp 2006/04/09 09:06:52 527729 -@@ -212,7 +212,7 @@ - if( failed ) { - kdDebug(125) << "grab failed!\n"; - for( uint m = 0; m <= 0xff; m++ ) { -- if( m & keyModMaskX == 0 ) -+ if(( m & keyModMaskX ) == 0 ) - XUngrabKey( qt_xdisplay(), keyCodeX, keyModX | m, qt_xrootwin() ); - } - } ---- kdelibs/kdecore/network/kresolver.cpp 2006/02/26 18:55:08 513854 -+++ kdelibs/kdecore/network/kresolver.cpp 2006/04/13 14:57:25 529483 -@@ -609,7 +609,7 @@ - - QStrList KResolver::protocolName(int protonum) - { -- struct protoent *pe; -+ struct protoent *pe = 0L; - #ifndef HAVE_GETPROTOBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -628,6 +628,7 @@ - if (getprotobynumber_r(protonum, &protobuf, buf, buflen, &pe) == ERANGE) - # endif - { -+ pe = 0L; - buflen += 1024; - delete [] buf; - } -@@ -655,7 +656,7 @@ - - QStrList KResolver::protocolName(const char *protoname) - { -- struct protoent *pe; -+ struct protoent *pe = 0L; - #ifndef HAVE_GETPROTOBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -674,6 +675,7 @@ - if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE) - # endif - { -+ pe = 0L; - buflen += 1024; - delete [] buf; - } -@@ -701,7 +703,7 @@ - - int KResolver::protocolNumber(const char *protoname) - { -- struct protoent *pe; -+ struct protoent *pe = 0L; - #ifndef HAVE_GETPROTOBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -720,6 +722,7 @@ - if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE) - # endif - { -+ pe = 0L; - buflen += 1024; - delete [] buf; - } -@@ -743,7 +746,7 @@ - - int KResolver::servicePort(const char *servname, const char *protoname) - { -- struct servent *se; -+ struct servent *se = 0L; - #ifndef HAVE_GETSERVBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -762,6 +765,7 @@ - if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE) - # endif - { -+ se = 0L; - buflen += 1024; - delete [] buf; - } -@@ -785,7 +789,7 @@ - - QStrList KResolver::serviceName(const char* servname, const char *protoname) - { -- struct servent *se; -+ struct servent *se = 0L; - #ifndef HAVE_GETSERVBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -804,6 +808,7 @@ - if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE) - # endif - { -+ se = 0L; - buflen += 1024; - delete [] buf; - } -@@ -831,7 +836,7 @@ - - QStrList KResolver::serviceName(int port, const char *protoname) - { -- struct servent *se; -+ struct servent *se = 0L; - #ifndef HAVE_GETSERVBYPORT_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -850,6 +855,7 @@ - if (getservbyport_r(port, protoname, &servbuf, buf, buflen, &se) == ERANGE) - # endif - { -+ se = 0L; - buflen += 1024; - delete [] buf; - } ---- kdelibs/kdecore/netsupp.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdecore/netsupp.cpp 2006/04/13 14:57:25 529483 -@@ -352,15 +352,9 @@ - return 0; - - out: -- // Normal exit of the function -- if (err == 0) -- *result = res; -- else -- { -- if (res->data != NULL) -- freeaddrinfo(res->data); -- free(res); -- } -+ if (res->data != NULL) -+ freeaddrinfo(res->data); -+ free(res); - return err; - } - ---- kdelibs/kdeui/kdockwidget.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdeui/kdockwidget.cpp 2006/04/13 21:35:27 529609 -@@ -762,9 +762,11 @@ - void KDockWidget::setEnableDocking( int pos ) - { - eDocking = pos; -- if( header && header->inherits( "KDockWidgetHeader" ) ) -- ( ( KDockWidgetHeader* ) header )->showUndockButton( pos & DockDesktop ); -- updateHeader(); -+ if( header ) { -+ if (header->inherits( "KDockWidgetHeader" ) ) -+ ( ( KDockWidgetHeader* ) header )->showUndockButton( pos & DockDesktop ); -+ updateHeader(); -+ } - } - - void KDockWidget::updateHeader() ---- kdelibs/kdecore/netwm_def.h 2006/01/06 15:07:18 494899 -+++ kdelibs/kdecore/netwm_def.h 2006/04/11 12:48:50 528573 -@@ -606,6 +606,20 @@ - FromApplication, - FromTool - }; -+ -+ /** -+ Compares two X timestamps, taking into account wrapping and 64bit architectures. -+ Return value is like with strcmp(), 0 for equal, -1 for time1 < time2, 1 for time1 > time2. -+ @since 3.5.3 -+ */ -+ static int timestampCompare( unsigned long time1, unsigned long time2 ); -+ /** -+ Returns a difference of two X timestamps, time2 - time1, where time2 must be later than time1, -+ as returned by timestampCompare(). -+ @since 3.5.3 -+ */ -+ static int timestampDiff( unsigned long time1_, unsigned long time2_ ); -+ - }; - - ---- kdelibs/kdecore/kapplication.cpp 2006/03/15 13:08:02 518842 -+++ kdelibs/kdecore/kapplication.cpp 2006/04/11 12:48:50 528573 -@@ -960,14 +960,13 @@ - static int my_system (const char *command) { - int pid, status; - -- QApplication::flushX(); - pid = fork(); - if (pid == -1) - return -1; - if (pid == 0) { - const char* shell = "/bin/sh"; - execl(shell, shell, "-c", command, (void *)0); -- ::exit(127); -+ ::_exit(127); - } - do { - if (waitpid(pid, &status, 0) == -1) { -@@ -1684,7 +1683,7 @@ - && _event->xclient.data.l[ 3 ] != 0 ) - { - if( qt_x_user_time == 0 -- || ( _event->xclient.data.l[ 3 ] - qt_x_user_time ) < 100000U ) -+ || NET::timestampCompare( _event->xclient.data.l[ 3 ], qt_x_user_time ) > 0 ) - { // and the timestamp looks reasonable - qt_x_user_time = _event->xclient.data.l[ 3 ]; // update our qt_x_user_time from it - } -@@ -1692,7 +1691,7 @@ - else // normal DND, only needed until Qt updates qt_x_user_time from XdndDrop - { - if( qt_x_user_time == 0 -- || ( _event->xclient.data.l[ 2 ] - qt_x_user_time ) < 100000U ) -+ || NET::timestampCompare( _event->xclient.data.l[ 2 ], qt_x_user_time ) > 0 ) - { // the timestamp looks reasonable - qt_x_user_time = _event->xclient.data.l[ 2 ]; // update our qt_x_user_time from it - } -@@ -1812,7 +1811,7 @@ - XDestroyWindow( qt_xdisplay(), w ); - } - if( qt_x_user_time == 0 -- || time - qt_x_user_time < 1000000000U ) // check time > qt_x_user_time, handle wrapping -+ || NET::timestampCompare( time, qt_x_user_time ) > 0 ) // check time > qt_x_user_time - qt_x_user_time = time; - #endif - } ---- kdelibs/kdecore/kprocess.cpp 2006/01/29 09:42:40 503447 -+++ kdelibs/kdecore/kprocess.cpp 2006/03/30 22:04:03 524676 -@@ -355,8 +355,6 @@ - if (pipe(fd)) - fd[0] = fd[1] = -1; // Pipe failed.. continue - -- QApplication::flushX(); -- - // we don't use vfork() because - // - it has unclear semantics and is not standardized - // - we do way too much magic in the child -@@ -768,7 +766,7 @@ - d->shell = shell; - else - // #ifdef NON_FREE // ... as they ship non-POSIX /bin/sh --#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__) -+#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__) && !defined(__DragonFly__) - // Solaris POSIX ... - if (!access( "/usr/xpg4/bin/sh", X_OK )) - d->shell = "/usr/xpg4/bin/sh"; ---- kdelibs/kdecore/kxerrorhandler.cpp 2005/07/26 18:54:59 438982 -+++ kdelibs/kdecore/kxerrorhandler.cpp 2006/04/11 13:28:02 528591 -@@ -28,6 +28,7 @@ - #include "kxerrorhandler.h" - #include <assert.h> - #include <stdlib.h> -+#include <netwm_def.h> - - KXErrorHandler** KXErrorHandler::handlers = NULL; - int KXErrorHandler::pos = 0; -@@ -101,13 +102,14 @@ - int KXErrorHandler::handle( Display* dpy, XErrorEvent* e ) - { - if( dpy == display -- && e->serial - first_request < 1000000000 ) // e->serial > first_request, with wrapping -+ // e->serial >= first_request , compare like X timestamps to handle wrapping -+ && NET::timestampCompare( e->serial, first_request ) >= 0 ) - { // it's for us - //qDebug( "Handling: %p", static_cast< void* >( this )); -- if( user_handler1 != NULL ) -- was_error |= user_handler1( e->request_code, e->error_code, e->resourceid ); -- else if( user_handler2 != NULL ) -- was_error |= ( user_handler2( dpy, e ) != 0 ); -+ if( user_handler1 != NULL && user_handler1( e->request_code, e->error_code, e->resourceid )) -+ was_error = true; -+ if( user_handler2 != NULL && user_handler2( dpy, e ) != 0 ) -+ was_error = true; - else // no handler set, simply set that there was an error - was_error = true; - return 0; ---- kdelibs/kdecore/netwm.cpp 2005/07/26 18:54:59 438982 -+++ kdelibs/kdecore/netwm.cpp 2006/04/11 12:48:50 528573 -@@ -4401,4 +4401,38 @@ - void NETWinInfo::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -+// Functions for X timestamp comparing. For Time being 32bit they're fairly simple -+// (the #if 0 part), but on 64bit architectures Time is 64bit unsigned long, -+// so there special care needs to be taken to always use only the lower 32bits. -+#if 0 -+int NET::timestampCompare( Time time1, Time time2 ) // like strcmp() -+ { -+ if( time1 == time2 ) -+ return 0; -+ return ( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping -+ } -+ -+Time NET::timestampDiff( Time time1, Time time2 ) // returns time2 - time1 -+ { // no need to handle wrapping? -+ return time2 - time1; -+ } -+#else -+int NET::timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp() -+ { -+ Q_UINT32 time1 = time1_; -+ Q_UINT32 time2 = time2_; -+ if( time1 == time2 ) -+ return 0; -+ return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping -+ } -+ -+int NET::timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1 -+ { // no need to handle wrapping? -+ Q_UINT32 time1 = time1_; -+ Q_UINT32 time2 = time2_; -+ return Q_UINT32( time2 - time1 ); -+ } -+#endif -+ -+ - #endif ---- kdelibs/kdeprint/kpgeneralpage.cpp 2005/10/13 02:22:24 470046 -+++ kdelibs/kdeprint/kpgeneralpage.cpp 2006/04/19 09:45:52 531417 -@@ -523,7 +523,7 @@ - if (ch) setComboItem(m_papertype, ch->get("text")); - } - value = opts["InputSlot"]; -- if (m_inputslot->isEnabled() && !value.isEmpty()) -+ if (m_inputslot && m_inputslot->isEnabled() && !value.isEmpty()) - { - DrBase *ch = ((DrListOption*)driver()->findOption("InputSlot"))->findChoice(value); - if (ch) setComboItem(m_inputslot, ch->get("text")); diff --git a/kde-base/kdelibs/files/kdelibs-3.5.2-misc-fixes-3.diff b/kde-base/kdelibs/files/kdelibs-3.5.2-misc-fixes-3.diff deleted file mode 100644 index 27b4ced57b27..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.5.2-misc-fixes-3.diff +++ /dev/null @@ -1,1182 +0,0 @@ ---- kparts/factory.cpp 2005/09/29 09:47:40 465272 -+++ kparts/factory.cpp 2006/04/05 22:48:19 526923 -@@ -64,7 +64,7 @@ - if ( !factory ) - return 0; - KParts::Factory *pfactory = dynamic_cast<KParts::Factory *>( factory ); -- if ( !factory ) -+ if ( !pfactory ) - return 0; - return pfactory->partInstance(); - } ---- kdeui/kcmodule.cpp 2005/09/29 09:47:40 465272 -+++ kdeui/kcmodule.cpp 2006/04/05 17:22:08 526823 -@@ -79,7 +79,12 @@ - { - init(); - d->_instance = instance; -- KGlobal::locale()->insertCatalogue(instance->instanceName()); -+ -+ if (instance) -+ { -+ KGlobal::locale()->insertCatalogue(instance->instanceName()); -+ } -+ - d->_hasOwnInstance = false; - KGlobal::setActiveInstance(this->instance()); - } ---- kdeui/kcolordialog.cpp 2006/02/14 13:21:59 509356 -+++ kdeui/kcolordialog.cpp 2006/04/07 13:50:45 527264 -@@ -242,7 +242,7 @@ - p = (uint *) image.scanLine( ySize - s - 1 ); - for( h = 0; h < xSize; h++ ) - { -- col.setHsv( 359*h/(xSize-1), 255*s/(ySize-1), 192 ); -+ col.setHsv( 359*h/(xSize-1), 255*s/((ySize == 1) ? 1 : ySize-1), 192 ); - *p = col.rgb(); - p++; - } -@@ -305,7 +305,7 @@ - - for( int x = 0; x < xSize; x++ ) - { -- col.setHsv( _hue, _sat, 255*x/(xSize-1) ); -+ col.setHsv( _hue, _sat, 255*x/((xSize == 1) ? 1 : xSize-1) ); - rgb = col.rgb(); - *p++ = rgb; - } -@@ -317,7 +317,7 @@ - for ( int v = 0; v < ySize; v++ ) - { - p = (uint *) image.scanLine( ySize - v - 1 ); -- col.setHsv( _hue, _sat, 255*v/(ySize-1) ); -+ col.setHsv( _hue, _sat, 255*v/((ySize == 1) ? 1 : ySize-1) ); - rgb = col.rgb(); - for ( int i = 0; i < xSize; i++ ) - *p++ = rgb; -@@ -426,7 +426,7 @@ - - void KColorCells::mouseMoveEvent( QMouseEvent *e ) - { -- if( !(e->state() && LeftButton)) return; -+ if( !(e->state() & LeftButton)) return; - - if(inMouse) { - int delay = KGlobalSettings::dndEventDelay(); -@@ -530,7 +530,7 @@ - void KColorPatch::mouseMoveEvent( QMouseEvent *e ) - { - // Drag color object -- if( !(e->state() && LeftButton)) return; -+ if( !(e->state() & LeftButton)) return; - KColorDrag *d = new KColorDrag( color, this); - d->dragCopy(); - } -@@ -1253,30 +1253,26 @@ - void - KColorDialog::readSettings() - { -- KConfig* config = KGlobal::config(); -+ KConfigGroup group( KGlobal::config(), "Colors" ); - -- QString oldgroup = config->group(); -- -- config->setGroup("Colors"); -- QString palette = config->readEntry("CurrentPalette"); -+ QString palette = group.readEntry("CurrentPalette"); - d->table->setPalette(palette); -- config->setGroup( oldgroup ); - } - - void - KColorDialog::slotWriteSettings() - { -- KConfig* config = KGlobal::config(); -- config->setGroup("Colors"); -+ KConfigGroup group( KGlobal::config(), "Colors" ); -+ - QString palette = d->table->palette(); -- if (!config->hasDefault("CurrentPalette") && -+ if (!group.hasDefault("CurrentPalette") && - (d->table->palette() == d->originalPalette)) - { -- config->revertToDefault("CurrentPalette"); -+ group.revertToDefault("CurrentPalette"); - } - else - { -- config->writeEntry("CurrentPalette", d->table->palette()); -+ group.writeEntry("CurrentPalette", d->table->palette()); - } - } - ---- kdeui/kdialogbase.cpp 2005/09/29 09:47:40 465272 -+++ kdeui/kdialogbase.cpp 2006/04/05 16:45:10 526809 -@@ -668,7 +668,7 @@ - return; - } - -- if( style < 0 || style > ActionStyleMAX ) { style = ActionStyle0; } -+ if( style < 0 || style >= ActionStyleMAX ) { style = ActionStyle0; } - d->mButton.style = style; - - const int *layout; ---- kdecore/kglobalaccel_x11.cpp 2005/09/29 09:47:40 465272 -+++ kdecore/kglobalaccel_x11.cpp 2006/04/09 09:06:52 527729 -@@ -212,7 +212,7 @@ - if( failed ) { - kdDebug(125) << "grab failed!\n"; - for( uint m = 0; m <= 0xff; m++ ) { -- if( m & keyModMaskX == 0 ) -+ if(( m & keyModMaskX ) == 0 ) - XUngrabKey( qt_xdisplay(), keyCodeX, keyModX | m, qt_xrootwin() ); - } - } ---- kdecore/network/kresolver.cpp 2006/02/26 18:55:08 513854 -+++ kdecore/network/kresolver.cpp 2006/04/13 14:57:25 529483 -@@ -609,7 +609,7 @@ - - QStrList KResolver::protocolName(int protonum) - { -- struct protoent *pe; -+ struct protoent *pe = 0L; - #ifndef HAVE_GETPROTOBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -628,6 +628,7 @@ - if (getprotobynumber_r(protonum, &protobuf, buf, buflen, &pe) == ERANGE) - # endif - { -+ pe = 0L; - buflen += 1024; - delete [] buf; - } -@@ -655,7 +656,7 @@ - - QStrList KResolver::protocolName(const char *protoname) - { -- struct protoent *pe; -+ struct protoent *pe = 0L; - #ifndef HAVE_GETPROTOBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -674,6 +675,7 @@ - if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE) - # endif - { -+ pe = 0L; - buflen += 1024; - delete [] buf; - } -@@ -701,7 +703,7 @@ - - int KResolver::protocolNumber(const char *protoname) - { -- struct protoent *pe; -+ struct protoent *pe = 0L; - #ifndef HAVE_GETPROTOBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -720,6 +722,7 @@ - if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE) - # endif - { -+ pe = 0L; - buflen += 1024; - delete [] buf; - } -@@ -743,7 +746,7 @@ - - int KResolver::servicePort(const char *servname, const char *protoname) - { -- struct servent *se; -+ struct servent *se = 0L; - #ifndef HAVE_GETSERVBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -762,6 +765,7 @@ - if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE) - # endif - { -+ se = 0L; - buflen += 1024; - delete [] buf; - } -@@ -785,7 +789,7 @@ - - QStrList KResolver::serviceName(const char* servname, const char *protoname) - { -- struct servent *se; -+ struct servent *se = 0L; - #ifndef HAVE_GETSERVBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -804,6 +808,7 @@ - if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE) - # endif - { -+ se = 0L; - buflen += 1024; - delete [] buf; - } -@@ -831,7 +836,7 @@ - - QStrList KResolver::serviceName(int port, const char *protoname) - { -- struct servent *se; -+ struct servent *se = 0L; - #ifndef HAVE_GETSERVBYPORT_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -850,6 +855,7 @@ - if (getservbyport_r(port, protoname, &servbuf, buf, buflen, &se) == ERANGE) - # endif - { -+ se = 0L; - buflen += 1024; - delete [] buf; - } ---- kdecore/netsupp.cpp 2005/09/29 09:47:40 465272 -+++ kdecore/netsupp.cpp 2006/04/13 14:57:25 529483 -@@ -352,15 +352,9 @@ - return 0; - - out: -- // Normal exit of the function -- if (err == 0) -- *result = res; -- else -- { -- if (res->data != NULL) -- freeaddrinfo(res->data); -- free(res); -- } -+ if (res->data != NULL) -+ freeaddrinfo(res->data); -+ free(res); - return err; - } - ---- kdeui/kdockwidget.cpp 2005/09/29 09:47:40 465272 -+++ kdeui/kdockwidget.cpp 2006/04/13 21:35:27 529609 -@@ -762,9 +762,11 @@ - void KDockWidget::setEnableDocking( int pos ) - { - eDocking = pos; -- if( header && header->inherits( "KDockWidgetHeader" ) ) -- ( ( KDockWidgetHeader* ) header )->showUndockButton( pos & DockDesktop ); -- updateHeader(); -+ if( header ) { -+ if (header->inherits( "KDockWidgetHeader" ) ) -+ ( ( KDockWidgetHeader* ) header )->showUndockButton( pos & DockDesktop ); -+ updateHeader(); -+ } - } - - void KDockWidget::updateHeader() ---- kdecore/netwm_def.h 2006/01/06 15:07:18 494899 -+++ kdecore/netwm_def.h 2006/04/11 12:48:50 528573 -@@ -606,6 +606,20 @@ - FromApplication, - FromTool - }; -+ -+ /** -+ Compares two X timestamps, taking into account wrapping and 64bit architectures. -+ Return value is like with strcmp(), 0 for equal, -1 for time1 < time2, 1 for time1 > time2. -+ @since 3.5.3 -+ */ -+ static int timestampCompare( unsigned long time1, unsigned long time2 ); -+ /** -+ Returns a difference of two X timestamps, time2 - time1, where time2 must be later than time1, -+ as returned by timestampCompare(). -+ @since 3.5.3 -+ */ -+ static int timestampDiff( unsigned long time1_, unsigned long time2_ ); -+ - }; - - ---- kdecore/kapplication.cpp 2006/03/15 13:08:02 518842 -+++ kdecore/kapplication.cpp 2006/04/11 12:48:50 528573 -@@ -960,14 +960,13 @@ - static int my_system (const char *command) { - int pid, status; - -- QApplication::flushX(); - pid = fork(); - if (pid == -1) - return -1; - if (pid == 0) { - const char* shell = "/bin/sh"; - execl(shell, shell, "-c", command, (void *)0); -- ::exit(127); -+ ::_exit(127); - } - do { - if (waitpid(pid, &status, 0) == -1) { -@@ -1684,7 +1683,7 @@ - && _event->xclient.data.l[ 3 ] != 0 ) - { - if( qt_x_user_time == 0 -- || ( _event->xclient.data.l[ 3 ] - qt_x_user_time ) < 100000U ) -+ || NET::timestampCompare( _event->xclient.data.l[ 3 ], qt_x_user_time ) > 0 ) - { // and the timestamp looks reasonable - qt_x_user_time = _event->xclient.data.l[ 3 ]; // update our qt_x_user_time from it - } -@@ -1692,7 +1691,7 @@ - else // normal DND, only needed until Qt updates qt_x_user_time from XdndDrop - { - if( qt_x_user_time == 0 -- || ( _event->xclient.data.l[ 2 ] - qt_x_user_time ) < 100000U ) -+ || NET::timestampCompare( _event->xclient.data.l[ 2 ], qt_x_user_time ) > 0 ) - { // the timestamp looks reasonable - qt_x_user_time = _event->xclient.data.l[ 2 ]; // update our qt_x_user_time from it - } -@@ -1812,7 +1811,7 @@ - XDestroyWindow( qt_xdisplay(), w ); - } - if( qt_x_user_time == 0 -- || time - qt_x_user_time < 1000000000U ) // check time > qt_x_user_time, handle wrapping -+ || NET::timestampCompare( time, qt_x_user_time ) > 0 ) // check time > qt_x_user_time - qt_x_user_time = time; - #endif - } ---- kdecore/kprocess.cpp 2006/01/29 09:42:40 503447 -+++ kdecore/kprocess.cpp 2006/03/30 22:04:03 524676 -@@ -355,8 +355,6 @@ - if (pipe(fd)) - fd[0] = fd[1] = -1; // Pipe failed.. continue - -- QApplication::flushX(); -- - // we don't use vfork() because - // - it has unclear semantics and is not standardized - // - we do way too much magic in the child -@@ -768,7 +766,7 @@ - d->shell = shell; - else - // #ifdef NON_FREE // ... as they ship non-POSIX /bin/sh --#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__) -+#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__) && !defined(__DragonFly__) - // Solaris POSIX ... - if (!access( "/usr/xpg4/bin/sh", X_OK )) - d->shell = "/usr/xpg4/bin/sh"; ---- kdecore/kxerrorhandler.cpp 2005/07/26 18:54:59 438982 -+++ kdecore/kxerrorhandler.cpp 2006/04/11 13:28:02 528591 -@@ -28,6 +28,7 @@ - #include "kxerrorhandler.h" - #include <assert.h> - #include <stdlib.h> -+#include <netwm_def.h> - - KXErrorHandler** KXErrorHandler::handlers = NULL; - int KXErrorHandler::pos = 0; -@@ -101,13 +102,14 @@ - int KXErrorHandler::handle( Display* dpy, XErrorEvent* e ) - { - if( dpy == display -- && e->serial - first_request < 1000000000 ) // e->serial > first_request, with wrapping -+ // e->serial >= first_request , compare like X timestamps to handle wrapping -+ && NET::timestampCompare( e->serial, first_request ) >= 0 ) - { // it's for us - //qDebug( "Handling: %p", static_cast< void* >( this )); -- if( user_handler1 != NULL ) -- was_error |= user_handler1( e->request_code, e->error_code, e->resourceid ); -- else if( user_handler2 != NULL ) -- was_error |= ( user_handler2( dpy, e ) != 0 ); -+ if( user_handler1 != NULL && user_handler1( e->request_code, e->error_code, e->resourceid )) -+ was_error = true; -+ if( user_handler2 != NULL && user_handler2( dpy, e ) != 0 ) -+ was_error = true; - else // no handler set, simply set that there was an error - was_error = true; - return 0; ---- kdecore/netwm.cpp 2005/07/26 18:54:59 438982 -+++ kdecore/netwm.cpp 2006/04/11 12:48:50 528573 -@@ -4401,4 +4401,38 @@ - void NETWinInfo::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -+// Functions for X timestamp comparing. For Time being 32bit they're fairly simple -+// (the #if 0 part), but on 64bit architectures Time is 64bit unsigned long, -+// so there special care needs to be taken to always use only the lower 32bits. -+#if 0 -+int NET::timestampCompare( Time time1, Time time2 ) // like strcmp() -+ { -+ if( time1 == time2 ) -+ return 0; -+ return ( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping -+ } -+ -+Time NET::timestampDiff( Time time1, Time time2 ) // returns time2 - time1 -+ { // no need to handle wrapping? -+ return time2 - time1; -+ } -+#else -+int NET::timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp() -+ { -+ Q_UINT32 time1 = time1_; -+ Q_UINT32 time2 = time2_; -+ if( time1 == time2 ) -+ return 0; -+ return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping -+ } -+ -+int NET::timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1 -+ { // no need to handle wrapping? -+ Q_UINT32 time1 = time1_; -+ Q_UINT32 time2 = time2_; -+ return Q_UINT32( time2 - time1 ); -+ } -+#endif -+ -+ - #endif ---- kdeprint/kpgeneralpage.cpp 2005/10/13 02:22:24 470046 -+++ kdeprint/kpgeneralpage.cpp 2006/04/19 09:45:52 531417 -@@ -523,7 +523,7 @@ - if (ch) setComboItem(m_papertype, ch->get("text")); - } - value = opts["InputSlot"]; -- if (m_inputslot->isEnabled() && !value.isEmpty()) -+ if (m_inputslot && m_inputslot->isEnabled() && !value.isEmpty()) - { - DrBase *ch = ((DrListOption*)driver()->findOption("InputSlot"))->findChoice(value); - if (ch) setComboItem(m_inputslot, ch->get("text")); ---- khtml/khtml_part.cpp 2006/03/30 17:08:27 524563 -+++ khtml/khtml_part.cpp 2006/05/04 16:37:34 537375 -@@ -3160,7 +3160,8 @@ - else if ( renderLineText ) - { - khtml::RenderLineEdit *parentLine= static_cast<khtml::RenderLineEdit *>(obj); -- s = parentLine->widget()->text(); -+ if (parentLine->widget()->echoMode() == QLineEdit::Normal) -+ s = parentLine->widget()->text(); - s = s.replace(0xa0, ' '); - } - else if ( obj->isText() ) -@@ -3470,7 +3471,8 @@ - text += static_cast<HTMLTextAreaElementImpl*>(n.handle())->value().string(); - break; - case ID_INPUT: -- text += static_cast<HTMLInputElementImpl*>(n.handle())->value().string(); -+ if (static_cast<HTMLInputElementImpl*>(n.handle())->inputType() != HTMLInputElementImpl::PASSWORD) -+ text += static_cast<HTMLInputElementImpl*>(n.handle())->value().string(); - break; - case ID_SELECT: - text += static_cast<HTMLSelectElementImpl*>(n.handle())->value().string(); -@@ -4477,7 +4479,7 @@ - } - - child->m_serviceType = mimetype; -- if ( child->m_frame ) -+ if ( child->m_frame && part->widget() ) - child->m_frame->setWidget( part->widget() ); - - if ( child->m_type != khtml::ChildFrame::Object ) ---- kdeui/ksconfig.cpp 2006/02/01 19:32:55 504677 -+++ kdeui/ksconfig.cpp 2006/05/06 15:07:51 538032 -@@ -23,6 +23,7 @@ - #include <qcombobox.h> - #include <qlabel.h> - #include <qlayout.h> -+#include <qtimer.h> - - #include <kapplication.h> - #include <kconfig.h> -@@ -238,7 +239,7 @@ - dictcombo->clear(); - dictcombo->insertItem( i18n("Turkish") ); - sChangeEncoding( KS_E_UTF8 ); -- } -+ } - else - getAvailDictsAspell(); - } -@@ -505,7 +506,7 @@ - dictcombo->insertItem (i18n("ASpell Default")); - - // Aspell now have /usr/lib/aspell as -- // ASPELL_DATADIR default. -+ // ASPELL_DATADIR default. - QFileInfo dir ( ASPELL_DATADIR ); - if (!dir.exists() || !dir.isDir()) - dir.setFile ("/usr/lib/aspell-0.60"); -@@ -908,7 +909,7 @@ - { - setDictionary (langfnames[i]); - setDictFromList (true); -- emit configChanged(); -+ QTimer::singleShot( 0, this, SIGNAL( configChanged() ) ); - } - - void ---- kabc/lock.cpp 2005/09/29 09:47:40 465272 -+++ kabc/lock.cpp 2006/05/09 12:09:31 538959 -@@ -55,9 +55,9 @@ - { - QFile file( filename ); - if ( !file.open( IO_ReadOnly ) ) return false; -- -+ - QTextStream t( &file ); -- t >> pid >> ws >> app; -+ t >> pid >> endl >> app; - - return true; - } -@@ -102,8 +102,8 @@ - QString identifier( mIdentifier ); - identifier.replace( '_', '/' ); - -- mError = i18n("The resource '%1' is locked by application '%2'.") -- .arg( identifier ).arg( app ); -+ mError = i18n("The address book '%1' is locked by application '%2'.\nIf you believe this is incorrect, just remove the lock file from '%3'") -+ .arg( identifier ).arg( app ).arg( locateLocal( "data", "kabc/lock/*.lock" ) ); - return false; - } - } ---- kdeui/ktextedit.cpp 2005/09/29 09:47:40 465272 -+++ kdeui/ktextedit.cpp 2006/05/09 15:06:47 539040 -@@ -295,7 +295,7 @@ - - void KTextEdit::focusInEvent( QFocusEvent *e ) - { -- if ( d->checkSpellingEnabled && !d->highlighter ) -+ if ( d->checkSpellingEnabled && !isReadOnly() && !d->highlighter ) - d->highlighter = new KDictSpellingHighlighter( this ); - - QTextEdit::focusInEvent( e ); -@@ -308,11 +308,17 @@ - - void KTextEdit::setReadOnly(bool readOnly) - { -+ if ( !readOnly && hasFocus() && d->checkSpellingEnabled && !d->highlighter ) -+ d->highlighter = new KDictSpellingHighlighter( this ); -+ - if ( readOnly == isReadOnly() ) - return; - - if (readOnly) - { -+ delete d->highlighter; -+ d->highlighter = 0; -+ - bool custom = ownPalette(); - QPalette p = palette(); - QColor color = p.color(QPalette::Disabled, QColorGroup::Background); ---- kdeui/ktextedit.h 2005/09/29 09:47:40 465272 -+++ kdeui/ktextedit.h 2006/05/09 15:06:47 539040 -@@ -74,15 +74,20 @@ - virtual void setPalette( const QPalette& palette ); - - /** -- * Turns spell checking for this text edit on or off. -+ * Turns spell checking for this text edit on or off. Note that spell -+ * checking is only available in read-writable KTextEdits. - * - * @see checkSpellingEnabled() -+ * @see isReadOnly() -+ * @see setReadOnly() - * @since 3.2 - */ - void setCheckSpellingEnabled( bool check ); - - /** - * Returns true if spell checking is enabled for this text edit. -+ * Note that it even returns true if this is a read-only KTextEdit, -+ * where spell checking is actually disabled. - * - @ see setCheckSpellingEnabled() - * @since 3.2 ---- kdeui/tests/ktextedittest.cpp 2005/09/29 09:47:40 465272 -+++ kdeui/tests/ktextedittest.cpp 2006/05/09 15:06:47 539040 -@@ -26,6 +26,8 @@ - { - KApplication app( argc, argv, "ktextedittest" ); - KTextEdit *edit = new KTextEdit(); -+ edit->setReadOnly( true ); -+ edit->setCheckSpellingEnabled( true ); - - QFile file( "ktextedittest.cpp" ); - if ( file.open( IO_ReadOnly ) ) -@@ -36,5 +38,6 @@ - - edit->resize( 600, 600 ); - edit->show(); -+ edit->setReadOnly( false ); // also enables spell checking - return app.exec(); - } ---- kabc/plugins/file/resourcefile.cpp 2006/03/07 18:29:10 516587 -+++ kabc/plugins/file/resourcefile.cpp 2006/05/09 11:56:04 538954 -@@ -2,6 +2,7 @@ - This file is part of libkabc. - - Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org> -+ Copyright (c) 2006 Tom Abers <tomalbers@kde.nl> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public -@@ -26,7 +27,6 @@ - - #include <qfile.h> - #include <qfileinfo.h> --#include <qregexp.h> - #include <qtimer.h> - - #include <kapplication.h> -@@ -36,7 +36,9 @@ - #include <klocale.h> - #include <ksavefile.h> - #include <kstandarddirs.h> --#include <ktempfile.h> -+#include <kurl.h> -+#include <jobclasses.h> -+#include <kio/netaccess.h> - - #include "formatfactory.h" - #include "resourcefileconfig.h" -@@ -47,19 +49,9 @@ - - using namespace KABC; - --class ResourceFile::ResourceFilePrivate --{ -- public: -- KIO::Job *mLoadJob; -- bool mIsLoading; -- -- KIO::Job *mSaveJob; -- bool mIsSaving; --}; -- - ResourceFile::ResourceFile( const KConfig *config ) -- : Resource( config ), mFormat( 0 ), mTempFile( 0 ), -- mAsynchronous( false ), d( new ResourceFilePrivate ) -+ : Resource( config ), mFormat( 0 ), -+ mAsynchronous( false ) - { - QString fileName, formatName; - -@@ -76,19 +68,14 @@ - - ResourceFile::ResourceFile( const QString &fileName, - const QString &formatName ) -- : Resource( 0 ), mFormat( 0 ), mTempFile( 0 ), -- mAsynchronous( false ), d( new ResourceFilePrivate ) -+ : Resource( 0 ), mFormat( 0 ), -+ mAsynchronous( false ) - { - init( fileName, formatName ); - } - - void ResourceFile::init( const QString &fileName, const QString &formatName ) - { -- d->mLoadJob = 0; -- d->mIsLoading = false; -- d->mSaveJob = 0; -- d->mIsSaving = false; -- - mFormatName = formatName; - - FormatFactory *factory = FormatFactory::self(); -@@ -110,17 +97,8 @@ - - ResourceFile::~ResourceFile() - { -- if ( d->mIsLoading ) -- d->mLoadJob->kill(); -- if ( d->mIsSaving ) -- d->mSaveJob->kill(); -- -- delete d; -- d = 0; - delete mFormat; - mFormat = 0; -- -- deleteLocalTempFile(); - } - - void ResourceFile::writeConfig( KConfig *config ) -@@ -189,9 +167,31 @@ - - if ( file.size() == 0 ) { - file.close(); -+ kdDebug() << "File size is zero. Evaluating backups" << endl; -+ for (int i=0; i!=20; i++) -+ { -+ QFile backup( mFileName + "__" + QString::number(i) ); -+ kdDebug() << "Evaluating" << backup.name() << " size: " << backup.size() << endl; -+ if ( backup.size() != 0 ) -+ { -+ kdDebug() << "Restoring backup " << i << endl; -+ KURL src, dest; -+ src.setPath( mFileName + "__" + QString::number(i) ); -+ dest.setPath( mFileName ); -+ -+ KIO::DeleteJob* job = KIO::del( dest, false, false ); -+ KIO::NetAccess::synchronousRun( job, 0); -+ -+ KIO::CopyJob* job2 = KIO::copy( src, dest, false ); -+ KIO::NetAccess::synchronousRun( job2, 0); -+ -+ backup.close(); -+ return true; -+ } -+ backup.close(); -+ } - return true; - } -- - bool ok = mFormat->checkFormat( &file ); - file.close(); - -@@ -207,10 +207,6 @@ - { - kdDebug(5700) << "ResourceFile::load(): '" << mFileName << "'" << endl; - -- if ( d->mIsLoading ) { -- abortAsyncLoading(); -- } -- - mAsynchronous = false; - - QFile file( mFileName ); -@@ -219,96 +215,53 @@ - return false; - } - -- if ( !clearAndLoad( &file ) ) { -- addressBook()->error( i18n( "Problems during parsing file '%1'." ).arg( mFileName ) ); -- return false; -- } -- -- return true; --} -- --bool ResourceFile::clearAndLoad( QFile *file ) --{ - clear(); -- return mFormat->loadAll( addressBook(), this, file ); -+ -+ return mFormat->loadAll( addressBook(), this, &file ); - } - - bool ResourceFile::asyncLoad() - { -- if ( d->mIsLoading ) { -- abortAsyncLoading(); -- } -- -- if (d->mIsSaving) { -- kdWarning(5700) << "Aborted asyncSave() because we're still asyncSave()ing!" << endl; -- return false; -- } -+ kdDebug(5700) << "ResourceFile::asyncLoad()" << endl; - - mAsynchronous = true; - -- bool ok = createLocalTempFile(); -- if ( ok ) -- ok = mTempFile->close(); // we only need the filename -- -- if ( !ok ) { -- emit loadingError( this, i18n( "Unable to open file '%1'." ).arg( mTempFile->name() ) ); -- deleteLocalTempFile(); -- return false; -- } -+ bool ok = load(); - -- KURL dest, src; -- dest.setPath( mTempFile->name() ); -- src.setPath( mFileName ); -- -- KIO::Scheduler::checkSlaveOnHold( true ); -- d->mLoadJob = KIO::file_copy( src, dest, -1, true, false, false ); -- d->mIsLoading = true; -- connect( d->mLoadJob, SIGNAL( result( KIO::Job* ) ), -- this, SLOT( downloadFinished( KIO::Job* ) ) ); -+ if ( !ok ) -+ emitLoadingError(); -+ else -+ emitLoadingFinished(); - - return true; - } - --void ResourceFile::abortAsyncLoading() --{ -- kdDebug(5700) << "ResourceFile::abortAsyncLoading()" << endl; -- -- if ( d->mLoadJob ) { -- d->mLoadJob->kill(); // result not emitted -- d->mLoadJob = 0; -- } -- -- deleteLocalTempFile(); -- d->mIsLoading = false; --} -- --void ResourceFile::abortAsyncSaving() --{ -- kdDebug(5700) << "ResourceFile::abortAsyncSaving()" << endl; -- -- if ( d->mSaveJob ) { -- d->mSaveJob->kill(); // result not emitted -- d->mSaveJob = 0; -- } -- -- deleteLocalTempFile(); -- d->mIsSaving = false; --} -- - bool ResourceFile::save( Ticket * ) - { - kdDebug(5700) << "ResourceFile::save()" << endl; - -- if (d->mIsSaving) { -- abortAsyncSaving(); -- } -- if ( d->mIsLoading ) { -- kdWarning(5700) << "Aborted save() because we're still asyncLoad()ing!" << endl; -- return false; -- } -+ // Only do the logrotate dance when the __0 file is not 0 bytes. -+ QFile file( mFileName + "__0" ); -+ if ( file.size() != 0 ) { -+ KURL last; -+ last.setPath( mFileName + "__20" ); -+ kdDebug() << "deleting " << last << endl; -+ KIO::DeleteJob* job = KIO::del( last, false, false ); -+ KIO::NetAccess::synchronousRun( job, 0); -+ -+ for (int i=19; i>=0; i--) -+ { -+ KURL src, dest; -+ src.setPath( mFileName + "__" + QString::number(i) ); -+ dest.setPath( mFileName + "__" + QString::number(i+1) ); -+ kdDebug() << "moving " << src << " -> " << dest << endl; -+ KIO::SimpleJob* job = KIO::rename( src, dest, false ); -+ KIO::NetAccess::synchronousRun( job, 0); -+ } -+ } else -+ kdDebug() << "Not starting logrotate __0 is 0 bytes." << endl; - -- // create backup file -- QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() ); -+ QString extension = "__0"; - (void) KSaveFile::backupFile( mFileName, QString::null /*directory*/, - extension ); - -@@ -318,7 +271,7 @@ - bool ok = false; - - if ( saveFile.status() == 0 && saveFile.file() ) { -- saveToFile( saveFile.file() ); -+ mFormat->saveAll( addressBook(), this, saveFile.file() ); - ok = saveFile.close(); - } - -@@ -332,70 +285,18 @@ - return ok; - } - --bool ResourceFile::asyncSave( Ticket * ) -+bool ResourceFile::asyncSave( Ticket *ticket ) - { - kdDebug(5700) << "ResourceFile::asyncSave()" << endl; - -- if (d->mIsSaving) { -- abortAsyncSaving(); -- } -+ bool ok = save( ticket ); - -- if (d->mIsLoading) { -- kdWarning(5700) << "Aborted asyncSave() because we're still asyncLoad()ing!" << endl; -- return false; -- } -- -- bool ok = createLocalTempFile(); -- if ( ok ) { -- saveToFile( mTempFile->file() ); -- ok = mTempFile->close(); -- } -- -- if ( !ok ) { -- emit savingError( this, i18n( "Unable to save file '%1'." ).arg( mTempFile->name() ) ); -- deleteLocalTempFile(); -- return false; -- } -- -- KURL src, dest; -- src.setPath( mTempFile->name() ); -- dest.setPath( mFileName ); -- -- KIO::Scheduler::checkSlaveOnHold( true ); -- d->mIsSaving = true; -- mDirWatch.stopScan(); // restarted in uploadFinished() -- d->mSaveJob = KIO::file_copy( src, dest, -1, true, false, false ); -- connect( d->mSaveJob, SIGNAL( result( KIO::Job* ) ), -- this, SLOT( uploadFinished( KIO::Job* ) ) ); -- -- return true; --} -- --bool ResourceFile::createLocalTempFile() --{ -- deleteStaleTempFile(); -- mTempFile = new KTempFile(); -- mTempFile->setAutoDelete( true ); -- return mTempFile->status() == 0; --} -- --void ResourceFile::deleteStaleTempFile() --{ -- if ( hasTempFile() ) { -- kdDebug(5700) << "stale temp file detected " << mTempFile->name() << endl; -- deleteLocalTempFile(); -- } --} -- --void ResourceFile::deleteLocalTempFile() --{ -- delete mTempFile; -- mTempFile = 0; --} -+ if ( !ok ) -+ QTimer::singleShot( 0, this, SLOT( emitSavingError() ) ); -+ else -+ QTimer::singleShot( 0, this, SLOT( emitSavingFinished() ) ); - --void ResourceFile::saveToFile( QFile *file ) --{ -- mFormat->saveAll( addressBook(), this, file ); -+ return ok; - } - - void ResourceFile::setFileName( const QString &fileName ) -@@ -436,7 +337,6 @@ - if ( !addressBook() ) - return; - --// clear(); // moved to clearAndLoad() - if ( mAsynchronous ) - asyncLoad(); - else { -@@ -455,44 +355,24 @@ - mAddrMap.erase( addr.uid() ); - } - --void ResourceFile::downloadFinished( KIO::Job* ) -+void ResourceFile::emitSavingFinished() - { -- kdDebug(5700) << "ResourceFile::downloadFinished()" << endl; -- -- d->mIsLoading = false; -- -- if ( !hasTempFile() || mTempFile->status() != 0 ) { -- emit loadingError( this, i18n( "Download failed in some way!" ) ); -- return; -- } -- -- QFile file( mTempFile->name() ); -- if ( file.open( IO_ReadOnly ) ) { -- if ( clearAndLoad( &file ) ) -- emit loadingFinished( this ); -- else -- emit loadingError( this, i18n( "Problems during parsing file '%1'." ).arg( mTempFile->name() ) ); -- } -- else { -- emit loadingError( this, i18n( "Unable to open file '%1'." ).arg( mTempFile->name() ) ); -- } -- -- deleteLocalTempFile(); -+ emit savingFinished( this ); - } - --void ResourceFile::uploadFinished( KIO::Job *job ) -+void ResourceFile::emitSavingError() - { -- kdDebug(5700) << "ResourceFile::uploadFinished()" << endl; -- -- d->mIsSaving = false; -+ emit savingError( this, i18n( "Unable to save file '%1'." ).arg( mFileName ) ); -+} - -- if ( job->error() ) -- emit savingError( this, job->errorString() ); -- else -- emit savingFinished( this ); -+void ResourceFile::emitLoadingFinished() -+{ -+ emit loadingFinished( this ); -+} - -- deleteLocalTempFile(); -- mDirWatch.startScan(); -+void ResourceFile::emitLoadingError() -+{ -+ emit loadingError( this, i18n( "Problems during parsing file '%1'." ).arg( mFileName ) ); - } - - #include "resourcefile.moc" ---- kabc/plugins/file/resourcefile.h 2006/02/22 11:43:12 512375 -+++ kabc/plugins/file/resourcefile.h 2006/05/09 11:56:04 538954 -@@ -28,14 +28,6 @@ - - #include <kabc/resource.h> - --class QFile; --class QTimer; --class KTempFile; -- --namespace KIO { --class Job; --} -- - namespace KABC { - - class FormatPlugin; -@@ -135,8 +127,10 @@ - virtual void removeAddressee( const Addressee& addr ); - - private slots: -- void downloadFinished( KIO::Job* ); -- void uploadFinished( KIO::Job* ); -+ void emitLoadingFinished(); -+ void emitLoadingError(); -+ void emitSavingFinished(); -+ void emitSavingError(); - - protected slots: - void fileChanged(); -@@ -148,15 +142,6 @@ - void unlock( const QString &fileName ); - - private: -- bool clearAndLoad( QFile *file ); -- void saveToFile( QFile *file ); -- void abortAsyncLoading(); -- void abortAsyncSaving(); -- bool createLocalTempFile(); -- void deleteLocalTempFile(); -- void deleteStaleTempFile(); -- bool hasTempFile() const { return mTempFile != 0; } -- - QString mFileName; - QString mFormatName; - -@@ -166,8 +151,6 @@ - - KDirWatch mDirWatch; - -- KTempFile *mTempFile; -- - bool mAsynchronous; - - class ResourceFilePrivate; ---- kdecore/kiconloader.cpp 2006/01/30 14:52:12 503832 -+++ kdecore/kiconloader.cpp 2006/05/09 19:15:18 539123 -@@ -435,16 +435,25 @@ - - if ( extensionLength > 0 ) - { --#ifndef NDEBUG -- kdDebug(264) << "Application " << KGlobal::instance()->instanceName() -- << " loads icon " << name << " with extension." << endl; --#endif -- - return name.left(name.length() - extensionLength); - } - return name; - } - -+QString KIconLoader::removeIconExtensionInternal(const QString &name) const -+{ -+ QString name_noext = removeIconExtension(name); -+ -+#ifndef NDEBUG -+ if (name != name_noext) -+ { -+ kdDebug(264) << "Application " << KGlobal::instance()->instanceName() -+ << " loads icon " << name << " with extension." << endl; -+ } -+#endif -+ -+ return name_noext; -+} - - KIcon KIconLoader::findMatchingIcon(const QString& name, int size) const - { -@@ -529,7 +538,7 @@ - if (!QDir::isRelativePath(_name)) - return _name; - -- QString name = removeIconExtension( _name ); -+ QString name = removeIconExtensionInternal( _name ); - - QString path; - if (group_or_size == KIcon::User) -@@ -673,7 +682,7 @@ - if (!canReturnNull && name.isEmpty()) - name = str_unknown; - else -- name = removeIconExtension(name); -+ name = removeIconExtensionInternal(name); - } - - // If size == 0, use default size for the specified group. -@@ -810,12 +819,16 @@ - ((ovl = loadOverlay(theme->shareOverlay(), size)) != 0L)) - KIconEffect::overlay(*img, *ovl); - if (overlay & KIcon::HiddenOverlay) -+ { -+ if (img->depth() != 32) -+ *img = img->convertDepth(32); - for (int y = 0; y < img->height(); y++) - { -- Q_UINT32 *line = reinterpret_cast<Q_UINT32 *>(img->scanLine(y)); -+ QRgb *line = reinterpret_cast<QRgb *>(img->scanLine(y)); - for (int x = 0; x < img->width(); x++) - line[x] = (line[x] & 0x00ffffff) | (QMIN(0x80, qAlpha(line[x])) << 24); - } -+ } - } - - // Scale the icon and apply effects if necessary ---- kdecore/kiconloader.h 2005/09/28 09:27:53 464793 -+++ kdecore/kiconloader.h 2006/05/07 05:30:53 538154 -@@ -401,11 +401,32 @@ - /** - * Checks if name ends in one of the supported icon formats (i.e. .png) - * and returns the name without the extension if it does. -+ * -+ * Otherwise name is returned unchanged. -+ * -+ * Currently supported: -+ * - png -+ * - xpm -+ * - svg (if libart is being used) -+ * - svgz (if libart is being used) -+ * -+ * TODO: KDE 4 make public & static - * @since 3.1 - */ - QString removeIconExtension(const QString &name) const; - - /** -+ * Same as removeIconExtension except it prints a debug message -+ * if an extension is removed to help catch programming errors. -+ * -+ * @see findMatchingIcon() -+ * @see iconPath() -+ * -+ * TODO: KDE 4 make static -+ */ -+ QString removeIconExtensionInternal(const QString &name) const; -+ -+ /** - * Loads all the different sizes for an iconset. - */ - QIconSet loadIconSetNonDelayed( const QString& name, KIcon::Group group, diff --git a/kde-base/kdelibs/files/kdelibs-3.5.2-misc-fixes.diff b/kde-base/kdelibs/files/kdelibs-3.5.2-misc-fixes.diff deleted file mode 100644 index 17ee7abfb27b..000000000000 --- a/kde-base/kdelibs/files/kdelibs-3.5.2-misc-fixes.diff +++ /dev/null @@ -1,446 +0,0 @@ ---- kdelibs/kparts/factory.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kparts/factory.cpp 2006/04/05 22:48:19 526923 -@@ -64,7 +64,7 @@ - if ( !factory ) - return 0; - KParts::Factory *pfactory = dynamic_cast<KParts::Factory *>( factory ); -- if ( !factory ) -+ if ( !pfactory ) - return 0; - return pfactory->partInstance(); - } ---- kdelibs/kdeui/kcmodule.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdeui/kcmodule.cpp 2006/04/05 17:22:08 526823 -@@ -79,7 +79,12 @@ - { - init(); - d->_instance = instance; -- KGlobal::locale()->insertCatalogue(instance->instanceName()); -+ -+ if (instance) -+ { -+ KGlobal::locale()->insertCatalogue(instance->instanceName()); -+ } -+ - d->_hasOwnInstance = false; - KGlobal::setActiveInstance(this->instance()); - } ---- kdelibs/kdeui/kcolordialog.cpp 2006/02/14 13:21:59 509356 -+++ kdelibs/kdeui/kcolordialog.cpp 2006/04/07 13:50:45 527264 -@@ -242,7 +242,7 @@ - p = (uint *) image.scanLine( ySize - s - 1 ); - for( h = 0; h < xSize; h++ ) - { -- col.setHsv( 359*h/(xSize-1), 255*s/(ySize-1), 192 ); -+ col.setHsv( 359*h/(xSize-1), 255*s/((ySize == 1) ? 1 : ySize-1), 192 ); - *p = col.rgb(); - p++; - } -@@ -305,7 +305,7 @@ - - for( int x = 0; x < xSize; x++ ) - { -- col.setHsv( _hue, _sat, 255*x/(xSize-1) ); -+ col.setHsv( _hue, _sat, 255*x/((xSize == 1) ? 1 : xSize-1) ); - rgb = col.rgb(); - *p++ = rgb; - } -@@ -317,7 +317,7 @@ - for ( int v = 0; v < ySize; v++ ) - { - p = (uint *) image.scanLine( ySize - v - 1 ); -- col.setHsv( _hue, _sat, 255*v/(ySize-1) ); -+ col.setHsv( _hue, _sat, 255*v/((ySize == 1) ? 1 : ySize-1) ); - rgb = col.rgb(); - for ( int i = 0; i < xSize; i++ ) - *p++ = rgb; -@@ -426,7 +426,7 @@ - - void KColorCells::mouseMoveEvent( QMouseEvent *e ) - { -- if( !(e->state() && LeftButton)) return; -+ if( !(e->state() & LeftButton)) return; - - if(inMouse) { - int delay = KGlobalSettings::dndEventDelay(); -@@ -530,7 +530,7 @@ - void KColorPatch::mouseMoveEvent( QMouseEvent *e ) - { - // Drag color object -- if( !(e->state() && LeftButton)) return; -+ if( !(e->state() & LeftButton)) return; - KColorDrag *d = new KColorDrag( color, this); - d->dragCopy(); - } -@@ -1253,30 +1253,26 @@ - void - KColorDialog::readSettings() - { -- KConfig* config = KGlobal::config(); -+ KConfigGroup group( KGlobal::config(), "Colors" ); - -- QString oldgroup = config->group(); -- -- config->setGroup("Colors"); -- QString palette = config->readEntry("CurrentPalette"); -+ QString palette = group.readEntry("CurrentPalette"); - d->table->setPalette(palette); -- config->setGroup( oldgroup ); - } - - void - KColorDialog::slotWriteSettings() - { -- KConfig* config = KGlobal::config(); -- config->setGroup("Colors"); -+ KConfigGroup group( KGlobal::config(), "Colors" ); -+ - QString palette = d->table->palette(); -- if (!config->hasDefault("CurrentPalette") && -+ if (!group.hasDefault("CurrentPalette") && - (d->table->palette() == d->originalPalette)) - { -- config->revertToDefault("CurrentPalette"); -+ group.revertToDefault("CurrentPalette"); - } - else - { -- config->writeEntry("CurrentPalette", d->table->palette()); -+ group.writeEntry("CurrentPalette", d->table->palette()); - } - } - ---- kdelibs/kdeui/kdialogbase.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdeui/kdialogbase.cpp 2006/04/05 16:45:10 526809 -@@ -668,7 +668,7 @@ - return; - } - -- if( style < 0 || style > ActionStyleMAX ) { style = ActionStyle0; } -+ if( style < 0 || style >= ActionStyleMAX ) { style = ActionStyle0; } - d->mButton.style = style; - - const int *layout; ---- kdelibs/kdecore/kglobalaccel_x11.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdecore/kglobalaccel_x11.cpp 2006/04/09 09:06:52 527729 -@@ -212,7 +212,7 @@ - if( failed ) { - kdDebug(125) << "grab failed!\n"; - for( uint m = 0; m <= 0xff; m++ ) { -- if( m & keyModMaskX == 0 ) -+ if(( m & keyModMaskX ) == 0 ) - XUngrabKey( qt_xdisplay(), keyCodeX, keyModX | m, qt_xrootwin() ); - } - } ---- kdelibs/kdecore/network/kresolver.cpp 2006/02/26 18:55:08 513854 -+++ kdelibs/kdecore/network/kresolver.cpp 2006/04/13 14:57:25 529483 -@@ -609,7 +609,7 @@ - - QStrList KResolver::protocolName(int protonum) - { -- struct protoent *pe; -+ struct protoent *pe = 0L; - #ifndef HAVE_GETPROTOBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -628,6 +628,7 @@ - if (getprotobynumber_r(protonum, &protobuf, buf, buflen, &pe) == ERANGE) - # endif - { -+ pe = 0L; - buflen += 1024; - delete [] buf; - } -@@ -655,7 +656,7 @@ - - QStrList KResolver::protocolName(const char *protoname) - { -- struct protoent *pe; -+ struct protoent *pe = 0L; - #ifndef HAVE_GETPROTOBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -674,6 +675,7 @@ - if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE) - # endif - { -+ pe = 0L; - buflen += 1024; - delete [] buf; - } -@@ -701,7 +703,7 @@ - - int KResolver::protocolNumber(const char *protoname) - { -- struct protoent *pe; -+ struct protoent *pe = 0L; - #ifndef HAVE_GETPROTOBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -720,6 +722,7 @@ - if (getprotobyname_r(protoname, &protobuf, buf, buflen, &pe) == ERANGE) - # endif - { -+ pe = 0L; - buflen += 1024; - delete [] buf; - } -@@ -743,7 +746,7 @@ - - int KResolver::servicePort(const char *servname, const char *protoname) - { -- struct servent *se; -+ struct servent *se = 0L; - #ifndef HAVE_GETSERVBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -762,6 +765,7 @@ - if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE) - # endif - { -+ se = 0L; - buflen += 1024; - delete [] buf; - } -@@ -785,7 +789,7 @@ - - QStrList KResolver::serviceName(const char* servname, const char *protoname) - { -- struct servent *se; -+ struct servent *se = 0L; - #ifndef HAVE_GETSERVBYNAME_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -804,6 +808,7 @@ - if (getservbyname_r(servname, protoname, &servbuf, buf, buflen, &se) == ERANGE) - # endif - { -+ se = 0L; - buflen += 1024; - delete [] buf; - } -@@ -831,7 +836,7 @@ - - QStrList KResolver::serviceName(int port, const char *protoname) - { -- struct servent *se; -+ struct servent *se = 0L; - #ifndef HAVE_GETSERVBYPORT_R - QMutexLocker locker(&getXXbyYYmutex); - -@@ -850,6 +855,7 @@ - if (getservbyport_r(port, protoname, &servbuf, buf, buflen, &se) == ERANGE) - # endif - { -+ se = 0L; - buflen += 1024; - delete [] buf; - } ---- kdelibs/kdecore/ktempdir.cpp 2006/03/01 10:20:31 514742 -+++ kdelibs/kdecore/ktempdir.cpp 2006/04/13 14:57:25 529483 -@@ -107,6 +107,8 @@ - { - if (bAutoDelete) - unlink(); -+ -+ delete d; - } - - int ---- kdelibs/kdecore/netsupp.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdecore/netsupp.cpp 2006/04/13 14:57:25 529483 -@@ -352,15 +352,9 @@ - return 0; - - out: -- // Normal exit of the function -- if (err == 0) -- *result = res; -- else -- { -- if (res->data != NULL) -- freeaddrinfo(res->data); -- free(res); -- } -+ if (res->data != NULL) -+ freeaddrinfo(res->data); -+ free(res); - return err; - } - ---- kdelibs/kdeui/kdockwidget.cpp 2005/09/29 09:47:40 465272 -+++ kdelibs/kdeui/kdockwidget.cpp 2006/04/13 21:35:27 529609 -@@ -762,9 +762,11 @@ - void KDockWidget::setEnableDocking( int pos ) - { - eDocking = pos; -- if( header && header->inherits( "KDockWidgetHeader" ) ) -- ( ( KDockWidgetHeader* ) header )->showUndockButton( pos & DockDesktop ); -- updateHeader(); -+ if( header ) { -+ if (header->inherits( "KDockWidgetHeader" ) ) -+ ( ( KDockWidgetHeader* ) header )->showUndockButton( pos & DockDesktop ); -+ updateHeader(); -+ } - } - - void KDockWidget::updateHeader() ---- kdelibs/kdecore/netwm_def.h 2006/01/06 15:07:18 494899 -+++ kdelibs/kdecore/netwm_def.h 2006/04/11 12:48:50 528573 -@@ -606,6 +606,20 @@ - FromApplication, - FromTool - }; -+ -+ /** -+ Compares two X timestamps, taking into account wrapping and 64bit architectures. -+ Return value is like with strcmp(), 0 for equal, -1 for time1 < time2, 1 for time1 > time2. -+ @since 3.5.3 -+ */ -+ static int timestampCompare( unsigned long time1, unsigned long time2 ); -+ /** -+ Returns a difference of two X timestamps, time2 - time1, where time2 must be later than time1, -+ as returned by timestampCompare(). -+ @since 3.5.3 -+ */ -+ static int timestampDiff( unsigned long time1_, unsigned long time2_ ); -+ - }; - - ---- kdelibs/kdecore/kapplication.cpp 2006/03/15 13:08:02 518842 -+++ kdelibs/kdecore/kapplication.cpp 2006/04/11 12:48:50 528573 -@@ -960,14 +960,13 @@ - static int my_system (const char *command) { - int pid, status; - -- QApplication::flushX(); - pid = fork(); - if (pid == -1) - return -1; - if (pid == 0) { - const char* shell = "/bin/sh"; - execl(shell, shell, "-c", command, (void *)0); -- ::exit(127); -+ ::_exit(127); - } - do { - if (waitpid(pid, &status, 0) == -1) { -@@ -1684,7 +1683,7 @@ - && _event->xclient.data.l[ 3 ] != 0 ) - { - if( qt_x_user_time == 0 -- || ( _event->xclient.data.l[ 3 ] - qt_x_user_time ) < 100000U ) -+ || NET::timestampCompare( _event->xclient.data.l[ 3 ], qt_x_user_time ) > 0 ) - { // and the timestamp looks reasonable - qt_x_user_time = _event->xclient.data.l[ 3 ]; // update our qt_x_user_time from it - } -@@ -1692,7 +1691,7 @@ - else // normal DND, only needed until Qt updates qt_x_user_time from XdndDrop - { - if( qt_x_user_time == 0 -- || ( _event->xclient.data.l[ 2 ] - qt_x_user_time ) < 100000U ) -+ || NET::timestampCompare( _event->xclient.data.l[ 2 ], qt_x_user_time ) > 0 ) - { // the timestamp looks reasonable - qt_x_user_time = _event->xclient.data.l[ 2 ]; // update our qt_x_user_time from it - } -@@ -1812,7 +1811,7 @@ - XDestroyWindow( qt_xdisplay(), w ); - } - if( qt_x_user_time == 0 -- || time - qt_x_user_time < 1000000000U ) // check time > qt_x_user_time, handle wrapping -+ || NET::timestampCompare( time, qt_x_user_time ) > 0 ) // check time > qt_x_user_time - qt_x_user_time = time; - #endif - } ---- kdelibs/kdecore/kprocess.cpp 2006/01/29 09:42:40 503447 -+++ kdelibs/kdecore/kprocess.cpp 2006/03/30 22:04:03 524676 -@@ -355,8 +355,6 @@ - if (pipe(fd)) - fd[0] = fd[1] = -1; // Pipe failed.. continue - -- QApplication::flushX(); -- - // we don't use vfork() because - // - it has unclear semantics and is not standardized - // - we do way too much magic in the child -@@ -768,7 +766,7 @@ - d->shell = shell; - else - // #ifdef NON_FREE // ... as they ship non-POSIX /bin/sh --#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__) -+#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__GNU__) && !defined(__DragonFly__) - // Solaris POSIX ... - if (!access( "/usr/xpg4/bin/sh", X_OK )) - d->shell = "/usr/xpg4/bin/sh"; ---- kdelibs/kdecore/kxerrorhandler.cpp 2005/07/26 18:54:59 438982 -+++ kdelibs/kdecore/kxerrorhandler.cpp 2006/04/11 13:28:02 528591 -@@ -28,6 +28,7 @@ - #include "kxerrorhandler.h" - #include <assert.h> - #include <stdlib.h> -+#include <netwm_def.h> - - KXErrorHandler** KXErrorHandler::handlers = NULL; - int KXErrorHandler::pos = 0; -@@ -101,13 +102,14 @@ - int KXErrorHandler::handle( Display* dpy, XErrorEvent* e ) - { - if( dpy == display -- && e->serial - first_request < 1000000000 ) // e->serial > first_request, with wrapping -+ // e->serial >= first_request , compare like X timestamps to handle wrapping -+ && NET::timestampCompare( e->serial, first_request ) >= 0 ) - { // it's for us - //qDebug( "Handling: %p", static_cast< void* >( this )); -- if( user_handler1 != NULL ) -- was_error |= user_handler1( e->request_code, e->error_code, e->resourceid ); -- else if( user_handler2 != NULL ) -- was_error |= ( user_handler2( dpy, e ) != 0 ); -+ if( user_handler1 != NULL && user_handler1( e->request_code, e->error_code, e->resourceid )) -+ was_error = true; -+ if( user_handler2 != NULL && user_handler2( dpy, e ) != 0 ) -+ was_error = true; - else // no handler set, simply set that there was an error - was_error = true; - return 0; ---- kdelibs/kdecore/netwm.cpp 2005/07/26 18:54:59 438982 -+++ kdelibs/kdecore/netwm.cpp 2006/04/11 12:48:50 528573 -@@ -4401,4 +4401,38 @@ - void NETWinInfo::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -+// Functions for X timestamp comparing. For Time being 32bit they're fairly simple -+// (the #if 0 part), but on 64bit architectures Time is 64bit unsigned long, -+// so there special care needs to be taken to always use only the lower 32bits. -+#if 0 -+int NET::timestampCompare( Time time1, Time time2 ) // like strcmp() -+ { -+ if( time1 == time2 ) -+ return 0; -+ return ( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping -+ } -+ -+Time NET::timestampDiff( Time time1, Time time2 ) // returns time2 - time1 -+ { // no need to handle wrapping? -+ return time2 - time1; -+ } -+#else -+int NET::timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp() -+ { -+ Q_UINT32 time1 = time1_; -+ Q_UINT32 time2 = time2_; -+ if( time1 == time2 ) -+ return 0; -+ return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping -+ } -+ -+int NET::timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1 -+ { // no need to handle wrapping? -+ Q_UINT32 time1 = time1_; -+ Q_UINT32 time2 = time2_; -+ return Q_UINT32( time2 - time1 ); -+ } -+#endif -+ -+ - #endif diff --git a/kde-base/kdelibs/files/post-3.3.2-kdelibs-htmlframes2.patch b/kde-base/kdelibs/files/post-3.3.2-kdelibs-htmlframes2.patch deleted file mode 100644 index 856eeab7119b..000000000000 --- a/kde-base/kdelibs/files/post-3.3.2-kdelibs-htmlframes2.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- khtml/khtml_part.cpp 17 Nov 2004 13:46:56 -0000 1.1015.2.12 -+++ khtml/khtml_part.cpp 12 Dec 2004 15:55:30 -0000 -@@ -4758,7 +4758,7 @@ KHTMLPart * - KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) - { - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; -+ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl; - #endif - // Check access - KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart); -@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read - if (!checkFrameAccess(callingHtmlPart)) - return 0; - -+ if (!childFrame && !parentPart() && (name() == f)) -+ return this; -+ - FrameIt it = d->m_frames.find( f ); - const FrameIt end = d->m_frames.end(); - if ( it != end ) diff --git a/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild b/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild deleted file mode 100644 index 9fbde20e2cf8..000000000000 --- a/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild,v 1.14 2005/09/12 12:44:08 agriffis Exp $ - -inherit kde flag-o-matic eutils multilib -set-kdedir 3.4 - -DESCRIPTION="KDE libraries needed by all kde programs" -HOMEPAGE="http://www.kde.org/" -SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="3.4" -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86" -IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -RDEPEND="arts? ( ~kde-base/arts-${PV} ) - $(qt_min_version 3.3.3) - app-arch/bzip2 - >=dev-libs/libxslt-1.1.4 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libpcre-4.2 - media-libs/libart_lgpl - net-dns/libidn - virtual/utempter - ssl? ( >=dev-libs/openssl-0.9.7d ) - alsa? ( media-libs/alsa-lib ) - cups? ( >=net-print/cups-1.1.19 ) - tiff? ( media-libs/tiff ) - kerberos? ( virtual/krb5 ) - jpeg2k? ( media-libs/jasper ) - openexr? ( >=media-libs/openexr-1.2 ) - spell? ( || ( app-text/aspell - app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) - virtual/fam - virtual/ghostscript" - -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.58 - >=sys-devel/automake-1.8 - doc? ( app-doc/doxygen ) - sys-devel/gettext - dev-util/pkgconfig" - -src_unpack() { - unpack ${P}.tar.bz2 - # This is an ugly hack: it makes base_src_unpack do nothing, but still lets us enjoy - # the other things kde_src_unpack does. - kde_src_unpack nounpack - - epatch "${FILESDIR}/${P}-configure.patch" - - # for the configure patch - make -f admin/Makefile.common || die -} - -src_compile() { - myconf="--with-distribution=Gentoo - --enable-libfam $(use_enable kernel_linux dnotify) - --with-libart --with-libidn --with-utempter - $(use_with alsa) $(use_with arts) $(use_with ssl) - $(use_with kerberos gssapi) $(use_with tiff) - $(use_with jpeg2k jasper) $(use_with openexr) - $(use_enable cups) $(use_enable zeroconf dnssd)" - - if use spell && has_version app-text/aspell; then - myconf="${myconf} --with-aspell" - else - myconf="${myconf} --without-aspell" - fi - - use x86 && myconf="${myconf} --enable-fast-malloc=full" - - # fix bug 58179, bug 85593 - # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a - # closer look... - corsair - use ppc64 && append-flags "-mminimal-toc" - - kde_src_compile - - if use doc; then - make apidox || die - fi -} - -src_install() { - kde_src_install - - if use doc; then - make DESTDIR="${D}" install-apidox || die - fi - - # needed to fix lib64 issues on amd64, see bug #45669 - use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64 - - # Needed to create lib -> lib64 symlink for amd64 2005.0 profile - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib - fi - - if ! use arts ; then - dodir /etc/env.d - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${PREFIX}/${libdir}" - done - - cat <<EOF > ${D}/etc/env.d/46kdepaths-${SLOT} # number goes down with version upgrade -PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${libdirs:1} -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" -EOF - fi - -} diff --git a/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild b/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild deleted file mode 100644 index 54d537aa4ef0..000000000000 --- a/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild,v 1.4 2005/09/29 15:39:25 hardave Exp $ - -inherit kde flag-o-matic eutils multilib -set-kdedir 3.4 - -DESCRIPTION="KDE libraries needed by all kde programs" -HOMEPAGE="http://www.kde.org/" -SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="3.4" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -RDEPEND="arts? ( ~kde-base/arts-${PV} ) - $(qt_min_version 3.3.3) - app-arch/bzip2 - >=dev-libs/libxslt-1.1.4 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libpcre-4.2 - media-libs/libart_lgpl - net-dns/libidn - virtual/utempter - ssl? ( >=dev-libs/openssl-0.9.7d ) - alsa? ( media-libs/alsa-lib ) - cups? ( >=net-print/cups-1.1.19 ) - tiff? ( media-libs/tiff ) - kerberos? ( virtual/krb5 ) - jpeg2k? ( media-libs/jasper ) - openexr? ( >=media-libs/openexr-1.2 ) - spell? ( || ( app-text/aspell - app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) - virtual/fam - virtual/ghostscript" - -DEPEND="${RDEPEND} - >=sys-devel/autoconf-2.58 - >=sys-devel/automake-1.8 - doc? ( app-doc/doxygen ) - sys-devel/gettext - dev-util/pkgconfig" - -src_unpack() { - kde_src_unpack - - epatch "${FILESDIR}/${P}-configure.patch" - # fix ntlm authentication - epatch "${FILESDIR}/${P}-kntlm.patch" - # fix some annoying konqueror crashes - epatch "${FILESDIR}/${P}-ktoolbar-crash.patch" - # for the configure patch - make -f admin/Makefile.common || die -} - -src_compile() { - myconf="--with-distribution=Gentoo - --enable-libfam $(use_enable kernel_linux dnotify) - --with-libart --with-libidn --with-utempter - $(use_with alsa) $(use_with arts) $(use_with ssl) - $(use_with kerberos gssapi) $(use_with tiff) - $(use_with jpeg2k jasper) $(use_with openexr) - $(use_enable cups) $(use_enable zeroconf dnssd)" - - if use spell && has_version app-text/aspell; then - myconf="${myconf} --with-aspell" - else - myconf="${myconf} --without-aspell" - fi - - use x86 && myconf="${myconf} --enable-fast-malloc=full" - - # fix bug 58179, bug 85593 - # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a - # closer look... - corsair - use ppc64 && append-flags "-mminimal-toc" - - kde_src_compile - - if use doc; then - make apidox || die - fi -} - -src_install() { - kde_src_install - - if use doc; then - make DESTDIR="${D}" install-apidox || die - fi - - # needed to fix lib64 issues on amd64, see bug #45669 - use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64 - - # Needed to create lib -> lib64 symlink for amd64 2005.0 profile - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib - fi - - if ! use arts ; then - dodir /etc/env.d - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${PREFIX}/${libdir}" - done - - cat <<EOF > ${D}/etc/env.d/46kdepaths-${SLOT} # number goes down with version upgrade -PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${libdirs:1} -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" -EOF - fi - -} diff --git a/kde-base/kdelibs/kdelibs-3.4.2-r1.ebuild b/kde-base/kdelibs/kdelibs-3.4.2-r1.ebuild deleted file mode 100644 index fbe383c12b7d..000000000000 --- a/kde-base/kdelibs/kdelibs-3.4.2-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.2-r1.ebuild,v 1.2 2005/10/06 23:07:11 hardave Exp $ - -inherit kde flag-o-matic eutils multilib -set-kdedir 3.4 - -DESCRIPTION="KDE libraries needed by all kde programs" -HOMEPAGE="http://www.kde.org/" -SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="3.4" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -RDEPEND="$(qt_min_version 3.3.3) - arts? ( ~kde-base/arts-${PV} ) - app-arch/bzip2 - >=media-libs/freetype-2 - media-libs/fontconfig - >=dev-libs/libxslt-1.1.4 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libpcre-4.2 - media-libs/libart_lgpl - net-dns/libidn - virtual/utempter - ssl? ( >=dev-libs/openssl-0.9.7d ) - alsa? ( media-libs/alsa-lib ) - cups? ( >=net-print/cups-1.1.19 ) - tiff? ( media-libs/tiff ) - kerberos? ( virtual/krb5 ) - jpeg2k? ( media-libs/jasper ) - openexr? ( >=media-libs/openexr-1.2 ) - spell? ( || ( app-text/aspell - app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) - virtual/fam - virtual/ghostscript" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext - dev-util/pkgconfig" - -src_unpack() { - kde_src_unpack - - # Gmail fix (kde bug 104352). Applied for 3.4.3. - epatch "${FILESDIR}/kdelibs-3.4.2-gmail-fix.patch" - - # Configure patch. Applied for 3.5. - epatch "${FILESDIR}/kdelibs-3.4.1-configure.patch" - - # for the configure patch - make -f admin/Makefile.common || die -} - -src_compile() { - myconf="--with-distribution=Gentoo - --enable-libfam $(use_enable kernel_linux dnotify) - --with-libart --with-libidn --with-utempter - $(use_with alsa) $(use_with arts) $(use_with ssl) - $(use_with kerberos gssapi) $(use_with tiff) - $(use_with jpeg2k jasper) $(use_with openexr) - $(use_enable cups) $(use_enable zeroconf dnssd)" - - if use spell && has_version app-text/aspell; then - myconf="${myconf} --with-aspell" - else - myconf="${myconf} --without-aspell" - fi - - myconf="${myconf} --disable-fast-malloc" - - # fix bug 58179, bug 85593 - # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a - # closer look... - corsair - use ppc64 && append-flags "-mminimal-toc" - - kde_src_compile - - if use doc; then - make apidox || die - fi -} - -src_install() { - kde_src_install - - if use doc; then - make DESTDIR="${D}" install-apidox || die - fi - - # needed to fix lib64 issues on amd64, see bug #45669 - use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64 - - # Needed to create lib -> lib64 symlink for amd64 2005.0 profile - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib - fi - - if ! use arts ; then - dodir /etc/env.d - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${PREFIX}/${libdir}" - done - - cat <<EOF > ${D}/etc/env.d/46kdepaths-${SLOT} # number goes down with version upgrade -PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${libdirs:1} -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" -EOF - fi - -} diff --git a/kde-base/kdelibs/kdelibs-3.4.2.ebuild b/kde-base/kdelibs/kdelibs-3.4.2.ebuild deleted file mode 100644 index 61859cfc5706..000000000000 --- a/kde-base/kdelibs/kdelibs-3.4.2.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.2.ebuild,v 1.1 2005/07/28 12:52:34 greg_g Exp $ - -inherit kde flag-o-matic eutils multilib -set-kdedir 3.4 - -DESCRIPTION="KDE libraries needed by all kde programs" -HOMEPAGE="http://www.kde.org/" -SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="3.4" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -RDEPEND="$(qt_min_version 3.3.3) - arts? ( ~kde-base/arts-${PV} ) - app-arch/bzip2 - >=media-libs/freetype-2 - media-libs/fontconfig - >=dev-libs/libxslt-1.1.4 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libpcre-4.2 - media-libs/libart_lgpl - net-dns/libidn - virtual/utempter - ssl? ( >=dev-libs/openssl-0.9.7d ) - alsa? ( media-libs/alsa-lib ) - cups? ( >=net-print/cups-1.1.19 ) - tiff? ( media-libs/tiff ) - kerberos? ( virtual/krb5 ) - jpeg2k? ( media-libs/jasper ) - openexr? ( >=media-libs/openexr-1.2 ) - spell? ( || ( app-text/aspell - app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) - virtual/fam - virtual/ghostscript" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext - dev-util/pkgconfig" - -src_unpack() { - kde_src_unpack - - # Gmail fix (kde bug 104352). Applied for 3.4.3. - epatch "${FILESDIR}/kdelibs-3.4.2-gmail-fix.patch" - - # Configure patch. Applied for 3.5. - epatch "${FILESDIR}/kdelibs-3.4.1-configure.patch" - - # for the configure patch - make -f admin/Makefile.common || die -} - -src_compile() { - myconf="--with-distribution=Gentoo - --enable-libfam $(use_enable kernel_linux dnotify) - --with-libart --with-libidn --with-utempter - $(use_with alsa) $(use_with arts) $(use_with ssl) - $(use_with kerberos gssapi) $(use_with tiff) - $(use_with jpeg2k jasper) $(use_with openexr) - $(use_enable cups) $(use_enable zeroconf dnssd)" - - if use spell && has_version app-text/aspell; then - myconf="${myconf} --with-aspell" - else - myconf="${myconf} --without-aspell" - fi - - use x86 && myconf="${myconf} --enable-fast-malloc=full" - - # fix bug 58179, bug 85593 - # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a - # closer look... - corsair - use ppc64 && append-flags "-mminimal-toc" - - kde_src_compile - - if use doc; then - make apidox || die - fi -} - -src_install() { - kde_src_install - - if use doc; then - make DESTDIR="${D}" install-apidox || die - fi - - # needed to fix lib64 issues on amd64, see bug #45669 - use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64 - - # Needed to create lib -> lib64 symlink for amd64 2005.0 profile - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib - fi - - if ! use arts ; then - dodir /etc/env.d - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${PREFIX}/${libdir}" - done - - cat <<EOF > ${D}/etc/env.d/46kdepaths-${SLOT} # number goes down with version upgrade -PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${libdirs:1} -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" -EOF - fi - -} diff --git a/kde-base/kdelibs/kdelibs-3.4.3.ebuild b/kde-base/kdelibs/kdelibs-3.4.3.ebuild deleted file mode 100644 index 0c7ee9ecb780..000000000000 --- a/kde-base/kdelibs/kdelibs-3.4.3.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.3.ebuild,v 1.12 2006/03/31 12:23:23 caleb Exp $ - -inherit kde flag-o-matic eutils multilib -set-kdedir 3.4 - -DESCRIPTION="KDE libraries needed by all kde programs" -HOMEPAGE="http://www.kde.org/" -SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="3.4" -KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -RDEPEND="$(qt_min_version 3.3.3) - arts? ( ~kde-base/arts-${PV} ) - app-arch/bzip2 - >=media-libs/freetype-2 - media-libs/fontconfig - >=dev-libs/libxslt-1.1.15 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libpcre-4.2 - media-libs/libart_lgpl - net-dns/libidn - virtual/utempter - ssl? ( >=dev-libs/openssl-0.9.7d ) - alsa? ( media-libs/alsa-lib ) - cups? ( >=net-print/cups-1.1.19 ) - tiff? ( media-libs/tiff ) - kerberos? ( virtual/krb5 ) - jpeg2k? ( media-libs/jasper ) - openexr? ( >=media-libs/openexr-1.2 ) - spell? ( || ( app-text/aspell - app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) - virtual/fam - virtual/ghostscript" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext - dev-util/pkgconfig" - -pkg_setup() { - # Workaround collision with <=kdeadmin-3.4.1 (bug #100968). - rm -f "${ROOT}${KDEDIR}/share/mimelnk/application/x-debian-package.desktop" -} - -src_unpack() { - kde_src_unpack - - # Configure patch. Applied for 3.5. - epatch "${FILESDIR}/kdelibs-3.4.1-configure.patch" - - # Missing <inttypes.h> include causes compilation to bork - epatch "${FILESDIR}/kdelibs-3.4.3-inttypes.patch" - - # for the configure patch - make -f admin/Makefile.common || die -} - -src_compile() { - myconf="--with-distribution=Gentoo - --enable-libfam $(use_enable kernel_linux dnotify) - --with-libart --with-libidn --with-utempter - $(use_with alsa) $(use_with arts) $(use_with ssl) - $(use_with kerberos gssapi) $(use_with tiff) - $(use_with jpeg2k jasper) $(use_with openexr) - $(use_enable cups) $(use_enable zeroconf dnssd)" - - if use spell && has_version app-text/aspell; then - myconf="${myconf} --with-aspell" - else - myconf="${myconf} --without-aspell" - fi - - myconf="${myconf} --disable-fast-malloc" - - # fix bug 58179, bug 85593 - # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a - # closer look... - corsair - use ppc64 && append-flags "-mminimal-toc" - - kde_src_compile - - if use doc; then - make apidox || die - fi -} - -src_install() { - kde_src_install - - if use doc; then - make DESTDIR="${D}" install-apidox || die - fi - - # Needed to create lib -> lib64 symlink for amd64 2005.0 profile - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib - fi - - if ! use arts ; then - dodir /etc/env.d - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${PREFIX}/${libdir}" - done - - cat <<EOF > ${D}/etc/env.d/46kdepaths-${SLOT} # number goes down with version upgrade -PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${libdirs:1} -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" -EOF - fi - -} diff --git a/kde-base/kdelibs/kdelibs-3.5.2-r2.ebuild b/kde-base/kdelibs/kdelibs-3.5.2-r2.ebuild deleted file mode 100644 index 217d613fa739..000000000000 --- a/kde-base/kdelibs/kdelibs-3.5.2-r2.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r2.ebuild,v 1.1 2006/04/05 13:08:55 flameeyes Exp $ -inherit kde flag-o-matic eutils multilib -set-kdedir 3.5 - -DESCRIPTION="KDE libraries needed by all kde programs" -HOMEPAGE="http://www.kde.org/" -SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" -#SRC_URI="mirror://kde/stable/3.5/src/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="3.5" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="acl alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -RDEPEND="$(qt_min_version 3.3.3) - arts? ( ~kde-base/arts-${PV} ) - app-arch/bzip2 - >=media-libs/freetype-2 - media-libs/fontconfig - >=dev-libs/libxslt-1.1.15 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libpcre-4.2 - media-libs/libart_lgpl - net-dns/libidn - virtual/utempter - acl? ( kernel_linux? ( sys-apps/acl ) ) - ssl? ( >=dev-libs/openssl-0.9.7d ) - alsa? ( media-libs/alsa-lib ) - cups? ( >=net-print/cups-1.1.19 ) - tiff? ( media-libs/tiff ) - kerberos? ( virtual/krb5 ) - jpeg2k? ( media-libs/jasper ) - openexr? ( >=media-libs/openexr-1.2 ) - spell? ( || ( app-text/aspell - app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) - virtual/fam - virtual/ghostscript" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext - dev-util/pkgconfig" - -RDEPEND="${RDEPEND} - || ( x11-apps/rgb virtual/x11 )" - -PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch - ${FILESDIR}/${PN}-3.5.0-kicker-crash.patch - ${FILESDIR}/${P}-xorg7-rgbtxt.patch - ${FILESDIR}/kdelibs-3.5.2-kio-errror-handling.diff - ${FILESDIR}/kdelibs-3.5.2-kate-fixes.diff" - -src_compile() { - rm -f ${S}/configure - - # hspell is disabled because it requires version 0.9 of hspell that - # is not in portage yet; leaving it to autodetection tries to use it - # and then fails because of missing required functions - - myconf="--with-distribution=Gentoo - --enable-libfam $(use_enable kernel_linux dnotify) - --with-libart --with-libidn --with-utempter - $(use_with acl) $(use_with ssl) - $(use_with alsa) $(use_with arts) - $(use_with kerberos gssapi) $(use_with tiff) - $(use_with jpeg2k jasper) $(use_with openexr) - $(use_enable cups) $(use_enable zeroconf dnssd) - --without-hspell" - - if use spell && has_version app-text/aspell; then - myconf="${myconf} --with-aspell" - else - myconf="${myconf} --without-aspell" - fi - - if has_version x11-apps/rgb; then - myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt" - fi - - myconf="${myconf} --disable-fast-malloc" - - # fix bug 58179, bug 85593 - # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a - # closer look... - corsair - use ppc64 && append-flags "-mminimal-toc" - - export BINDNOW_FLAGS="$(bindnow-flags)" - - kde_src_compile - - if use doc; then - make apidox || die - fi -} - -src_install() { - kde_src_install - - if use doc; then - make DESTDIR="${D}" install-apidox || die - fi - - # Needed to create lib -> lib64 symlink for amd64 2005.0 profile - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib - fi - - if ! use arts ; then - dodir /etc/env.d - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${PREFIX}/${libdir}" - done - - cat <<EOF > ${D}/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade -PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${libdirs:1} -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" -EOF - fi - -} - -pkg_postinst() { - if use zeroconf; then - echo - einfo "To make zeroconf support available in KDE" - einfo "make sure that the 'mdnsd' daemon is running." - einfo "Make sure also that multicast dns lookups are" - einfo "enabled by editing the 'hosts:' line in" - einfo "/etc/nsswitch.conf to include 'mdns', e.g.:" - einfo "hosts: files mdns dns" - echo - fi -} diff --git a/kde-base/kdelibs/kdelibs-3.5.2-r3.ebuild b/kde-base/kdelibs/kdelibs-3.5.2-r3.ebuild deleted file mode 100644 index f20a1341957c..000000000000 --- a/kde-base/kdelibs/kdelibs-3.5.2-r3.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r3.ebuild,v 1.1 2006/04/17 18:28:09 carlo Exp $ -inherit kde flag-o-matic eutils multilib -set-kdedir 3.5 - -DESCRIPTION="KDE libraries needed by all kde programs" -HOMEPAGE="http://www.kde.org/" -SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2" -#SRC_URI="mirror://kde/stable/3.5/src/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -SLOT="3.5" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="acl alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. -RDEPEND="$(qt_min_version 3.3.3) - arts? ( ~kde-base/arts-${PV} ) - app-arch/bzip2 - >=media-libs/freetype-2 - media-libs/fontconfig - >=dev-libs/libxslt-1.1.15 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libpcre-4.2 - media-libs/libart_lgpl - net-dns/libidn - virtual/utempter - acl? ( kernel_linux? ( sys-apps/acl ) ) - ssl? ( >=dev-libs/openssl-0.9.7d ) - alsa? ( media-libs/alsa-lib ) - cups? ( >=net-print/cups-1.1.19 ) - tiff? ( media-libs/tiff ) - kerberos? ( virtual/krb5 ) - jpeg2k? ( media-libs/jasper ) - openexr? ( >=media-libs/openexr-1.2 ) - spell? ( || ( app-text/aspell - app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) - virtual/fam - virtual/ghostscript" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext - dev-util/pkgconfig" - -RDEPEND="${RDEPEND} - || ( x11-apps/rgb virtual/x11 )" - -PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch - ${FILESDIR}/${PN}-3.5.0-kicker-crash.patch - ${FILESDIR}/${P}-xorg7-rgbtxt.patch - ${FILESDIR}/kdelibs-3.5.2-kio-fixes.diff - ${FILESDIR}/kdelibs-3.5.2-kate-fixes-2.diff - ${FILESDIR}/kdelibs-3.5.2-misc-fixes.diff" - -src_compile() { - rm -f ${S}/configure - - # hspell is disabled because it requires version 0.9 of hspell that - # is not in portage yet; leaving it to autodetection tries to use it - # and then fails because of missing required functions - - myconf="--with-distribution=Gentoo - --enable-libfam $(use_enable kernel_linux dnotify) - --with-libart --with-libidn --with-utempter - $(use_with acl) $(use_with ssl) - $(use_with alsa) $(use_with arts) - $(use_with kerberos gssapi) $(use_with tiff) - $(use_with jpeg2k jasper) $(use_with openexr) - $(use_enable cups) $(use_enable zeroconf dnssd) - --without-hspell" - - if use spell && has_version app-text/aspell; then - myconf="${myconf} --with-aspell" - else - myconf="${myconf} --without-aspell" - fi - - if has_version x11-apps/rgb; then - myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt" - fi - - myconf="${myconf} --disable-fast-malloc" - - # fix bug 58179, bug 85593 - # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a - # closer look... - corsair - use ppc64 && append-flags "-mminimal-toc" - - export BINDNOW_FLAGS="$(bindnow-flags)" - - kde_src_compile - - if use doc; then - make apidox || die - fi -} - -src_install() { - kde_src_install - - if use doc; then - make DESTDIR="${D}" install-apidox || die - fi - - # Needed to create lib -> lib64 symlink for amd64 2005.0 profile - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib - fi - - if ! use arts ; then - dodir /etc/env.d - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${PREFIX}/${libdir}" - done - - cat <<EOF > ${D}/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade -PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${libdirs:1} -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" -EOF - fi - -} - -pkg_postinst() { - if use zeroconf; then - echo - einfo "To make zeroconf support available in KDE" - einfo "make sure that the 'mdnsd' daemon is running." - einfo "Make sure also that multicast dns lookups are" - einfo "enabled by editing the 'hosts:' line in" - einfo "/etc/nsswitch.conf to include 'mdns', e.g.:" - einfo "hosts: files mdns dns" - echo - fi -} diff --git a/kde-base/kdelibs/kdelibs-3.5.2-r4.ebuild b/kde-base/kdelibs/kdelibs-3.5.2-r4.ebuild deleted file mode 100644 index b63baa77b70e..000000000000 --- a/kde-base/kdelibs/kdelibs-3.5.2-r4.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r4.ebuild,v 1.4 2006/05/08 20:34:07 flameeyes Exp $ -inherit kde flag-o-matic eutils multilib -set-kdedir 3.5 - -DESCRIPTION="KDE libraries needed by all kde programs" -HOMEPAGE="http://www.kde.org/" -SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2 - cups? ( mirror://gentoo/kdeprint-${PV}-cups-1.2-patches.tar.bz2 )" - -LICENSE="GPL-2 LGPL-2" -SLOT="3.5" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff zeroconf" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. - -# Added aspell-en as dependency to work around bug 131512. -RDEPEND="$(qt_min_version 3.3.3) - arts? ( ~kde-base/arts-${PV} ) - app-arch/bzip2 - >=media-libs/freetype-2 - media-libs/fontconfig - >=dev-libs/libxslt-1.1.15 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libpcre-4.2 - media-libs/libart_lgpl - net-dns/libidn - virtual/utempter - acl? ( kernel_linux? ( sys-apps/acl ) ) - ssl? ( >=dev-libs/openssl-0.9.7d ) - alsa? ( media-libs/alsa-lib ) - cups? ( >=net-print/cups-1.1.19 ) - tiff? ( media-libs/tiff ) - kerberos? ( virtual/krb5 ) - jpeg2k? ( media-libs/jasper ) - openexr? ( >=media-libs/openexr-1.2 ) - spell? ( || ( ( app-text/aspell app-dicts/aspell-en ) - app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) - virtual/fam - virtual/ghostscript" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext - dev-util/pkgconfig" - -RDEPEND="${RDEPEND} - || ( x11-apps/rgb virtual/x11 )" - -PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch - ${FILESDIR}/${PN}-3.5.0-kicker-crash.patch - ${FILESDIR}/${P}-xorg7-rgbtxt.patch - ${FILESDIR}/kdelibs-3.5.2-kio-fixes.diff - ${FILESDIR}/kdelibs-3.5.2-kate-fixes-2.diff - ${FILESDIR}/kdelibs-3.5.2-misc-fixes-2.diff" - -pkg_setup() { - if use legacyssl ; then - echo "" - eerror "Warning:" - ewarn "You have the legacyssl use flag enabled, which fixes issues with some broken" - ewarn "sites, but breaks others instead. It is strongly discouraged to use it." - ewarn "For more information, see bug #128922." - echo "" - fi -} - -src_unpack() { - kde_src_unpack - if use legacyssl ; then - epatch ${FILESDIR}/kdelibs-3.5.2-kssl-3des.patch || die "Patch did not apply." - fi - - if use cups && has_version '>=net-print/cups-1.2_pre'; then - cd "${S}" - - EPATCH_SUFFIX="diff" \ - EPATCH_MULTI_MSG="Applying KUbuntu patches for CUPS 1.2 support ..." \ - EPATCH_FORCE="yes" \ - epatch ${WORKDIR}/kdeprint-${PV}-cups-1.2-patches/ - fi -} - -src_compile() { - rm -f ${S}/configure - - # hspell is disabled because it requires version 0.9 of hspell that - # is not in portage yet; leaving it to autodetection tries to use it - # and then fails because of missing required functions - - myconf="--with-distribution=Gentoo - --enable-libfam $(use_enable kernel_linux dnotify) - --with-libart --with-libidn --with-utempter - $(use_with acl) $(use_with ssl) - $(use_with alsa) $(use_with arts) - $(use_with kerberos gssapi) $(use_with tiff) - $(use_with jpeg2k jasper) $(use_with openexr) - $(use_enable cups) $(use_enable zeroconf dnssd) - --without-hspell" - - if use spell && has_version app-text/aspell; then - myconf="${myconf} --with-aspell" - else - myconf="${myconf} --without-aspell" - fi - - if has_version x11-apps/rgb; then - myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt" - fi - - myconf="${myconf} --disable-fast-malloc" - - # fix bug 58179, bug 85593 - # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a - # closer look... - corsair - use ppc64 && append-flags "-mminimal-toc" - - # work around bug #120858, gcc 3.4.x -Os miscompilation - use x86 && replace-flags "-Os" "-O2" # see bug #120858 - - export BINDNOW_FLAGS="$(bindnow-flags)" - - kde_src_compile - - if use doc; then - make apidox || die - fi -} - -src_install() { - kde_src_install - - if use doc; then - make DESTDIR="${D}" install-apidox || die - fi - - # Needed to create lib -> lib64 symlink for amd64 2005.0 profile - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib - fi - - if ! use arts ; then - dodir /etc/env.d - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${PREFIX}/${libdir}" - done - - cat <<EOF > ${D}/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade -PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${libdirs:1} -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" -EOF - fi - -} - -pkg_postinst() { - if use zeroconf; then - echo - einfo "To make zeroconf support available in KDE" - einfo "make sure that the 'mdnsd' daemon is running." - einfo "Make sure also that multicast dns lookups are" - einfo "enabled by editing the 'hosts:' line in" - einfo "/etc/nsswitch.conf to include 'mdns', e.g.:" - einfo "hosts: files mdns dns" - echo - fi -} diff --git a/kde-base/kdelibs/kdelibs-3.5.2-r5.ebuild b/kde-base/kdelibs/kdelibs-3.5.2-r5.ebuild deleted file mode 100644 index 03e2d8d56aee..000000000000 --- a/kde-base/kdelibs/kdelibs-3.5.2-r5.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r5.ebuild,v 1.2 2006/05/17 00:21:17 psi29a Exp $ -inherit kde flag-o-matic eutils multilib -set-kdedir 3.5 - -DESCRIPTION="KDE libraries needed by all kde programs" -HOMEPAGE="http://www.kde.org/" -SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2 - cups? ( mirror://gentoo/kdeprint-${PV}-cups-1.2-patches.tar.bz2 )" - -LICENSE="GPL-2 LGPL-2" -SLOT="3.5" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl openexr spell ssl tiff zeroconf" - -# kde.eclass has kdelibs in DEPEND, and we can't have that in here. -# so we recreate the entire DEPEND from scratch. - -# Added aspell-en as dependency to work around bug 131512. -RDEPEND="$(qt_min_version 3.3.3) - arts? ( ~kde-base/arts-${PV} ) - app-arch/bzip2 - >=media-libs/freetype-2 - media-libs/fontconfig - >=dev-libs/libxslt-1.1.15 - >=dev-libs/libxml2-2.6.6 - >=dev-libs/libpcre-4.2 - media-libs/libart_lgpl - net-dns/libidn - virtual/utempter - acl? ( kernel_linux? ( sys-apps/acl ) ) - ssl? ( >=dev-libs/openssl-0.9.7d ) - alsa? ( media-libs/alsa-lib ) - cups? ( >=net-print/cups-1.1.19 ) - tiff? ( media-libs/tiff ) - kerberos? ( virtual/krb5 ) - jpeg2k? ( media-libs/jasper ) - openexr? ( >=media-libs/openexr-1.2 ) - spell? ( || ( ( app-text/aspell app-dicts/aspell-en ) - app-text/ispell ) ) - zeroconf? ( net-misc/mDNSResponder ) - virtual/fam - virtual/ghostscript" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - sys-devel/gettext - dev-util/pkgconfig" - -RDEPEND="${RDEPEND} - || ( x11-apps/rgb virtual/x11 )" - -PATCHES="${FILESDIR}/${PN}-3.5.0-bindnow.patch - ${FILESDIR}/${PN}-3.5.0-kicker-crash.patch - ${FILESDIR}/${P}-xorg7-rgbtxt.patch - ${FILESDIR}/kdelibs-3.5.2-kio-fixes.diff - ${FILESDIR}/kdelibs-3.5.2-kate-fixes-2.diff - ${FILESDIR}/kdelibs-3.5.2-misc-fixes-3.diff" - -pkg_setup() { - if use legacyssl ; then - echo "" - eerror "Warning:" - ewarn "You have the legacyssl use flag enabled, which fixes issues with some broken" - ewarn "sites, but breaks others instead. It is strongly discouraged to use it." - ewarn "For more information, see bug #128922." - echo "" - fi -} - -src_unpack() { - kde_src_unpack - if use legacyssl ; then - epatch ${FILESDIR}/kdelibs-3.5.2-kssl-3des.patch || die "Patch did not apply." - fi - - if use cups && has_version '>=net-print/cups-1.2_pre'; then - cd "${S}" - - EPATCH_SUFFIX="diff" \ - EPATCH_MULTI_MSG="Applying KUbuntu patches for CUPS 1.2 support ..." \ - EPATCH_FORCE="yes" \ - epatch ${WORKDIR}/kdeprint-${PV}-cups-1.2-patches/ - fi -} - -src_compile() { - rm -f ${S}/configure - - # hspell is disabled because it requires version 0.9 of hspell that - # is not in portage yet; leaving it to autodetection tries to use it - # and then fails because of missing required functions - - myconf="--with-distribution=Gentoo - --enable-libfam $(use_enable kernel_linux dnotify) - --with-libart --with-libidn --with-utempter - $(use_with acl) $(use_with ssl) - $(use_with alsa) $(use_with arts) - $(use_with kerberos gssapi) $(use_with tiff) - $(use_with jpeg2k jasper) $(use_with openexr) - $(use_enable cups) $(use_enable zeroconf dnssd) - --without-hspell" - - if use spell && has_version app-text/aspell; then - myconf="${myconf} --with-aspell" - else - myconf="${myconf} --without-aspell" - fi - - if has_version x11-apps/rgb; then - myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt" - fi - - myconf="${myconf} --disable-fast-malloc" - - # fix bug 58179, bug 85593 - # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a - # closer look... - corsair - use ppc64 && append-flags "-mminimal-toc" - - # work around bug #120858, gcc 3.4.x -Os miscompilation - use x86 && replace-flags "-Os" "-O2" # see bug #120858 - - export BINDNOW_FLAGS="$(bindnow-flags)" - - kde_src_compile - - if use doc; then - make apidox || die - fi -} - -src_install() { - kde_src_install - - if use doc; then - make DESTDIR="${D}" install-apidox || die - fi - - # Needed to create lib -> lib64 symlink for amd64 2005.0 profile - if [ "${SYMLINK_LIB}" = "yes" ]; then - dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib - fi - - if ! use arts ; then - dodir /etc/env.d - - # List all the multilib libdirs - local libdirs - for libdir in $(get_all_libdirs); do - libdirs="${libdirs}:${PREFIX}/${libdir}" - done - - cat <<EOF > ${D}/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade -PATH=${PREFIX}/bin -ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin -LDPATH=${libdirs:1} -CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown" -EOF - fi - -} - -pkg_postinst() { - if use zeroconf; then - echo - einfo "To make zeroconf support available in KDE" - einfo "make sure that the 'mdnsd' daemon is running." - einfo "Make sure also that multicast dns lookups are" - einfo "enabled by editing the 'hosts:' line in" - einfo "/etc/nsswitch.conf to include 'mdns', e.g.:" - einfo "hosts: files mdns dns" - echo - fi -} |