diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-10-26 20:28:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-10-26 20:28:20 +0000 |
| commit | 0627458d1d5804b10f74b89339e0d439bbfd09e2 (patch) | |
| tree | 776ea6dcb9e255a9aecbb34ef453685a35637d89 /net-wireless | |
| parent | Stable for HPPA (bug #282290). (diff) | |
| download | gentoo-2-0627458d1d5804b10f74b89339e0d439bbfd09e2.tar.gz gentoo-2-0627458d1d5804b10f74b89339e0d439bbfd09e2.tar.bz2 gentoo-2-0627458d1d5804b10f74b89339e0d439bbfd09e2.zip | |
Remove kdebluetooth as planned.
Diffstat (limited to 'net-wireless')
17 files changed, 0 insertions, 2140 deletions
diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog deleted file mode 100644 index c7388b8f6c6b..000000000000 --- a/net-wireless/kdebluetooth/ChangeLog +++ /dev/null @@ -1,405 +0,0 @@ -# ChangeLog for net-wireless/kdebluetooth -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.81 2009/05/14 16:01:59 scarabeus Exp $ - - 14 May 2009; Tomas Chvatal <scarabeus@gentoo.org> - kdebluetooth-1.0_beta8-r2.ebuild: - Fix failed epatch (Mine fancy convertor from string-> bash array needs - tweaking :]). Per bug #269826. - - 13 May 2009; Tomas Chvatal <scarabeus@gentoo.org> - kdebluetooth-1.0_beta2-r2.ebuild, -kdebluetooth-1.0_beta8.ebuild, - -kdebluetooth-1.0_beta8-r1.ebuild, kdebluetooth-1.0_beta8-r2.ebuild: - Remove old. Fix QA warnings. - - 13 May 2009; Tomas Chvatal <scarabeus@gentoo.org> - kdebluetooth-1.0_beta8.ebuild, kdebluetooth-1.0_beta8-r1.ebuild, - kdebluetooth-1.0_beta8-r2.ebuild: - Update beta8 ebuilds where the install path was changed with eclass update - so sed was not working. - - 12 May 2009; Peter Alfredsen <loki_val@gentoo.org> - kdebluetooth-1.0_beta8.ebuild, kdebluetooth-1.0_beta8-r1.ebuild, - kdebluetooth-1.0_beta8-r2.ebuild: - List net-wireless/bluez first in ( a b ) dependency w.r.t. bug 269519. - - 11 May 2009; Hanno Boeck <hanno@gentoo.org> - kdebluetooth-1.0_beta8-r2.ebuild: - Re-digest and repoman QA. - -*kdebluetooth-1.0_beta8-r2 (11 May 2009) - - 11 May 2009; Ioannis Aslanidis <iaslanidis@gentoo.org> - +files/kdebluetooth-1.0_beta8-kbluelock.diff, - +kdebluetooth-1.0_beta8-r2.ebuild: - Fixes bug #225975 - - 10 May 2009; Hanno Boeck <hanno@gentoo.org> kdebluetooth-1.0_beta8.ebuild, - kdebluetooth-1.0_beta8-r1.ebuild: - Make optional dependency on bluez or bluez-libs/utils. - - 08 Mar 2009; Markus Meier <maekke@gentoo.org> - kdebluetooth-1.0_beta8.ebuild: - amd64/x86 stable, bug #224409 - -*kdebluetooth-1.0_beta8-r1 (03 Mar 2009) - - 03 Mar 2009; Timothy Redaelli <drizzt@gentoo.org> - +files/kdebluetooth-1.0_beta8-bashism.patch, - +kdebluetooth-1.0_beta8-r1.ebuild: - Remove bashism, authorized by scarabeus - - 12 Jan 2009; Ioannis Aslanidis <iaslanidis@gentoo.org> - -kdebluetooth-1.0_beta1-r2.ebuild: - Dropped broken ebuild, bug #223703. - - 31 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> - kdebluetooth-1.0_beta8.ebuild: - Stable on sparc, bug #224409 - - 25 Aug 2008; nixnut <nixnut@gentoo.org> kdebluetooth-1.0_beta8.ebuild: - Stable on ppc wrt bug 224409 - - 23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: - add GLEP 56 USE flag desc from use.local.desc - - 02 Jun 2008; Jeroen Roovers <jer@gentoo.org> - kdebluetooth-1.0_beta8.ebuild: - Stable for HPPA (bug #224409). - - 25 Apr 2008; Ingmar Vanhassel <ingmar@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild, kdebluetooth-1.0_beta2-r2.ebuild, - kdebluetooth-1.0_beta8.ebuild: - Version kde-base/* dependencies, Fabio Erculiani in bug 219244 - - 31 Mar 2008; Ioannis Aslanidis <deathwing00@gentoo.org> - +files/kdebluetooth-1.0_beta8-gcc43.patch, kdebluetooth-1.0_beta8.ebuild: - Fixed bug #215620 (gcc 4.3 patch). Added missing quotes. Fixed header date. - - 19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> - -kdebluetooth-1.0_beta6.ebuild: - Old. - -*kdebluetooth-1.0_beta8 (21 Sep 2007) - - 21 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org> - -files/kdebluetooth-1.0_beta3-as-needed.patch, - -kdebluetooth-1.0_beta2.ebuild, -kdebluetooth-1.0_beta2-r1.ebuild, - -kdebluetooth-1.0_beta3.ebuild, +kdebluetooth-1.0_beta8.ebuild: - Version bump to Beta 8. Removed obsolete versions. - -*kdebluetooth-1.0_beta6 (26 Aug 2007) - - 26 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> - +kdebluetooth-1.0_beta6.ebuild: - Version bump to Beta6 as per bug 190296. - - 28 Jul 2007; Guy Martin <gmsoft@gentoo.org> kdebluetooth-1.0_beta3.ebuild: - Added ~hppa to KEYWORDS. - - 22 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> metadata.xml, - kdebluetooth-1.0_beta2-r2.ebuild, kdebluetooth-1.0_beta3.ebuild: - Added the missing dependency on dev-libs/dbus-qt3-old which fixes bug - 182890. Removed the post-install message about kbluepin which isn't provided - anymore. Minor whitespace fixes. - - 21 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org> - kdebluetooth-1.0_beta3.ebuild: - Keyworded ~sparc wrt #182611 - - 20 Jun 2007; Ioannis Aslanidis <deathwing00@gentoo.org> - kdebluetooth-1.0_beta3.ebuild: - Added ~x86 keyword. See bug #182611 for details. - - 19 Jun 2007; Ioannis Aslanidis <deathwing00@gentoo.org> - kdebluetooth-1.0_beta2-r2.ebuild: - QA Fix: Corrected trailing whitespace. - -*kdebluetooth-1.0_beta3 (19 Jun 2007) - - 19 Jun 2007; Ioannis Aslanidis <deathwing00@gentoo.org> - +files/kdebluetooth-1.0_beta3-as-needed.patch, - +kdebluetooth-1.0_beta3.ebuild: - Version bump. Added an --as-needed patch, but not applied to this version. - New dependencies added, unnedeed dependencies dropped. Unneeded patches not - applied. Dropped ~x86, ~sparc and ~hppa keywords, because of dependency - issues, see bug #182611 for details. - -*kdebluetooth-1.0_beta2-r2 (08 Apr 2007) - - 08 Apr 2007; Stefan Schweizer <genstef@gentoo.org> - +files/better-menu-names.diff, +files/kcm-btpaired-fix.diff, - +files/kcm-no-dcop-error.diff, +files/kdebluetooth.diff, - +files/kdebluetooth-dbuspasskeyagent.diff, - +files/kdebluetooth-sdp-bitop.diff, +kdebluetooth-1.0_beta2-r2.ebuild: - Add SuSe patches works with bluez-utils-3.7 thanks to Sergey Temerkhanov - <temerkhanov@mail.ru> in bug 172832 - - 02 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> - kdebluetooth-1.0_beta2-r1.ebuild: - Stable on sparc - - 13 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild, kdebluetooth-1.0_beta2.ebuild, - kdebluetooth-1.0_beta2-r1.ebuild: - Remove xmms useflag. - - 17 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org> - kdebluetooth-1.0_beta2-r1.ebuild: - Fixes LINGUAS support as detailed in bug #151646. Thanks to Rene Gass for - noticing. - -*kdebluetooth-1.0_beta2-r1 (16 Oct 2006) - - 16 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org> - +kdebluetooth-1.0_beta2-r1.ebuild: - Added localization support so that it does not install unwanted language files. - -*kdebluetooth-1.0_beta2 (16 Oct 2006) - - 16 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org> - +kdebluetooth-1.0_beta2.ebuild: - Version bump. Fresh release. - - 20 Aug 2006; Simon Stelling <blubb@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild: - stable on amd64 - - 13 Aug 2006; Ioannis Aslanidis <deathwing00@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild: - Fixed bug #138277. Thanks to Michael Mauch for reporting it. Changed - keywords from amd64 to ~amd64 and hppa to ~hppa due to broken dependency: - >=dev-libs/openobex-1.1 required. - - 16 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild: - ppc stable - - 30 Jun 2006; Ioannis Aslanidis <deathwing00@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild: - Resolves bug #138277. This application will build against - >=openobex-1.1. Architectures that have lower versions have - to stabilize them asap. - - 27 Jun 2006; Marcus D. Hanwell <cryos@gentoo.org> - -kdebluetooth-1.0_beta1.ebuild, -kdebluetooth-1.0_beta1-r1.ebuild: - Pruned old versions. - - 27 Jun 2006; Marcus D. Hanwell <cryos@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild: - Marked stable on amd64, bug 136254. - - 26 Jun 2006; Guy Martin <gmsoft@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild: - Stable on hppa. - - 25 Jun 2006; Alin Nastac <mrness@gentoo.org> - -kdebluetooth-0.99_beta1-r1.ebuild, kdebluetooth-1.0_beta1-r2.ebuild: - Stable on x86 (#122262). - - 24 Jun 2006; Jason Wever <weeve@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild: - Stable on SPARC wrt bug #136254. - - 25 Apr 2006; Alin Nastac <mrness@gentoo.org> - kdebluetooth-1.0_beta1-r2.ebuild: - Correct RDEPEND. - -*kdebluetooth-1.0_beta1-r2 (23 Apr 2006) - - 23 Apr 2006; Alin Nastac <mrness@gentoo.org> - +files/kdebluetooth-1.0_beta1-openobex-1.1.patch, - +kdebluetooth-1.0_beta1-r2.ebuild: - Fix configure error when build against >=dev-libs/openobex-1.1 (#122262). - -*kdebluetooth-1.0_beta1-r1 (08 Apr 2006) - - 08 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> - +files/kdebluetooth-1.0_beta1-kde3.5.2.patch, - +kdebluetooth-1.0_beta1-r1.ebuild: - Add patches to make kioslaves work with KDE 3.5.2, see bug #129237. Thanks - to Raymond Lewis Rebbeck for reporting. - - 30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> - +files/kdebluetooth-1.0_beta1-gcc41.patch, kdebluetooth-1.0_beta1.ebuild: - Add patch to compile with GCC 4.1, provided by Jan Spitalnik on bug #127350. - - 09 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> - kdebluetooth-0.99_beta1-r1.ebuild, kdebluetooth-1.0_beta1.ebuild: - Fix openobex dependency as per bug #122262. - - 27 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> - kdebluetooth-1.0_beta1.ebuild: - Stable on sparc - - 22 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org> - kdebluetooth-1.0_beta1.ebuild: - Keyworded ~sparc wrt #115643 - - 05 Nov 2005; Dominik Stadler <centic@gentoo.org> - kdebluetooth-1.0_beta1.ebuild: - Add RDEPEND bluez-utils, fixes Bug 107073 - - 31 Aug 2005; Guy Martin <gmsoft@gentoo.org> kdebluetooth-1.0_beta1.ebuild: - Stable on hppa. - - 22 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> - kdebluetooth-1.0_beta1.ebuild: - Stable on x86. - - 21 Jul 2005; Douglas Russell <puggy@gentoo.org> - kdebluetooth-1.0_beta1.ebuild: - Slight modification to the 1.0 ebuild - -*kdebluetooth-1.0_beta1 (21 Jul 2005) - - 21 Jul 2005; Douglas Russell <puggy@gentoo.org> - +kdebluetooth-1.0_beta1.ebuild: - Bumping kdebluetooth - - 07 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> - kdebluetooth-0.99_beta1-r1.ebuild: - Fix default location of init scripts (#88446). Correct einfo (#82043). - - 14 May 2005; Guy Martin <gmsoft@gentoo.org> - kdebluetooth-0.99_beta1-r1.ebuild: - Stable on hppa. - - 14 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> - kdebluetooth-0.99_beta1-r1.ebuild: - Marked ~amd64. - -*kdebluetooth-0.0.20041107-r1 (14 Apr 2005) - - 14 Apr 2005; Carlos Silva <r3pek@gentoo.org> - +kdebluetooth-0.0.20041107-r1.ebuild: - Fixing bug #73384. Thanks to tmw. - - 14 Mar 2005; Simone Gotti <motaboy@gentoo.org> - kdebluetooth-0.99_beta1-r1.ebuild, kdebluetooth-0.99_beta1.ebuild: - kdebluetooth-0.99_beta1 needs >=bluez-lib-2.15. Fixes bug #85127. - -*kdebluetooth-0.99_beta1-r1 (13 Mar 2005) - - 13 Mar 2005; Simone Gotti <motaboy@gentoo.org> - +kdebluetooth-0.99_beta1-r1.ebuild, +kdebluetooth-0.99_beta1.ebuild: - Version Bump. Fixes bug #84943. - - 07 Feb 2005; Dominik Stadler <centic@gentoo.org> - kdebluetooth-0.0.20050122-r3.ebuild: - Patch is only required if bluez-libs >= 2.14. - - 02 Feb 2005; Dominik Stadler <centic@gentoo.org> - +files/kdebluetooth-0.0.20050122-compile.patch, - kdebluetooth-0.0.20050122-r3.ebuild: - Add patch to compile correctly - -*kdebluetooth-0.0.20050122-r3 (30 Jan 2005) - - 30 Jan 2005; Simone Gotti <motaboy@gentoo.org> - kdebluetooth-0.0.20041107.ebuild, -kdebluetooth-0.0.20050122-r1.ebuild, - +kdebluetooth-0.0.20050122-r2.ebuild, - +kdebluetooth-0.0.20050122-r3.ebuild, -kdebluetooth-0.0.20050122.ebuild: - Add runtime deps on kdialog or kdebase (splitted or monolithic ebuilds). - Fixes bug #79453. Also fix wrong RDEPEND that should be a DEPEND. - - 24 Jan 2005; Simone Gotti <motaboy@gentoo.org> - kdebluetooth-0.0.20050122.ebuild: - Force the --disable-irmcsynckonnector configure's flag. Fixes bug #79180. - -*kdebluetooth-0.0.20050122 (22 Jan 2005) - - 22 Jan 2005; Simone Gotti <motaboy@gentoo.org> - +kdebluetooth-0.0.20050122-r1.ebuild, +kdebluetooth-0.0.20050122.ebuild: - Add kdebluetooth-0.0.20050122 and kdebluetooth-0.0.20050122-r1. The r1 is - hardmasked as it enables the irmcsync konnector that needs kitchensync from - kdepim 3.4. Fixes bug #62473. - - 05 Dec 2004; Simone Gotti <motaboy@gentoo.org> - -kdebluetooth-0.0.20040715-r1.ebuild, -kdebluetooth-0.0.20040715.ebuild, - -kdebluetooth-0.0.20040824.ebuild, kdebluetooth-0.0.20041107.ebuild: - Remove old ebuilds. kdebluetooth-0.0.20041107 stable on x86. - -*kdebluetooth-0.0.20041107 (07 Nov 2004) - - 07 Nov 2004; Simone Gotti <motaboy@gentoo.org> - +kdebluetooth-0.0.20041107.ebuild: - Version bump. - - 20 Sep 2004; Douglas Russell,,, <puggy@gentoo.org> - kdebluetooth-0.0.20040824.ebuild: - Adding libvorbis to dependancies which it seems to need - - 20 Sep 2004; Douglas Russell,,, <puggy@gentoo.org> : - Correcting digest - -*kdebluetooth-0.0.20040824 (29 Aug 2004) - - 29 Aug 2004; Douglas Russell,,, <puggy@gentoo.org> - +kdebluetooth-0.0.20040824.ebuild: - New snapshot fixes the sdp browse in kde-3.3.0 - -*kdebluetooth-0.0.20040715-r1 (23 Aug 2004) - - 23 Aug 2004; Douglas Russell,,, <puggy@gentoo.org> - +kdebluetooth-0.0.20040715-r1.ebuild: - Revision of kde bluetooth to truly work without arts. Also, added xmms USE flag - - 08 Aug 2004; Carsten Lohrke <carlo@gentoo.org> - -kdebluetooth-20050000.ebuild: - removed "info ebuild" - -*kdebluetooth-0.0.20040715 (01 Aug 2004) - - 01 Aug 2004; Carsten Lohrke <carlo@gentoo.org> - -kdebluetooth-0.0.20040625.ebuild, +kdebluetooth-0.0.20040715.ebuild, - kdebluetooth-20050000.ebuild: - version bump - - 31 Jul 2004; Carsten Lohrke <carlo@gentoo.org> - kdebluetooth-0.0.20040625.ebuild: - fixed dependencies - - 31 Jul 2004; Carsten Lohrke <carlo@gentoo.org> - -kdebluetooth-20040308.ebuild, -kdebluetooth-20040416.ebuild: - remove old ebuilds - -*kdebluetooth-0.0.20040625 (31 Jul 2004) - - 31 Jul 2004; Carsten Lohrke <carlo@gentoo.org> - +kdebluetooth-0.0.20040625.ebuild, +kdebluetooth-20050000.ebuild: - version bump - - 03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> kdebluetooth-20040308.ebuild, - kdebluetooth-20040416.ebuild: - QA: need-kde after R/DEPEND - - 03 Jul 2004; Dominik Stadler <centic@gentoo.org> - kdebluetooth-20040308.ebuild, kdebluetooth-20040416.ebuild: - Add missing IUSE and SLOT - - 22 Apr 2004; Luca Barbato <lu_zero@gentoo.org> kdebluetooth-20040416.ebuild: - Marked ~ppc and fixed the sourcepath - -*kdebluetooth-20040416 (16 Apr 2004) - - 16 Apr 2004; Caleb Tennis <caleb@gentoo.org> kdebluetooth-20031218.ebuild, - kdebluetooth-20040128.ebuild, kdebluetooth-20040416.ebuild: - New version, remove old versions - -*kdebluetooth-20040308 (09 Mar 2004) - - 09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdebluetooth-20040308.ebuild: - Version bump, ebuild provided by author (bug #44106) - -*kdebluetooth-20040128 (05 Feb 2004) - - 05 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdebluetooth-20040128.ebuild: - New version, closes bug #39704 - -*kdebluetooth-20031218 (06 Jan 2004) - - 06 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdebluetooth-20031218.ebuild, - metadata.xml: - Initial import - see bug #35351. - diff --git a/net-wireless/kdebluetooth/Manifest b/net-wireless/kdebluetooth/Manifest deleted file mode 100644 index 48797be9c602..000000000000 --- a/net-wireless/kdebluetooth/Manifest +++ /dev/null @@ -1,18 +0,0 @@ -AUX better-menu-names.diff 2062 RMD160 c3db60fa907a7907fd1a402df8dad13fca7763c8 SHA1 2fa8f9ecc78b212e8391c7add84f17eda94fc72f SHA256 58ddc9c33c6dc66fa85ce74ec7d60f181bb909ea7026f8d7af82091e0723d3e2 -AUX kcm-btpaired-fix.diff 15910 RMD160 e70bad64cdc8a909327427f477dd94a9282e0732 SHA1 b27f7acc10c60708681f3de648803c08191a40ba SHA256 673d2f9a2f1f92b4595d12bcc1d8bc375fed237741a48b52b0a84dffe59fb782 -AUX kcm-no-dcop-error.diff 1156 RMD160 81840a6069f8c188e2e57934c1d8d96fcee8e18f SHA1 c80b89c451f8fcb340163ba9b41ac534d09ed07d SHA256 85f082726200d7208cbda1fccdd8d5cdd27d6a6bad8ad65d768217c9139bb785 -AUX kdebluetooth-1.0_beta1-gcc41.patch 666 RMD160 e14ece6e5bd0ee91a4990431cfce0119bc815a5b SHA1 3770a41ecf35ad01a98f2e14298522b35f8486d7 SHA256 a3df51b15e79b0993928fc44eac6eedef6c5dadcaa6b832140452cb559fdee29 -AUX kdebluetooth-1.0_beta1-kde3.5.2.patch 5380 RMD160 78521240c94c5046097b04b685355edfbae8a1c6 SHA1 df66ac603bea6ec3c9c6a6d7a6b75fcb4e583768 SHA256 b36842c8aacd0cee5fadc0d0c0e0833fc84dcd056e00108251df1f895628f953 -AUX kdebluetooth-1.0_beta1-openobex-1.1.patch 7315 RMD160 c73ca92bcc511e91442ac27d9b362fa069c03db7 SHA1 ba4a45e8a138e9f53931389ccb989bb44992d3b8 SHA256 8b5dc80f455f9967dd1e0b94f3d32e9c270444063fa70eac5c387de1a8b5e848 -AUX kdebluetooth-1.0_beta8-bashism.patch 879 RMD160 519657c9933495e43a4a0f32308afe2ba1821861 SHA1 b20d28558723b03eaff085d18b6f857330bf43bb SHA256 042f12de950bbdb2c854fede63b19f425df576e91a3314a67287ac485b0bd7ae -AUX kdebluetooth-1.0_beta8-gcc43.patch 1575 RMD160 2837f0b3a9728b174d3a23fccacc7553312ddbad SHA1 411e8431c27426565fffc8d43396d36e1fd11762 SHA256 02e9d017a4f0f6966a9738e4d0307d9d8b2bb8f49787ecb28487bdfc0f81c207 -AUX kdebluetooth-1.0_beta8-kbluelock.diff 925 RMD160 4c509154371b1580611c5d5d756fd9a6790dd72c SHA1 ec150293f68fe9533b97dafc516de94f86a4503e SHA256 27b2e6e5395a7d6b7842ac978c07bf107d314b8a8042cb7b801c8e7b76d469de -AUX kdebluetooth-dbuspasskeyagent.diff 17790 RMD160 7c6b73ec8ca1aa375f6a472b966af3941dbb05eb SHA1 658d34372afb071e94c9c8555d80fcc673460141 SHA256 598d8a810c82fe2ce8aececc2649585908eced90c9fbe846fd8769452af9c5f9 -AUX kdebluetooth-sdp-bitop.diff 2012 RMD160 208ae7d61b7ee84dc77cacee22be1dbc78036abf SHA1 e7358af0bff9a1eeb2921c3c4177a0796f215b19 SHA256 ca489f6aed43d47316897c0bf303ad02877645586b70b859f38ba7450a94b736 -AUX kdebluetooth.diff 804 RMD160 b02d9c579c7b480de77b95db263188553f2421ab SHA1 a430eef27e8a6395bce594bd5f0bc661adbca81b SHA256 6fd029e1a2e85ae34ae94c99b5b8b362f43d4f6a91618fd01137b4987d6fbfef -DIST kdebluetooth-1.0_beta2.tar.bz2 1228026 RMD160 52d54f49a1eb5c89b2a5ad9550dc6b85d50b62e9 SHA1 0cfc61f4597b599cd3ef668a534c854c55921108 SHA256 9d2637a1e9bb220f048ce62014516418163d2bf92c29835a941eb962154e41b7 -DIST kdebluetooth-1.0_beta8.tar.bz2 1091884 RMD160 84570b1c3335521e4d0f976f91d0237a4b0c1ee2 SHA1 b602e02d26518217bcf1afa5da2e2473c93b81cc SHA256 3f4cf5566446b3cc9f5cdb98304fbefcd0319c0e659d60a75123e8729286f3fa -EBUILD kdebluetooth-1.0_beta2-r2.ebuild 2205 RMD160 b5681ff37b32aeb158fae21658b0ba25feeb0dfa SHA1 dd336325b763a1810d7309a1a4b9f23858348b5a SHA256 96ff513d1080d36e3f7f29aa9f6dc8209afe7a4c68f5ea4da2b21ff0c08660a1 -EBUILD kdebluetooth-1.0_beta8-r2.ebuild 1543 RMD160 40bd0e22fa24c124ce4b6f21503185bb6cb711a3 SHA1 b21059b7b42295a4817bf4ad9867e91f653b1745 SHA256 70157aad329e263ecde28d151fd5e5ac448f8c1f4fa8d2111910ee01fb787a13 -MISC ChangeLog 14425 RMD160 7bd0e06b5e79ca86b7576a8b1c736538170f881c SHA1 6c2806138b9a797718efb82946349e97f77d47e1 SHA256 f355d63e4a229d80882cfad70e877223fb322e702906938a31e74ce87f289451 -MISC metadata.xml 252 RMD160 5050aee89a626730668539dee047f9b3e13e6382 SHA1 748125968cc776b5534a4e8a4c4db89ab4333571 SHA256 0e4030fc3b8fd3629227fb2c57e80882c546f9a4087178ce61c4e6f266187b7a diff --git a/net-wireless/kdebluetooth/files/better-menu-names.diff b/net-wireless/kdebluetooth/files/better-menu-names.diff deleted file mode 100644 index e9212c1e42b4..000000000000 --- a/net-wireless/kdebluetooth/files/better-menu-names.diff +++ /dev/null @@ -1,55 +0,0 @@ -Index: kdebluetooth/kdebluetooth-common/Makefile.am -================================================================================ ---- kdebluetooth/kbtobexclient/kbtobexclient.desktop -+++ kdebluetooth/kbtobexclient/kbtobexclient.desktop -@@ -4,10 +4,7 @@ - Icon=kdebluetooth - Type=Application - MimeType=bluetooth/obex-object-push-profile --Name=kbtobexclient --Name[ta]=kbtobex கிளைஞ்சன் --Name[tr]=kbtobexistemcisi --Name[xx]=xxkbtobexclientxx -+Name=Send File via Bluetooth - GenericName=Bluetooth OBEX Client - GenericName[bg]=OBEX клиент за Bluetooth - GenericName[br]=Arlun OBEX Bluetooth ---- kdebluetooth/kbtserialchat/kbtserialchat.desktop -+++ kdebluetooth/kbtserialchat/kbtserialchat.desktop -@@ -5,9 +5,7 @@ - Type=Application - MimeType=bluetooth/serial-port-profile - Name=kbtserialchat --Name[sv]=Kbtserialchat --Name[tr]=kbtserisohbet --Name[xx]=xxkbtserialchatxx -+Name=Bluetooth Terminal - GenericName=Bluetooth Chat - GenericName[bg]=Разговор с Bluetooth - GenericName[br]=Flapañ gant Bluetooth -@@ -57,3 +55,4 @@ - Comment[ta]=புலுடுத்துக்கான சிறிய முடிவு பயன்பாடு. - Comment[tr]=Bluetooth için küçük seri terminal uygulaması - Comment[xx]=xxSmall serial terminal application for Bluetoothxx -+X-SuSE-Unimportant=true ---- kdebluetooth/kdebluetooth-common/Makefile.am -+++ kdebluetooth/kdebluetooth-common/Makefile.am -@@ -7,18 +7,6 @@ - - EXTRA_DIST = $(kde_servicetypes_DATA) - --# Bluetooth directory entry in the control center --xdg_directory_DATA = kde-settings-network-bluetooth.directory -- --# from kdebase/applnk/Makefile.am --install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/Network/Bluetooth -- $(INSTALL_DATA) $(srcdir)/kde-settings-network-bluetooth.directory \ -- $(DESTDIR)$(kde_appsdir)/Settings/Network/Bluetooth/.directory -- --uninstall-local: -- -rm -f $(DESTDIR)$(kde_appsdir)/Settings/Network/Bluetooth/.directory -- - # Update scripts - #update_DATA = kdebluetooth.upd kdebluetooth.sh - #updatedir = $(kde_datadir)/kconf_update diff --git a/net-wireless/kdebluetooth/files/kcm-btpaired-fix.diff b/net-wireless/kdebluetooth/files/kcm-btpaired-fix.diff deleted file mode 100644 index 574d234b2b80..000000000000 --- a/net-wireless/kdebluetooth/files/kcm-btpaired-fix.diff +++ /dev/null @@ -1,464 +0,0 @@ ---- kdebluetooth/kbluetoothd/kcm_btpaired/filesettingsbase.ui -+++ kdebluetooth/kbluetoothd/kcm_btpaired/filesettingsbase.ui -@@ -1,4 +1,4 @@ --<!DOCTYPE UI><UI version="3.2" stdsetdef="1"> -+<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> - <class>FileSettingsBase</class> - <widget class="QWidget"> - <property name="name"> -@@ -24,7 +24,7 @@ - <cstring>textLabel3</cstring> - </property> - <property name="text"> -- <string>Here you have to specify the correct start/stop commands for BlueZ's <i>hcid</i> and the location of BlueZ's <i>link_key</i> file for the distribution you are using.</string> -+ <string>Here you have to specify the correct start/stop commands for BlueZ's <i>hcid</i> and the directory of the BlueZ's <i>link_key</i> files for the distribution you are using.</string> - </property> - <property name="alignment"> - <set>WordBreak|AlignVCenter</set> -@@ -123,7 +123,7 @@ - <cstring>textLabel1_2</cstring> - </property> - <property name="text"> -- <string>Link key file:</string> -+ <string>Link key directory:</string> - </property> - </widget> - <widget class="KURLRequester" row="0" column="1"> -@@ -138,6 +138,9 @@ - <verstretch>0</verstretch> - </sizepolicy> - </property> -+ <property name="mode"> -+ <number>26</number> -+ </property> - <property name="toolTip" stdset="0"> - <string></string> - </property> ---- kdebluetooth/kbluetoothd/kcm_btpaired/pairedtab.cpp -+++ kdebluetooth/kbluetoothd/kcm_btpaired/pairedtab.cpp -@@ -44,6 +44,7 @@ - using namespace std; - using namespace KBluetooth; - -+/* linkkey file is now ASCII format - struct HcidLinkKeyStruct { - bdaddr_t sba; - bdaddr_t dba; -@@ -54,19 +55,17 @@ - uint8_t type; - time_t time; - }; -+*/ - - PairedTab::PairedTab(QWidget *parent, const char* name) : - PairedTabBase(parent, name) - { - KConfig* config = KApplication::kApplication()->config(); -- linkKeyFilename = config->readEntry("linkKeyFile", "/etc/bluetooth/link_key"); -- config->writeEntry("linkKeyFile", linkKeyFilename); -- hcidStartCommand = config->readEntry("hcidStartCommand", "/etc/init.d/bluez-utils start"); -- hcidStopCommand = config->readEntry("hcidStopCommand", "/etc/init.d/bluez-utils stop"); -+ linkKeyPath = config->readEntry("linkKeyPath", "/var/lib/bluetooth/"); -+ config->writeEntry("linkKeyPath", linkKeyPath); -+ hcidStartCommand = config->readEntry("hcidStartCommand", "/etc/init.d/bluetooth start"); -+ hcidStopCommand = config->readEntry("hcidStopCommand", "/etc/init.d/bluetooth stop"); - bDirty = false; -- linkKeyFileValid = false; -- reloadList(); -- updateGUI(); - linkKeyFileWatch = new KDirWatch(this); - connect(linkKeyFileWatch, SIGNAL(dirty(const QString&)), - this, SLOT(slotKeyFileChanged())); -@@ -84,13 +83,51 @@ - baseDialog->hide(); - connect(baseDialog, SIGNAL(applyClicked()), this, SLOT(slotApplyFileSettings())); - connect(baseDialog, SIGNAL(okClicked()), this, SLOT(slotApplyFileSettings())); -+ -+ watchKeys(); - -- linkKeyFileWatch->addFile(linkKeyFilename); - linkKeyFileWatch->startScan(true, true); -+ -+ reloadList(); -+ updateGUI(); -+} -+ -+void PairedTab::watchKeys() { -+ -+ kdDebug() << "watchKeys()" << endl; -+ -+ QDir keyDir(linkKeyPath); -+ keyDir.setFilter( QDir::Dirs ); -+ keyDir.setNameFilter("*:*:*:*:*"); -+ -+ QFileInfo *fi; -+ const QFileInfoList *list = keyDir.entryInfoList(); -+ QFileInfoListIterator it(*list); -+ -+ linkKeyFilename.clear(); -+ -+ while ((fi = it.current()) != 0) { -+ -+ QString btDeviceDir = fi->fileName(); -+ QString filename = keyDir.absPath(); -+ filename.append("/").append(btDeviceDir).append("/").append("linkkeys"); -+ -+ QFile keyFile(filename); -+ -+ if (keyFile.exists()) { -+ linkKeyFileWatch->addFile(filename); -+ linkKeyFilename.append(filename); -+ } -+ -+ ++it; -+ } - } - - void PairedTab::reloadList() - { -+ -+ kdDebug() << "relodList()" << endl; -+ - if (bDirty) { - if (KMessageBox::warningContinueCancel(this, i18n( - "The link key file has changed on disk. Do you want to reload the table and \ -@@ -98,82 +135,96 @@ - return; - } - } -- -- QFile file(linkKeyFilename); -- -- kdDebug() << "reloadList()" << endl; - pairingList.clear(); -- linkKeyFileValid = false; -- if (file.open(IO_ReadOnly)) { -- linkKeyFileValid = true; -- bool readSizeMismatch = false; -- while (true) { -- PairingInfo newInfo; -- HcidLinkKeyStruct linkKeyStruct; -- int rSize = 0; -- if ((rSize = file.readBlock((char*)&linkKeyStruct, sizeof(HcidLinkKeyStruct))) -- == sizeof(HcidLinkKeyStruct)) -- { -- newInfo.localAddr = DeviceAddress(linkKeyStruct.sba); -- newInfo.remoteAddr = DeviceAddress(linkKeyStruct.dba); -- newInfo.time.setTime_t(linkKeyStruct.time); -- newInfo.type = linkKeyStruct.type; -- for (int n=0; n<16; ++n) { -- newInfo.linkKey[n] = linkKeyStruct.key[n]; -- } -- newInfo.remoteName = QString(newInfo.remoteAddr); -- NameCache::getCachedName(newInfo.remoteAddr, newInfo.remoteName); -- newInfo.remoteClass = 0; -- NameCache::getCachedClass(newInfo.remoteAddr, newInfo.remoteClass); -- pairingList.push_back(newInfo); -- } -- else { -- if (rSize != 0) { -- readSizeMismatch = true; -- } -- break; -- } -- kdDebug() << "localAddr read:" << QString(newInfo.localAddr) << endl; -- } -- -- linkKeyFileValid = !readSizeMismatch; -- file.close(); -+ -+ QStringList::iterator it; -+ for (it = linkKeyFilename.begin(); it != linkKeyFilename.end(); ++it) { -+ -+ QFile file((*it)); -+ -+ if (file.open(IO_ReadOnly)) { -+ -+ QTextStream stream(&file); -+ QString line, localAddr, remoteAddr, symLink, remoteClass; -+ -+ while (!stream.atEnd()) { -+ PairingInfo newInfo; -+ -+ line = stream.readLine(); -+ -+ QFileInfo fi(file); -+ QDir dir(fi.dir()); -+ localAddr = dir.dirName(); -+ -+ remoteAddr = line.left(17); -+ -+ newInfo.localAddr = DeviceAddress(localAddr); -+ newInfo.remoteAddr = DeviceAddress(remoteAddr); -+ -+ // XXX: not provided by linkkey file at the moment -+ // newInfo.time.setTime_t(linkKeyStruct.time); -+ -+ newInfo.linkKey = line.mid(18, 32); -+ -+ newInfo.remoteName = QString(newInfo.remoteAddr); -+ NameCache::getCachedName(newInfo.remoteAddr, newInfo.remoteName); -+ -+ newInfo.remoteClass = 0; // not provided by linkkey file at the moment(?) FIXME -+ -+ NameCache::getCachedClass(newInfo.remoteAddr, newInfo.remoteClass); -+ pairingList.push_back(newInfo); -+ } -+ -+ file.close(); -+ } - } - } - - bool PairedTab::saveList() - { -+ kdDebug() << "saveList()" << endl; -+ - if (bDirty == false) return true; - -- kdDebug() << "saveList()" << endl; -- - if (!stopDaemon()) return false; -- -- QFile file(linkKeyFilename); -- if (file.open(IO_WriteOnly)) { -- for (unsigned int n=0; n<pairingList.size(); ++n) { -- HcidLinkKeyStruct info; -- info.dba = pairingList[n].remoteAddr.getBdaddr(false); -- for (int p=0; p<16; ++p) { -- info.key[p] = pairingList[n].linkKey[p]; -- } -- info.sba = pairingList[n].localAddr.getBdaddr(false); -- info.time = pairingList[n].time.toTime_t(); -- info.type = pairingList[n].type; -- file.writeBlock(reinterpret_cast<char*>(&info), sizeof(info)); -- } -- file.close(); -- -- if (!startDaemon()) return false; - -- bDirty = false; -- return true; -+ QStringList::iterator it; -+ for (it = linkKeyFilename.begin(); it != linkKeyFilename.end(); ++it) { -+ -+ QFile file((*it)); -+ QFileInfo fi(file); -+ QDir deviceDir(fi.dir()); -+ -+ // clear linkkey file -+ file.remove(); -+ -+ if (file.open(IO_WriteOnly)) { -+ QTextStream stream(&file); -+ for (unsigned int n=0; n<pairingList.size(); ++n) { -+ -+ if (pairingList[n].localAddr == deviceDir.dirName()) -+ continue; -+ -+ stream << pairingList[n].remoteAddr << " "; -+ stream << pairingList[n].linkKey << " "; -+ stream << pairingList[n].remoteClass << '\n'; -+ } -+ file.close(); -+ -+ bDirty = false; -+ } - } -- else { -- KMessageBox::error(this, i18n("Could not write \ --link key file. Your changes cannot be saved."), i18n("Error")); -- return false; -+ -+ if (bDirty) { -+ KMessageBox::error(this, i18n("Could not write " -+ "all link key files. Your complete changes cannot be saved."), i18n("Error")); // XXX String update -+ -+ return false; - } -+ -+ if (!startDaemon()) return false; -+ -+ return true; - } - - bool PairedTab::stopDaemon() -@@ -192,34 +243,53 @@ - - void PairedTab::updateGUI() - { -- vector<PairingInfo>::iterator pairIt; -+ kdDebug() << "updateGUI()" << endl; -+ vector<PairingInfo>::iterator pairIt, remoteIt; -+ KBluetooth::DeviceAddress prevLocalAddr; -+ QListViewItem *viewItem = NULL; - pairingListView->clear(); - for (pairIt = pairingList.begin(); pairIt != pairingList.end(); ++pairIt) { -- QListViewItem *viewItem = new QListViewItem(pairingListView); -- pairIt->listViewItem = viewItem; -- -- viewItem->setText(0, QString(pairIt->remoteName)); -- QListViewItem *remoteAddrItem = new QListViewItem(viewItem); -- remoteAddrItem->setPixmap(0, KGlobal::iconLoader()->loadIcon( -- "pda_blue", KIcon::Small, 16)); -- remoteAddrItem->setSelectable(false); -- remoteAddrItem->setText(0, QString(pairIt->remoteAddr)); -- -- QListViewItem *localAddrItem = new QListViewItem(viewItem); -- localAddrItem->setPixmap(0, KGlobal::iconLoader()->loadIcon( -- "usbpendrive_unmount", KIcon::Small, 16)); -- localAddrItem->setSelectable(false); -- localAddrItem->setText(0, QString(pairIt->localAddr)); -- -+ -+ if (prevLocalAddr != pairIt->localAddr) { -+ kdDebug() << ">> " << pairIt->localAddr << endl; -+ viewItem = new QListViewItem(pairingListView); -+ viewItem->setSelectable(false); -+ viewItem->setText(0, QString(pairIt->localAddr)); -+ viewItem->setOpen(true); -+ viewItem->setPixmap(0, KGlobal::iconLoader()->loadIcon( -+ "usbpendrive_unmount", KIcon::Small, 16)); -+ } -+ -+ -+ remoteIt = pairIt; -+ if (remoteIt->localAddr == pairIt->localAddr) { -+ kdDebug() << "\t>> " << remoteIt->remoteAddr << endl; -+ QListViewItem *remoteAddrItem = new QListViewItem(viewItem); -+ remoteIt->listViewItem = remoteAddrItem; -+ QString iconName = DeviceClassMimeConverter::classToIconName(remoteIt->remoteClass); -+ remoteAddrItem->setPixmap(0, KGlobal::iconLoader()->loadIcon( -+ iconName, KIcon::Small, 16)); -+ -+ remoteAddrItem->setSelectable(true); -+ -+ kdDebug() << "remoteName: " << remoteIt->remoteName << endl; -+ if (remoteIt->remoteName == remoteIt->remoteAddr) -+ remoteAddrItem->setText(0, QString(remoteIt->remoteAddr)); -+ else -+ remoteAddrItem->setText(0, QString(remoteIt->remoteAddr).append(" / ").append(remoteIt->remoteName)); -+ } -+ -+ -+ /* not provided by the linkkey file at the moment -+ - QListViewItem *timeItem = new QListViewItem(viewItem); - timeItem->setPixmap(0, KGlobal::iconLoader()->loadIcon( - "clock", KIcon::Small, 16)); - timeItem->setSelectable(false); - timeItem->setText(0, pairIt->time.toString()); -+ */ -+ prevLocalAddr = pairIt->localAddr; - -- QString iconName = DeviceClassMimeConverter::classToIconName(pairIt->remoteClass); -- viewItem->setPixmap(0, KGlobal::iconLoader()->loadIcon( -- iconName, KIcon::Small, 16)); - } - } - -@@ -232,9 +302,14 @@ - - void PairedTab::slotRemovePairing() - { -+ kdDebug() << "slotRemovePairing()" << endl; - bool bDirty = false; -+ kdDebug() << "list size: " << pairingList.size() << endl; - for (int n=pairingList.size()-1; n>=0; --n) { -+ kdDebug() << n << " remote: " << pairingList[n].remoteAddr << pairingList[n].listViewItem->text(0) << pairingList[n].listViewItem->isSelected() << endl; - if (pairingList[n].listViewItem->isSelected()) { -+ kdDebug() << "erase pair: " << n << endl; -+ - pairingList.erase(pairingList.begin()+n); - bDirty = true; - } -@@ -248,20 +323,22 @@ - - void PairedTab::slotSelectionChanged() - { -- for (QListViewItem* i=pairingListView->firstChild(); i != NULL; -- i = i->nextSibling()) -- { -- if (i->isSelected()) { -- removePairingButton->setEnabled(true); -- return; -- } -+ for (QListViewItem* i=pairingListView->firstChild(); i != NULL; i = i->nextSibling()) { -+ for (QListViewItem *child=i->firstChild(); child != NULL; child = child->nextSibling()) -+ { -+ if (child->isSelected()) { -+ removePairingButton->setEnabled(true); -+ return; -+ } -+ } - } -+ - removePairingButton->setEnabled(false); - } - - void PairedTab::slotFileSettings() - { -- fileSettingsDialog->linkKeyFileEdit->setURL(linkKeyFilename); -+ fileSettingsDialog->linkKeyFileEdit->setURL(linkKeyPath); - fileSettingsDialog->startCommandEdit->setURL(hcidStartCommand); - fileSettingsDialog->stopCommandEdit->setURL(hcidStopCommand); - -@@ -270,20 +347,26 @@ - - void PairedTab::slotApplyFileSettings() - { -- linkKeyFileWatch->removeFile(linkKeyFilename); -+ QStringList::iterator it; -+ for (it = linkKeyFilename.begin(); it != linkKeyFilename.end(); ++it) { -+ linkKeyFileWatch->removeFile((*it)); -+ } - -- linkKeyFilename = fileSettingsDialog->linkKeyFileEdit->url(); -+ linkKeyPath = fileSettingsDialog->linkKeyFileEdit->url(); - hcidStartCommand = fileSettingsDialog->startCommandEdit->url(); - hcidStopCommand = fileSettingsDialog->stopCommandEdit->url(); -+ -+ kdDebug() << "keypath: " << fileSettingsDialog->linkKeyFileEdit->url() << endl; - - KConfig* config = KApplication::kApplication()->config(); -- config->writeEntry("linkKeyFile", linkKeyFilename); -+ config->writeEntry("linkKeyPath", linkKeyPath); - config->writeEntry("hcidStartCommand", hcidStartCommand); - config->writeEntry("hcidStopCommand", hcidStopCommand); -+ -+ watchKeys(); -+ - reloadList(); - updateGUI(); -- -- linkKeyFileWatch->addFile(linkKeyFilename); - } - - ---- kdebluetooth/kbluetoothd/kcm_btpaired/pairedtab.h -+++ kdebluetooth/kbluetoothd/kcm_btpaired/pairedtab.h -@@ -43,7 +43,7 @@ - KBluetooth::DeviceAddress remoteAddr; - QString remoteName; - int remoteClass; -- uint8_t linkKey[16]; -+ QString linkKey; - uint8_t type; - QDateTime time; - QListViewItem *listViewItem; -@@ -52,12 +52,14 @@ - bool linkKeyFileValid; - bool bDirty; - -- QString linkKeyFilename; -+ QValueList <QString> linkKeyFilename; -+ QString linkKeyPath; - QString hcidStartCommand; - QString hcidStopCommand; - KDirWatch *linkKeyFileWatch; - FileSettingsBase *fileSettingsDialog; - -+ void watchKeys(); - void reloadList(); - bool saveList(); - bool startDaemon(); diff --git a/net-wireless/kdebluetooth/files/kcm-no-dcop-error.diff b/net-wireless/kdebluetooth/files/kcm-no-dcop-error.diff deleted file mode 100644 index 57ba8b93d821..000000000000 --- a/net-wireless/kdebluetooth/files/kcm-no-dcop-error.diff +++ /dev/null @@ -1,26 +0,0 @@ -Index: kbluetoothd/kcm/servicetab.cpp -================================================================================ ---- kdebluetooth/kbluetoothd/kcm/servicetab.cpp -+++ kdebluetooth/kbluetoothd/kcm/servicetab.cpp -@@ -389,7 +389,7 @@ - { - DCOPCall dcop(client, "kbluetoothd", "MetaServer"); - if (dcop.call("services()")!="QStringList") { -- disableInterface(i18n("DCOP error when calling services()")); -+ disableInterface(i18n("No Bluetooth device found, disabling interface.")); - return QStringList(); - } - else { ---- kdebluetooth/kbluetoothd/libkbluetoothd/checkdaemon.cpp -+++ kdebluetooth/kbluetoothd/libkbluetoothd/checkdaemon.cpp -@@ -36,8 +36,8 @@ - KMessageBox::information(mainWidget, - i18n("<p>The KDE Bluetooth Daemon (<i>kbluetoothd</i>) is \ - needed and was started.</p>"), -- i18n("KDE Bluetooth Framework"), -- "kbluetoothd_autostart_msgbox"); -+ i18n("KDE Bluetooth Framework")/*, -+ "kbluetoothd_autostart_msgbox"*/); - } - return true; - } diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-gcc41.patch b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-gcc41.patch deleted file mode 100644 index b1aecf30ba9e..000000000000 --- a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-gcc41.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --exclude=CVS --exclude=.svn -up --new-file --recursive kdebluetooth-1.0_beta1.orig/kdebluetooth/irmcsync/irmcsynckonnector/clientmanager.h kdebluetooth-1.0_beta1/kdebluetooth/irmcsync/irmcsynckonnector/clientmanager.h ---- kdebluetooth-1.0_beta1.orig/kdebluetooth/irmcsync/irmcsynckonnector/clientmanager.h 2005-03-20 17:46:48.000000000 +0100 -+++ kdebluetooth-1.0_beta1/kdebluetooth/irmcsync/irmcsynckonnector/clientmanager.h 2006-03-23 21:14:52.000000000 +0100 -@@ -58,7 +58,7 @@ namespace KSync - ~ClientManager(); - - -- void ClientManager::setObexClient(Client*); -+ void setObexClient(Client*); - - /** - Returns if the worker is idel at the monment. diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-kde3.5.2.patch b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-kde3.5.2.patch deleted file mode 100644 index f1fe51f118cd..000000000000 --- a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-kde3.5.2.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop ---- kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop 2005-03-21 03:16:48.000000000 +1030 -+++ kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop 2006-04-08 22:55:57.000000000 +0930 -@@ -3,6 +3,7 @@ - Type=MimeType - MimeType=bluetooth/computer-device-class - Icon=konsole -+X-KDE-IsAlso=inode/directory - Comment=Computer/PDA Bluetooth Device - Comment[bg]=Компютърно/PDA устройство Bluetooth - Comment[bs]=Računar/PDA Bluetooth uređaj -diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop ---- kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop 2005-03-21 03:16:48.000000000 +1030 -+++ kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop 2006-04-08 22:55:31.000000000 +0930 -@@ -3,6 +3,7 @@ - Type=MimeType - MimeType=bluetooth/misc-device-class - Icon=kdebluetooth -+X-KDE-IsAlso=inode/directory - Comment=Miscellaneous Bluetooth Device - Comment[bg]=Разни устройства Bluetooth - Comment[da]=Diverse Bluetooth-enheder -diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop ---- kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop 2005-03-21 03:16:48.000000000 +1030 -+++ kdebluetooth-1.0_beta1/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop 2006-04-08 22:54:46.000000000 +0930 -@@ -3,6 +3,7 @@ - Type=MimeType - MimeType=bluetooth/phone-device-class - Icon=kaddressbook -+X-KDE-IsAlso=inode/directory - Comment=Phone Bluetooth Device - Comment[bg]=Телефонно устройство Bluetooth - Comment[da]=Telefon Bluetooth-enhed -diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/bluetooth.protocol kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/bluetooth.protocol ---- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/bluetooth.protocol 2005-03-21 03:16:48.000000000 +1030 -+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/bluetooth.protocol 2006-04-08 22:56:36.000000000 +0930 -@@ -4,6 +4,7 @@ - input=none - output=filesystem - reading=true -+listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link - Icon=kdebluetooth - Description=Bluetooth inquiry protocol - Description[da]=Bluetooth forespørgselsprotokol -diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp ---- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp 2005-03-21 03:16:48.000000000 +1030 -+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp 2006-04-08 22:58:56.000000000 +0930 -@@ -64,6 +64,7 @@ - if (url.hasHost() == false && path == "/") - { - createDirEntry(entry, "Bluetooth neighbourhood"); -+ statEntry(entry); - finished(); - } - else { -@@ -284,7 +285,8 @@ - - addAtom(entry, UDS_MIME_TYPE, mimeType); - addAtom(entry, UDS_FILE_TYPE, S_IFDIR); -- addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder"); -+ // No more necessary -+ // addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder"); - - return true; - } -diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.cpp kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.cpp ---- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.cpp 2005-03-21 03:16:48.000000000 +1030 -+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.cpp 2006-04-08 23:06:53.000000000 +0930 -@@ -131,12 +131,21 @@ - if (path == "/") - { - createDirEntry(entry, "Bluetooth neighbourhood"); -+ statEntry(entry); - finished(); - } - else - { -- error(KIO::ERR_SLAVE_DEFINED, -+ QRegExp reg = QRegExp("^/uuid-(0x[a-f,A-F,0-9:]+)/"); -+ if (reg.search(path) >= 0) { -+ createDirEntry(entry, "More services"); -+ statEntry(entry); -+ finished(); -+ } -+ else { -+ error(KIO::ERR_SLAVE_DEFINED, - i18n("Could not stat %1. Unknown device").arg(url.url())); -+ } - } - } - else { -diff -rNur kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.protocol kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.protocol ---- kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.protocol 2005-03-21 03:16:48.000000000 +1030 -+++ kdebluetooth-1.0_beta1/kdebluetooth/kioslave/sdp/btsdp.protocol 2006-04-08 22:59:38.000000000 +0930 -@@ -5,6 +5,7 @@ - output=filesystem - reading=true - Icon=kdebluetooth -+listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link - Description=Bluetooth service discovery protocol - Description[da]=Bluetooth-protokol til opdagelse af serviceydelser - Description[et]=Bluetoothi teenuste avastamise protokoll diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-openobex-1.1.patch b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-openobex-1.1.patch deleted file mode 100644 index d1ef1ce20f95..000000000000 --- a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta1-openobex-1.1.patch +++ /dev/null @@ -1,214 +0,0 @@ -diff -Nru kdebluetooth-1.0_beta1.orig/configure.in kdebluetooth-1.0_beta1/configure.in ---- kdebluetooth-1.0_beta1.orig/configure.in 2005-03-20 18:46:50.000000000 +0200 -+++ kdebluetooth-1.0_beta1/configure.in 2006-04-23 20:42:41.850121250 +0300 -@@ -200,75 +200,7 @@ - fi - - -- -- --dnl Check for openobex library --# Modified by Simone Gotti for kde-bluetooth on 2003-10-04 -- --AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no) -- --if test "$OPENOBEX_CONFIG" = "no" ; then -- AC_MSG_WARN(openobex-config not found. Pehaps openobex is not installed.) -- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" -- OPENOBEX_CONFIG="false" --fi -- --OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags` --openobex_inc_dir=`echo $OPENOBEX_CFLAGS | cut -dI -f2` --if test -f "$openobex_inc_dir/obex.h" ; then -- : --else -- if test -f "$openobex_inc_dir/openobex/obex.h" ; then -- OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS/openobex" -- else -- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" -- fi --fi --OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs` -- --min_obex_version=1.0.0 --AC_MSG_CHECKING(for openobex - version >= $min_obex_version) --obex_config_version=`$OPENOBEX_CONFIG --version` -- --obex_config_major_version=`$OPENOBEX_CONFIG --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` --obex_config_minor_version=`$OPENOBEX_CONFIG --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` --obex_config_micro_version=`$OPENOBEX_CONFIG --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- --obex_req_major_version=`echo $min_obex_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` --obex_req_minor_version=`echo $min_obex_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` --obex_req_micro_version=`echo $min_obex_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- --if test -n "$obex_req_major_version" && test -n "$obex_config_minor_version" ; then -- if test $obex_req_major_version -lt $obex_config_major_version ; then -- obex_config_version_ok="yes" -- fi -- if test $obex_req_major_version -eq $obex_config_major_version ; then -- if test $obex_req_minor_version -lt $obex_config_minor_version ; then -- obex_config_version_ok="yes" -- fi -- if test $obex_req_minor_version -eq $obex_config_minor_version ; then -- if test $obex_req_micro_version -le $obex_config_micro_version ; then -- obex_config_version_ok="yes" -- fi -- fi -- fi --fi -- --if test "$obex_config_version_ok" != "yes" ; then -- AC_MSG_WARN(Installed openobex library too old ($obex_config_version)) -- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" --fi -- -- --AC_SUBST(OPENOBEX_CFLAGS) --AC_SUBST(OPENOBEX_LIBS) --AC_MSG_RESULT(yes) -+AM_PATH_OPENOBEX(1.0.0) - - CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" - -@@ -519,14 +451,6 @@ - echo "" - fi - --if test "$obex_config_version_ok" != "yes" ; then -- echo "" -- echo "The installed openobex library version is too old: ($obex_config_version)" -- echo "Kdebluetooth won't be compiled without a newer version, so you should" -- echo "consider updating it." -- echo "" --fi -- - - - -diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h ---- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobex.h 2005-03-20 18:46:48.000000000 +0200 -+++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobex.h 2006-04-23 20:58:31.657480500 +0300 -@@ -30,7 +30,7 @@ - { - #include <sys/socket.h> - #include <bluetooth/bluetooth.h> --#include <obex.h> -+#include <openobex/obex.h> - } - - extern "C" void Obex_handleEvent(obex_t *, obex_object_t *, int, int, int, int); -diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h ---- kdebluetooth-1.0_beta1.orig/kdebluetooth/libkobex/kobexheader.h 2005-03-20 18:46:48.000000000 +0200 -+++ kdebluetooth-1.0_beta1/kdebluetooth/libkobex/kobexheader.h 2006-04-23 20:58:43.326209750 +0300 -@@ -20,7 +20,7 @@ - #define KOBEXHEADER_H - - extern "C" { -- #include <obex.h> -+ #include <openobex/obex.h> - } - - class ObexObject; -diff -Nru kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.in kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in ---- kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.in 2006-06-30 14:03:45.000000000 +0200 -+++ kdebluetooth-1.0_beta1/kdebluetooth/configure.in.in 2006-06-30 14:04:58.000000000 +0200 -@@ -127,74 +127,7 @@ - - - -- --dnl Check for openobex library --# Modified by Simone Gotti for kde-bluetooth on 2003-10-04 -- --AC_PATH_PROG(OPENOBEX_CONFIG, openobex-config, no) -- --if test "$OPENOBEX_CONFIG" = "no" ; then -- AC_MSG_WARN(openobex-config not found. Pehaps openobex is not installed.) -- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" -- OPENOBEX_CONFIG="false" --fi -- --OPENOBEX_CFLAGS=`$OPENOBEX_CONFIG --cflags` --openobex_inc_dir=`echo $OPENOBEX_CFLAGS | cut -dI -f2` --if test -f "$openobex_inc_dir/obex.h" ; then -- : --else -- if test -f "$openobex_inc_dir/openobex/obex.h" ; then -- OPENOBEX_CFLAGS="$OPENOBEX_CFLAGS/openobex" -- else -- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" -- fi --fi --OPENOBEX_LIBS=`$OPENOBEX_CONFIG --libs` -- --min_obex_version=1.0.0 --AC_MSG_CHECKING(for openobex - version >= $min_obex_version) --obex_config_version=`$OPENOBEX_CONFIG --version` -- --obex_config_major_version=`$OPENOBEX_CONFIG --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` --obex_config_minor_version=`$OPENOBEX_CONFIG --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` --obex_config_micro_version=`$OPENOBEX_CONFIG --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- --obex_req_major_version=`echo $min_obex_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` --obex_req_minor_version=`echo $min_obex_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` --obex_req_micro_version=`echo $min_obex_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- --if test -n "$obex_req_major_version" && test -n "$obex_config_minor_version" ; then -- if test $obex_req_major_version -lt $obex_config_major_version ; then -- obex_config_version_ok="yes" -- fi -- if test $obex_req_major_version -eq $obex_config_major_version ; then -- if test $obex_req_minor_version -lt $obex_config_minor_version ; then -- obex_config_version_ok="yes" -- fi -- if test $obex_req_minor_version -eq $obex_config_minor_version ; then -- if test $obex_req_micro_version -le $obex_config_micro_version ; then -- obex_config_version_ok="yes" -- fi -- fi -- fi --fi -- --if test "$obex_config_version_ok" != "yes" ; then -- AC_MSG_WARN(Installed openobex library too old ($obex_config_version)) -- DO_NOT_COMPILE="$DO_NOT_COMPILE kdebluetooth" --fi -- -- --AC_SUBST(OPENOBEX_CFLAGS) --AC_SUBST(OPENOBEX_LIBS) --AC_MSG_RESULT(yes) -+AM_PATH_OPENOBEX(1.0.0) - - CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" - ---- kdebluetooth-1.0_beta1.orig/kdebluetooth/configure.in.bot 2006-06-30 14:12:01.000000000 +0200 -+++ kdebluetooth-1.0_beta1/kdebluetooth/configure.in.bot 2006-06-30 14:12:11.000000000 +0200 -@@ -26,13 +26,6 @@ - echo "" - fi - --if test "$obex_config_version_ok" != "yes" ; then -- echo "" -- echo "The installed openobex library version is too old: ($obex_config_version)" -- echo "Kdebluetooth won't be compiled without a newer version, so you should" -- echo "consider updating it." -- echo "" --fi - - - diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-bashism.patch b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-bashism.patch deleted file mode 100644 index 25271145f592..000000000000 --- a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-bashism.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- kdebluetooth-1.0_beta8.orig/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler -+++ kdebluetooth-1.0_beta8/kdebluetooth/kdebluetooth-common/dunhandler/dunhandler -@@ -45,7 +45,7 @@ - # Find the first unbinded /dev/rfcommX - DEV_NUMBER=0 - while test "x"$(echo $RFCOMM_SHOW_OUT | grep "rfcomm"$DEV_NUMBER":"| cut -d' ' -f1 ) != "x"; do -- DEV_NUMBER=$[$DEV_NUMBER+1] -+ DEV_NUMBER=$(($DEV_NUMBER+1)) - if test $DEV_NUMBER -gt 255; then break; fi; - done; - ---- kdebluetooth-1.0_beta8.orig/kdebluetooth/kioslave/obex/kio_obex/kioobex_start -+++ kdebluetooth-1.0_beta8/kdebluetooth/kioslave/obex/kio_obex/kioobex_start -@@ -3,7 +3,7 @@ - # This shell script is used as a mimetype handler - # for the bluetooth/obex-ftp-protocol mimetype. - --if (( $# == 0 )) ; then -+if [ $# = 0 ] ; then - konqueror "sdp:/" - else - host=$(echo $@ | sed 's/sdp:\/\/\[\(..:..:..:..:..:..\).*/\1/') diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-gcc43.patch b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-gcc43.patch deleted file mode 100644 index d86d63f938e6..000000000000 --- a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-gcc43.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- kdebluetooth/libkbluetooth/sdpdevice.cpp~ 2008-03-31 17:47:49.000000000 +0200 -+++ kdebluetooth/libkbluetooth/sdpdevice.cpp 2008-03-31 17:48:10.000000000 +0200 -@@ -9,6 +9,7 @@ - * (at your option) any later version. * - ***************************************************************************/ - -+#include <cstdlib> - #include <assert.h> - #include "sdpdevice.h" - #include <kdebug.h> ---- kdebluetooth/kcm_btpaired/pairedtab.cpp~ 2008-03-31 17:52:44.000000000 +0200 -+++ kdebluetooth/kcm_btpaired/pairedtab.cpp 2008-03-31 17:52:56.000000000 +0200 -@@ -55,8 +55,8 @@ - using namespace KBluetooth; - - struct HcidLinkKeyStruct { -- uint8_t key[16]; -- uint8_t type; -+ unsigned char key[16]; -+ unsigned char type; - time_t time; - }; - ---- kdebluetooth/kcm_btpaired/pairedtab.h~ 2008-03-31 17:51:32.000000000 +0200 -+++ kdebluetooth/kcm_btpaired/pairedtab.h 2008-03-31 17:52:28.000000000 +0200 -@@ -65,8 +65,8 @@ - QString remoteAddr; - QString remoteName; - QString remoteClass; -- uint8_t linkKey[16]; -- uint8_t type; -+ unsigned char linkKey[16]; -+ unsigned char type; - QString lastUsedTime; - QString lastSeenTime; - QListViewItem *listViewItem; ---- kdebluetooth/kbluetooth/sdprecord.cpp~ 2008-03-31 17:49:08.000000000 +0200 -+++ kdebluetooth/kbluetooth/sdprecord.cpp 2008-03-31 17:49:16.000000000 +0200 -@@ -11,6 +11,7 @@ - - #include "sdprecord.h" - -+#include <cstdlib> - #include <qdom.h> - #include <kdebug.h> - #include <bluetooth/sdp_lib.h> diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-kbluelock.diff b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-kbluelock.diff deleted file mode 100644 index 45c945992921..000000000000 --- a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-kbluelock.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- kdebluetooth/kbluelock/kbluelock.cpp 2007-09-17 18:52:33.000000000 +0200 -+++ kdebluetooth/kbluelock/kbluelock.cpp 2008-06-11 22:57:51.000000000 +0200 -@@ -147 +147,18 @@ -- if (adapter->getRemoteMajorClass(addr) == "phone") { -+ if ( -+ adapter->getRemoteMajorClass(addr) == "phone" || -+ adapter->getRemoteMajorClass(addr) == "wearable" || -+ adapter->getRemoteMajorClass(addr) == "computer" && ( -+ adapter->getRemoteMinorClass(addr) == "palm" || -+ adapter->getRemoteMinorClass(addr) == "handheld" || -+ adapter->getRemoteMinorClass(addr) == "wearable" -+ ) || -+ adapter->getRemoteMajorClass(addr) == "imaging" && ( -+ adapter->getRemoteMinorClass(addr) == "camera" -+ ) || -+ adapter->getRemoteMajorClass(addr) == "audio_video" && ( -+ adapter->getRemoteMinorClass(addr) == "headset" || -+ adapter->getRemoteMinorClass(addr) == "video camera" || -+ adapter->getRemoteMinorClass(addr) == "camcorder" -+ ) -+ ) -+ { diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-dbuspasskeyagent.diff b/net-wireless/kdebluetooth/files/kdebluetooth-dbuspasskeyagent.diff deleted file mode 100644 index 08e84d9ba831..000000000000 --- a/net-wireless/kdebluetooth/files/kdebluetooth-dbuspasskeyagent.diff +++ /dev/null @@ -1,552 +0,0 @@ ---- kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/Makefile.am -+++ kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/Makefile.am -@@ -4,10 +4,10 @@ - # Code - bin_PROGRAMS = kbluetoothd - --kbluetoothd_SOURCES = rfcommportlistener.cpp sdprecord.cpp confirmationdlgbase.ui confirmation.cpp devicenamecache.cpp devicenamecache.skel metaserver.skel hcidevmonitor.cpp trayicon.cpp main.cpp application.cpp conmainwidget.ui condetailswidget.ui metaserver.cpp connectiondlg.cpp devicescanner.skel devicescanner.cpp pinserver.cpp pinserver.skel pingendialog.ui pindefdialog.ui pindialog.cpp procinheritsock.cpp mostrecentlyused.skel mostrecentlyused.cpp hcilistener.cpp neighbourmonitor.cpp portlistener.cpp -+kbluetoothd_SOURCES = rfcommportlistener.cpp sdprecord.cpp confirmationdlgbase.ui confirmation.cpp devicenamecache.cpp devicenamecache.skel metaserver.skel hcidevmonitor.cpp trayicon.cpp main.cpp application.cpp conmainwidget.ui condetailswidget.ui metaserver.cpp connectiondlg.cpp devicescanner.skel devicescanner.cpp pinserver.cpp pinserver.skel pingendialog.ui pindefdialog.ui pindialog.cpp procinheritsock.cpp mostrecentlyused.skel mostrecentlyused.cpp hcilistener.cpp neighbourmonitor.cpp portlistener.cpp dbuspasskeyagent.cpp - - kbluetoothd_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kbluetoothd_LDADD = ../../libkbluetooth/libkbluetooth.la ../libkbluetoothd/libkbluetoothd.la $(LIB_KIO) $(LIB_KDEUI) -+kbluetoothd_LDADD = ../../libkbluetooth/libkbluetooth.la ../libkbluetoothd/libkbluetoothd.la $(LIB_KIO) $(LIB_KDEUI) $(DBUS_LIBS) -ldbus-qt-1 - - # Services - kde_servicetypes_DATA = kbluetoothdmodule.desktop -@@ -31,6 +31,6 @@ - $(INSTALL_DATA) $(srcdir)/eventsrc $(DESTDIR)$(kde_datadir)/kbluetoothd/eventsrc - - # set the include path for X, qt and KDE --INCLUDES = -I$(top_srcdir)/kdebluetooth $(all_includes) $(BLUETOOTH_CFLAGS) -+INCLUDES = -I$(top_srcdir)/kdebluetooth $(all_includes) $(BLUETOOTH_CFLAGS) $(DBUS_CFLAGS) - --noinst_HEADERS = procinheritsock.h mostrecentlyused.h hcilistener.h neighbourmonitor.h -+noinst_HEADERS = procinheritsock.h mostrecentlyused.h hcilistener.h neighbourmonitor.h dbuspasskeyagent.h ---- ./kdebluetooth/kbluetoothd/kbluetoothd/application.cpp.orig 2006-10-16 14:23:56.000000000 +0400 -+++ ./kdebluetooth/kbluetoothd/kbluetoothd/application.cpp 2007-03-30 23:34:21.792836593 +0400 -@@ -26,6 +26,8 @@ - #include <libkbluetooth/configinfo.h> - #include <bluetooth/hci.h> - -+#include "dbuspasskeyagent.h" -+ - using namespace KBluetooth; - using namespace std; - -@@ -57,6 +59,8 @@ - hciListener->start(); - bFirstNewInstance = true; - trayIcon->slotMruMenuUpdate(); -+ -+ agent = new DBusPasskeyAgent(this); - - // Warn the user if the location of kbluepin has changed - // Don't show if bluez-libs is 3.x -@@ -74,6 +78,7 @@ - mru->writeConfig(); - delete m_config; - delete trayIcon; -+ delete agent; - } - - int KBluetoothdApp::newInstance() - ---- kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/application.h -+++ kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/application.h -@@ -29,6 +29,7 @@ - class MostRecentlyUsed; - class HciListener; - class HciDevMonitor; -+class DBusPasskeyAgent; - - class KBluetoothdApp: public KUniqueApplication - { -@@ -52,6 +53,7 @@ - void slotHciDeviceLost(); - void configUpdate(); - private: -+ DBusPasskeyAgent *agent; - void startServices(); - void endServices(); - KConfig* m_config; ---- kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/configure.in.in -+++ kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/configure.in.in -@@ -7,3 +7,18 @@ - KDE_EXPAND_MAKEVAR(KBLUETOOTHDJOBTEMPLATEDIR, KBLUETOOTHDJOBTEMPLATEDIR) - AC_SUBST(KBLUETOOTHDJOBTEMPLATEDIR) - AC_DEFINE_UNQUOTED(KBLUETOOTHDJOBTEMPLATEDIR, "$KBLUETOOTHDJOBTEMPLATEDIR", [job templates for kbluetoothd]) -+ -+# DBUS -+PKG_CHECK_MODULES(DBUS, "dbus-1") -+ -+AC_SUBST(DBUS_CFLAGS) -+AC_SUBST(DBUS_LIBS) -+ -+# DBUS QT BINDING ### stolen from kpowersave and knetworkmanager ;) # -+CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS $all_includes -DDBUS_API_SUBJECT_TO_CHANGE" -+AC_LANG_SAVE -+AC_LANG_CPLUSPLUS -+AC_CHECK_HEADER([dbus/connection.h],,[AC_MSG_ERROR([You need D-BUS/Qt3 bindings])]) -+AC_CHECK_HEADER([dbus/message.h],,[AC_MSG_ERROR([You need D-BUS/Qt3 bindings])]) -+#CPPFLAGS=$safe_CPPFLAGS -+AC_LANG_RESTORE ---- kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/dbuspasskeyagent.cpp -+++ kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/dbuspasskeyagent.cpp -@@ -0,0 +1,296 @@ -+/* -+ * -+ * BlueZ Passkey Agent Interface for kbluetoothd -+ * -+ * Copyright (C) 2006 Daniel Gollub <dgollub@suse.de> -+ * -+ * -+ * This file is part of kbluetoothd. -+ * -+ * kbluetooth is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * libkbluetooth is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with libkbluetooth; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+#include <kdebug.h> -+#include <unistd.h> -+#include "dbuspasskeyagent.h" -+ -+#define KBLUETOOTH_DBUS_PATH "/org/bluez/kbluetoothd_" -+ -+DBusMessage* DBusPasskeyAgent::_msg = NULL; -+KBluetoothdApp *DBusPasskeyAgent::_app = NULL; -+PinDialog* DBusPasskeyAgent::_pinDialog = NULL; -+DBusPasskeyAgent *DBusPasskeyAgent::_ctx = NULL; -+ -+DBusPasskeyAgent::DBusPasskeyAgent(KBluetoothdApp *app) : QObject() -+{ -+ this->_app = app; -+ this->_ctx = this; -+ this->agentpath = QString(KBLUETOOTH_DBUS_PATH "%1").arg(getpid()); -+ dbusInit(); -+ addHandler(); -+ registerDefaultPasskeyAgent(); -+} -+ -+DBusPasskeyAgent::~DBusPasskeyAgent() -+{ -+ kdDebug() << __func__ << endl; -+ unregisterDefaultPasskeyAgent(); -+} -+ -+bool DBusPasskeyAgent::dbusInit() -+{ -+ kdDebug() << "<<<<< " << __func__ << endl; -+ -+ kdDebug() << __func__ << "()" << endl; -+ -+ DBusError error; -+ dbus_error_init(&error); -+ conn = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ -+ if (!conn) { -+ kdDebug() << "dbus_bus_get() failed...." << endl; -+ if (dbus_error_is_set(&error)) { -+ kdDebug() << error.message << endl; -+ dbus_error_free(&error); -+ return false; -+ } -+ } -+ -+ _dbusConnection = new DBusQt::Connection(this); -+ if (!_dbusConnection) { -+ kdDebug() << __func__ << " DBusQt::Connection() failed." << endl; -+ return false; -+ } -+ -+ _dbusConnection->dbus_connection_setup_with_qt_main(conn); -+ -+ return true; -+} -+ -+bool DBusPasskeyAgent::registerDefaultPasskeyAgent() -+{ -+ kdDebug() << "<<<<< " << __func__ << endl; -+ -+ kdDebug() << __func__ << "()" << endl; -+ -+ DBusMessage *reply = NULL; -+ DBusError error; -+ -+ dbus_error_init(&error); -+ -+ DBusMessage *msg = NULL; -+ msg = dbus_message_new_method_call(INTERFACE_BLUEZ, BLUEZ_PATH, INTERFACE_SECURITY, "RegisterDefaultPasskeyAgent"); -+ if (!msg) { -+ kdDebug() << "kbluetoothd (Default Passkey Agent): Can't allocate new method call" << endl; -+ return false; -+ } -+ -+ const char *path = agentpath.latin1(); -+ dbus_message_append_args(msg, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID); -+ reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &error); -+ if (!reply) { -+ if (dbus_error_is_set(&error)) { -+ kdDebug() << "kbluetoothd (Default Passkey Agent): " << __func__ << "(): " << error.message << endl; -+ dbus_error_free(&error); -+ return false; -+ } -+ } -+ -+ return true; -+} -+ -+bool DBusPasskeyAgent::unregisterDefaultPasskeyAgent() -+{ -+ kdDebug() << "<<<<< " << __func__ << endl; -+ -+ DBusMessage *reply = NULL; -+ DBusError error; -+ -+ dbus_error_init(&error); -+ -+ DBusMessage *msg = NULL; -+ msg = dbus_message_new_method_call(INTERFACE_BLUEZ, BLUEZ_PATH, INTERFACE_SECURITY, "UnregisterDefaultPasskeyAgent"); -+ if (!msg) { -+ kdDebug() << "kbluetoothd (Unregister Default Passkey Agent): Can't allocate new method call" << endl; -+ return false; -+ } -+ -+ const char *path = agentpath.latin1(); -+ dbus_message_append_args(msg, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID); -+ reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &error); -+ if (!reply) { -+ if (dbus_error_is_set(&error)) { -+ kdDebug() << "kbluetoothd (Default Passkey Agent): " << __func__ << "(): " << error.message << endl; -+ dbus_error_free(&error); -+ return false; -+ } -+ } -+ -+ return true; -+} -+ -+bool DBusPasskeyAgent::addHandler() -+{ -+ kdDebug() << "<<<<< " << __func__ << endl; -+ -+ DBusError error; -+ DBusHandleMessageFunction filter = filterFunction; -+ -+ dbus_error_init(&error); -+ -+ if (!dbus_connection_add_filter(conn, filter, NULL, NULL)) { -+ return false; -+ } -+ -+ // TODO ... error handler -+ dbus_bus_add_match(conn, "interface=" DBUS_INTERFACE_DBUS "," -+ "member=NameOwnerChanged, arg0=" INTERFACE_BLUEZ, &error); -+ dbus_bus_add_match(conn, "type='signal',interface='" INTERFACE_SECURITY "'," -+ "path='" BLUEZ_PATH "',sender='" INTERFACE_BLUEZ "'", &error); -+ dbus_bus_add_match(conn, "type='signal',interface='" INTERFACE_MANAGER "'," -+ "path='" BLUEZ_PATH "',sender='" INTERFACE_BLUEZ "'", &error); -+ -+ -+ return true; -+} -+ -+DBusHandlerResult DBusPasskeyAgent::filterFunction(DBusConnection * /*conn*/, DBusMessage *msg, void * /*data*/) -+{ -+ kdDebug() << __func__ << "()....................." << endl; -+ const char *member = dbus_message_get_member(msg); -+ -+ if (!member) -+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -+ -+ kdDebug() << __func__ << "(): " << member << endl; -+ -+ if (!strcmp("Request", member)) { -+ return _ctx->requestMessage(msg); -+ } else if (!strcmp("NameOwnerChanged", member)) { -+ return _ctx->ownerChanged(msg); -+ } else if (!strcmp("AdapterAdded", member)) { -+ _ctx->registerDefaultPasskeyAgent(); -+ return DBUS_HANDLER_RESULT_HANDLED; -+ } -+ -+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -+} -+ -+QString DBusPasskeyAgent::getRemoteName(const char *path, const char *address) -+{ -+ -+ const char *remotename; -+ DBusError error; -+ dbus_error_init(&error); -+ -+ DBusMessage *msg = NULL; -+ msg = dbus_message_new_method_call(INTERFACE_BLUEZ, path, "org.bluez.Adapter", "GetRemoteName"); -+ if (!msg) { -+ kdDebug() << "kbluetoothd (Default Passkey Agent) " << __func__ << "(): Can't allocate new method call" << endl; -+ return false; -+ } -+ -+ dbus_message_append_args(msg, DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID); -+ DBusMessage *reply = dbus_connection_send_with_reply_and_block(conn, msg, -1, &error); -+ if (!reply) { -+ if (dbus_error_is_set(&error)) { -+ kdDebug() << "kbluetoothd (Default Passkey Agent): " << __func__ << "(): " << error.message << endl; -+ dbus_error_free(&error); -+ return QString::null; -+ } -+ } -+ -+ dbus_message_get_args(reply, NULL, DBUS_TYPE_STRING, &remotename, DBUS_TYPE_INVALID); -+ dbus_message_unref(reply); -+ -+ return QString::fromUtf8(remotename); -+} -+ -+DBusHandlerResult DBusPasskeyAgent::requestMessage(DBusMessage *msg) { -+ -+ const char *path, *address; -+ QString remotename = QString::null; -+ -+ _msg = msg; -+ -+ dbus_message_ref(_msg); -+ -+ if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &path, -+ DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID)) { -+ kdDebug() << "DBusPasskeyAgent: Invalid argumentes for Passkey Request method." << endl; -+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -+ } -+ -+ /* get address and remote name */ -+ -+ remotename = _ctx->getRemoteName(path, address); -+ -+ -+ if (remotename == QString::null) -+ remotename = QString("n/a"); -+ -+ _pinDialog = new PinDialog(NULL, true, false, QString(address), remotename, _ctx); -+ _pinDialog->show(); -+ -+ return DBUS_HANDLER_RESULT_HANDLED; -+} -+ -+DBusHandlerResult DBusPasskeyAgent::ownerChanged(DBusMessage *msg) { -+ kdDebug() << __func__ << "()" << endl; -+ -+ char *service, *old_owner, *new_owner; -+ -+ if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &service, -+ DBUS_TYPE_STRING, &old_owner, -+ DBUS_TYPE_STRING, &new_owner, -+ DBUS_TYPE_INVALID)) { -+ -+ if (!strcmp(service, INTERFACE_BLUEZ)) { -+ if (new_owner && (strlen(new_owner) > 0)) { -+ kdDebug() << __func__ << "(): rerun default passkey agent." << endl; -+ _ctx->registerDefaultPasskeyAgent(); -+ } -+ } -+ } -+ -+ -+ return DBUS_HANDLER_RESULT_HANDLED; -+} -+ -+void DBusPasskeyAgent::sendPin() { -+ kdDebug() << __func__ << "()" << endl; -+ -+ QString qpasskey = _pinDialog->getPin(); -+ const char *passkey = qpasskey.ascii(); -+ -+ DBusMessage *reply = dbus_message_new_method_return(_msg); -+ if (!reply) { -+ kdDebug() << __func__ <<" (): Reply failed." << endl; -+ goto error_free; -+ } -+ -+ dbus_message_append_args(reply, DBUS_TYPE_STRING, &passkey, DBUS_TYPE_INVALID); -+ -+ dbus_connection_send(conn, reply, NULL); -+ dbus_message_unref(reply); -+ -+ kdDebug() << __func__ << "(): send." << endl; -+ -+error_free: -+ dbus_message_unref(_msg); -+} -+ -+#include "dbuspasskeyagent.moc" ---- kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/dbuspasskeyagent.h -+++ kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/dbuspasskeyagent.h -@@ -0,0 +1,91 @@ -+/* -+ * -+ * BlueZ Passkey Agent Interface for kbluetoothd -+ * -+ * Copyright (C) 2006 Daniel Gollub <dgollub@suse.de> -+ * -+ * -+ * This file is part of kbluetoothd. -+ * -+ * kbluetooth is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * libkbluetooth is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with libkbluetooth; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ * -+ */ -+ -+ -+#ifndef DBUSPASSKEYAGENT_H -+#define DBUSPASSKEYAGENT_H -+ -+#ifndef DBUS_API_SUBJECT_TO_CHANGE -+#define DBUS_API_SUBJECT_TO_CHANGE -+#endif -+ -+#include <qobject.h> -+ -+#include <dbus/dbus.h> -+#include <dbus/connection.h> -+ -+#include "application.h" -+#include "pindialog.h" -+ -+#define BLUEZ_PATH "/org/bluez" -+#define INTERFACE_BLUEZ "org.bluez" -+#define INTERFACE_MANAGER "org.bluez.Manager" -+#define INTERFACE_SECURITY "org.bluez.Security" -+#define INTERFACE_PASSKEYAGENT "org.bluez.PasskeyAgent" -+ -+class PinDialog; -+ -+class DBusPasskeyAgent : public QObject -+{ -+ -+ Q_OBJECT -+ -+ public: -+ DBusPasskeyAgent(KBluetoothdApp *app); -+ ~DBusPasskeyAgent(); -+ -+ public slots: -+ void sendPin(); -+ -+ private: -+ -+ bool dbusInit(); -+ -+ bool registerDefaultPasskeyAgent(); -+ bool unregisterDefaultPasskeyAgent(); -+ -+ bool addHandler(); -+ -+ QString getRemoteName(const char *path, const char *address); -+ -+ static DBusHandlerResult filterFunction(DBusConnection *conn, DBusMessage *msg, void *data); -+ static DBusHandlerResult requestMessage(DBusMessage *msg); -+ static DBusHandlerResult ownerChanged(DBusMessage *msg); -+ -+ -+ -+ static KBluetoothdApp *_app; -+ static DBusPasskeyAgent *_ctx; -+ static DBusMessage *_msg; -+ static PinDialog *_pinDialog; -+ -+ -+ QString agentpath; -+ DBusConnection *conn; -+ DBusQt::Connection *_dbusConnection; -+ -+}; -+ -+#endif // DBUSPASSKEYAGENT_H ---- kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/pindialog.cpp -+++ kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/pindialog.cpp -@@ -30,7 +30,7 @@ - #include <klocale.h> - - PinDialog::PinDialog(QWidget* owner, bool /*bIncoming*/, -- bool ownAuth, QString addr, QString devName) : -+ bool ownAuth, QString addr, QString devName, DBusPasskeyAgent *agent) : - KDialogBase(owner, "pinrequest", ownAuth, "Pin Request", - ownAuth?(Close):(Ok|Cancel)) - { -@@ -63,6 +63,8 @@ - pinDlg->pinEdit->setFocus(); - } - -+ connect(this, SIGNAL (okClicked()), agent, SLOT (sendPin())); -+ - if (ownAuth) { - setMainWidget(pinGenDlg); - pinGenDlg->goButton->setFocus(); -@@ -76,9 +78,14 @@ - { - } - -+QString PinDialog::getPin() -+{ -+ return pinDlg->pinEdit->text(); -+} -+ - QString PinDialog::getPin(bool bIn, bool ownAuth, QString addr, QString name) - { -- QGuardedPtr<PinDialog> dlg = new PinDialog(NULL, bIn, ownAuth, addr, name); -+ QGuardedPtr<PinDialog> dlg = new PinDialog(NULL, bIn, ownAuth, addr, name, NULL); - if (ownAuth == true) { - if (!dlg->pinGenDlg) return QString::null; - dlg->show(); ---- kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/pindialog.h -+++ kdebluetooth/kdebluetooth/kbluetoothd/kbluetoothd/pindialog.h -@@ -15,8 +15,11 @@ - #include <kdialogbase.h> - #include <qguardedptr.h> - -+#include "dbuspasskeyagent.h" -+#include "pindefdialog.h" -+ - class PinGenerateDialog; --class PinDefaultDialog; -+//class PinDefaultDialog; - class QWidget; - namespace KBluetooth { - class HciSocket; -@@ -29,11 +32,13 @@ - { - Q_OBJECT - public: -- PinDialog(QWidget* owner, bool bIn, bool ownAuth, QString addr, QString name); -+ PinDialog(QWidget* owner, bool bIn, bool ownAuth, QString addr, QString name, DBusPasskeyAgent *agent); - ~PinDialog(); -+ QString getPin(); - static QString getPin(bool bIn, bool ownAuth, QString addr, QString name); -+ PinDefaultDialog *pinDlg; - protected: -- QGuardedPtr<PinDefaultDialog> pinDlg; -+// QGuardedPtr<PinDefaultDialog> pinDlg; - QGuardedPtr<PinGenerateDialog> pinGenDlg; - QString addr; - KBluetooth::HciSocket *hciSocket; diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-sdp-bitop.diff b/net-wireless/kdebluetooth/files/kdebluetooth-sdp-bitop.diff deleted file mode 100644 index 9ec9783d18e6..000000000000 --- a/net-wireless/kdebluetooth/files/kdebluetooth-sdp-bitop.diff +++ /dev/null @@ -1,42 +0,0 @@ ---- kdebluetooth/libkbluetooth/sdpattribute.cpp -+++ kdebluetooth/libkbluetooth/sdpattribute.cpp -@@ -121,23 +121,23 @@ - } - } - else { -- ret.value.uuid128.data[0] = (lo >> 0) && 0xFF; -- ret.value.uuid128.data[1] = (lo >> 8) && 0xFF; -- ret.value.uuid128.data[2] = (lo >> 16) && 0xFF; -- ret.value.uuid128.data[3] = (lo >> 24) && 0xFF; -- ret.value.uuid128.data[4] = (lo >> 32) && 0xFF; -- ret.value.uuid128.data[5] = (lo >> 40) && 0xFF; -- ret.value.uuid128.data[6] = (lo >> 48) && 0xFF; -- ret.value.uuid128.data[7] = (lo >> 56) && 0xFF; -+ ret.value.uuid128.data[0] = (lo >> 0) & 0xFF; -+ ret.value.uuid128.data[1] = (lo >> 8) & 0xFF; -+ ret.value.uuid128.data[2] = (lo >> 16) & 0xFF; -+ ret.value.uuid128.data[3] = (lo >> 24) & 0xFF; -+ ret.value.uuid128.data[4] = (lo >> 32) & 0xFF; -+ ret.value.uuid128.data[5] = (lo >> 40) & 0xFF; -+ ret.value.uuid128.data[6] = (lo >> 48) & 0xFF; -+ ret.value.uuid128.data[7] = (lo >> 56) & 0xFF; - -- ret.value.uuid128.data[8] = (hi >> 0) && 0xFF; -- ret.value.uuid128.data[9] = (hi >> 8) && 0xFF; -- ret.value.uuid128.data[10] = (hi >> 16) && 0xFF; -- ret.value.uuid128.data[11] = (hi >> 24) && 0xFF; -- ret.value.uuid128.data[12] = (hi >> 32) && 0xFF; -- ret.value.uuid128.data[13] = (hi >> 40) && 0xFF; -- ret.value.uuid128.data[14] = (hi >> 48) && 0xFF; -- ret.value.uuid128.data[15] = (hi >> 56) && 0xFF; -+ ret.value.uuid128.data[8] = (hi >> 0) & 0xFF; -+ ret.value.uuid128.data[9] = (hi >> 8) & 0xFF; -+ ret.value.uuid128.data[10] = (hi >> 16) & 0xFF; -+ ret.value.uuid128.data[11] = (hi >> 24) & 0xFF; -+ ret.value.uuid128.data[12] = (hi >> 32) & 0xFF; -+ ret.value.uuid128.data[13] = (hi >> 40) & 0xFF; -+ ret.value.uuid128.data[14] = (hi >> 48) & 0xFF; -+ ret.value.uuid128.data[15] = (hi >> 56) & 0xFF; - - ret.type = SDP_UUID128; - } diff --git a/net-wireless/kdebluetooth/files/kdebluetooth.diff b/net-wireless/kdebluetooth/files/kdebluetooth.diff deleted file mode 100644 index 7fe8aeb57e2f..000000000000 --- a/net-wireless/kdebluetooth/files/kdebluetooth.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- kdebluetooth/kbluetoothd/kbluetoothd/kbluetoothd.autostart.desktop -+++ kdebluetooth/kbluetoothd/kbluetoothd/kbluetoothd.autostart.desktop -@@ -40,4 +40,4 @@ - X-DCOP-ServiceType=Unique - #X-KDE-Library=klipper_panelapplet - #X-KDE-UniqueApplet=true --X-KDE-autostart-condition=kbluetoothdrc:General:AutoStart:true -+X-KDE-autostart-condition=kbluetoothdrc:General:AutoStart:false ---- kdebluetooth/libkbluetooth/hcisocket.cpp -+++ kdebluetooth/libkbluetooth/hcisocket.cpp -@@ -56,7 +56,7 @@ - s = ::socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI); - if (s < 0) - { -- kdWarning() << "HciSocket::open(): Error creating socket" << endl; -+ kdDebug() << "HciSocket::open(): Error creating socket" << endl; - emit error(errno, i18n("Error creating socket")); - return false; - } diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild deleted file mode 100644 index 495f4ffa5241..000000000000 --- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta2-r2.ebuild,v 1.5 2009/05/13 08:35:41 scarabeus Exp $ - -inherit kde - -MY_PV=${PV} -MY_P=${PN}-${MY_PV} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="KDE Bluetooth Framework" -HOMEPAGE="http://bluetooth.kmobiletools.org/" -SRC_URI="mirror://sourceforge/kde-bluetooth/${MY_P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~hppa ~ppc sparc ~x86" -IUSE="irmc" - -DEPEND=">=dev-libs/openobex-1.1 - >=net-wireless/bluez-libs-2.15 - >=media-libs/libvorbis-1.0 - >=dev-libs/dbus-qt3-old-0.70 - irmc? ( || ( >=kde-base/kitchensync-3.4_beta1 >=kde-base/kdepim-3.4_beta1 ) )" - -RDEPEND="${DEPEND} - || ( ( =kde-base/kdialog-3.5* =kde-base/konqueror-3.5* ) - =kde-base/kdebase-3.5* ) - net-wireless/bluez-utils" - -PATCHES=( - "${FILESDIR}/better-menu-names.diff" - "${FILESDIR}/kcm-btpaired-fix.diff" - "${FILESDIR}/kcm-no-dcop-error.diff" - "${FILESDIR}/kdebluetooth-dbuspasskeyagent.diff" - "${FILESDIR}/kdebluetooth-sdp-bitop.diff" - "${FILESDIR}/kdebluetooth.diff" -) - -LANGS="bg br ca cs cy da de el en_GB es et fi fr ga gl hu is it ja ka lt -mt nb nl nn pa pl pt pt_BR ro ru rw sk sr sr@Latn sv ta tr uk zh_CN" - -for X in ${LANGS} ; do - IUSE="${IUSE} linguas_${X}" -done - -need-kde 3 - -src_unpack() { - kde_src_unpack - cd "${WORKDIR}/${P}/po" - for X in ${LANGS} ; do - use linguas_${X} || rm -rf "${X}" - done - rm -f "${S}/configure" - #eaclocal && eautoconf || die "autotools failed" -} - -src_compile() { - # Change defaults to match our bluez-utils setup - sed -i -e 's,/etc/init\.d/bluez-utils,/etc/init\.d/bluetooth,' \ - "${S}/kdebluetooth/kbluetoothd/kcm_btpaired/pairedtab.cpp" || die - local myconf="--without-xmms $(use_enable irmc irmcsynckonnector)" - kde_src_compile -} - -pkg_postinst() { - einfo 'This version of kde-bluetooth provides a replacement for the' - einfo 'standard bluepin program "kbluepin". If you want to use this version,' - einfo 'you have to edit "/etc/bluetooth/hcid.conf" and change the line' - einfo '"pin_helper oldbluepin;" to "pin_helper /usr/lib/kdebluetooth/kbluepin;".' - einfo 'Then restart hcid to make the change take effect.' -} diff --git a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild deleted file mode 100644 index c15894adde35..000000000000 --- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8-r2.ebuild,v 1.6 2009/05/14 16:01:59 scarabeus Exp $ - -inherit kde - -DESCRIPTION="KDE Bluetooth Framework" -HOMEPAGE="http://bluetooth.kmobiletools.org/" -#SRC_URI="mirror://sourceforge/kde-bluetooth/${MY_P}.tar.bz2" -# cf. bug 190296 -SRC_URI="http://tomstar.ath.cx/load/${PN}/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="" - -# Localisation will be added once we have a release. - -DEPEND=">=dev-libs/openobex-1.1 - app-mobilephone/obexftp - >=dev-libs/dbus-qt3-old-0.70" - -RDEPEND="${DEPEND} - || ( ( =kde-base/kdialog-3.5* =kde-base/konqueror-3.5* ) - =kde-base/kdebase-3.5* ) - || ( - net-wireless/bluez - ( >=net-wireless/bluez-libs-3.11 >=net-wireless/bluez-utils-3.11 ) - ) - " - -need-kde 3.5 - -PATCHES=( - "${FILESDIR}/${P}-gcc43.patch" - "${FILESDIR}/${P}-bashism.patch" - "${FILESDIR}/${P}-kbluelock.diff" -) - -src_unpack() { - kde_src_unpack - - cd "${S}" - sed -i -e "s:\(MimeType=.*\):\1;:" kdebluetooth/kbtobexclient/kbtobexclient.desktop \ - || die "sed'ing the desktop file failed" - - rm -f "${S}/configure" -} - -src_install() { - kde_src_install - - # Fix the desktop file - sed -i -e 's:^\(Categories=.*\):\1;:' \ - "${D}/usr/kde/3.5/share/applications/kde/kbtobexsrv.desktop" || die "sed #1 failed" - sed -i -e 's:^\(MimeTypes\):X-\1:' \ - "${D}/usr/kde/3.5/share/applications/kde/kbtobexsrv.desktop" || die "sed #2 failed" -} diff --git a/net-wireless/kdebluetooth/metadata.xml b/net-wireless/kdebluetooth/metadata.xml deleted file mode 100644 index 9918beffc8b2..000000000000 --- a/net-wireless/kdebluetooth/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>kde</herd> -<use> - <flag name='irmc'>Enable the kitchensync(Multisynk)'s IrMCSync - konnector</flag> -</use> -</pkgmetadata> |