Fixed bug #215620 (gcc 4.3 patch). Added missing quotes. Fixed header date.

Package-Manager: portage-2.1.4.4

4 files changed, 63 insertions, 10 deletions

diff --git a/net-wireless/kdebluetooth/ChangeLog b/net-wireless/kdebluetooth/ChangeLog
index 445f67d4e54a..78d81870d7b1 100644
--- a/net-wireless/kdebluetooth/ChangeLog
+++ b/net-wireless/kdebluetooth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/kdebluetooth
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.65 2008/02/19 02:02:55 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/ChangeLog,v 1.66 2008/03/31 21:42:57 deathwing00 Exp $
+
+  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:
diff --git a/net-wireless/kdebluetooth/Manifest b/net-wireless/kdebluetooth/Manifest
index 0e7c2704502d..b607a3ae275d 100644
--- a/net-wireless/kdebluetooth/Manifest
+++ b/net-wireless/kdebluetooth/Manifest
@@ -7,6 +7,7 @@ AUX kcm-no-dcop-error.diff 1156 RMD160 81840a6069f8c188e2e57934c1d8d96fcee8e18f
 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-gcc43.patch 1575 RMD160 2837f0b3a9728b174d3a23fccacc7553312ddbad SHA1 411e8431c27426565fffc8d43396d36e1fd11762 SHA256 02e9d017a4f0f6966a9738e4d0307d9d8b2bb8f49787ecb28487bdfc0f81c207
 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
@@ -15,13 +16,13 @@ DIST kdebluetooth-1.0_beta2.tar.bz2 1228026 RMD160 52d54f49a1eb5c89b2a5ad9550dc6
 DIST kdebluetooth-1.0_beta8.tar.bz2 1091884 RMD160 84570b1c3335521e4d0f976f91d0237a4b0c1ee2 SHA1 b602e02d26518217bcf1afa5da2e2473c93b81cc SHA256 3f4cf5566446b3cc9f5cdb98304fbefcd0319c0e659d60a75123e8729286f3fa
 EBUILD kdebluetooth-1.0_beta1-r2.ebuild 1715 RMD160 2857c2cb589a23483c3dde0add4e02ddf6350fc1 SHA1 c112cf274a0734069c98e611ca6663be68838a10 SHA256 9dd4fbe9944732f7abae71e08c3467730f40a06d64746a57c0af729292c70ea3
 EBUILD kdebluetooth-1.0_beta2-r2.ebuild 2187 RMD160 1f314706ec867287f60fe02a96ca5d8a9f29b432 SHA1 04d52036b9779e02b74865caf1ef6d7aa40e4dac SHA256 4370836b8fb95f9632c055f6e2ebbc2b7839c3a1c0d4793ea4573fc078e1ce14
-EBUILD kdebluetooth-1.0_beta8.ebuild 1351 RMD160 f4d89b6c41e1059ad3b79a5f2ce0b15f46c8bfc0 SHA1 3cbe5a8e90642235f732b46f9ce065153343076b SHA256 70565bd7acd59e848299f419a28abe3a2637033b0db8937ba28444691ef0c253
-MISC ChangeLog 11675 RMD160 5e050b325a5e8f9692530016d4911e2716166214 SHA1 0f7726e30e3db5d01d51a29a4056f93ff15435b7 SHA256 462c49faeaf7f271028dc74cf8823b3fd7bb1c090fd06e5871656c207f3877c8
+EBUILD kdebluetooth-1.0_beta8.ebuild 1396 RMD160 c4ee42f37aad6d7c9f23db28b70a2f1ecb38755a SHA1 b0d096a6656cda292a8b5373ab97790257017ce8 SHA256 8476d6444f9bf3e56507e2bf74d18ea0af630e7b10cd48fe84b0e4d0dcfb6b68
+MISC ChangeLog 11893 RMD160 3f5298a505632b9b9fc21f1e3e4f5bf509779fc5 SHA1 7d8f1c255a2f1c0947e0d28722119deb0ea171d9 SHA256 d761a945a8a1dd5d5d2995d09c944eb8bd6e8b774ebe03e9ec34866dd47e874f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHujiYB18eXLOpYdkRArRmAJ0T83SxWhlOI+Lxtr6Lv6VhLmIMGQCfY0ae
-4jxxLanBYIFglT+faLJf9BQ=
-=RZ+w
+iD8DBQFH8VrhwMU+7UfzcKARArnoAJ49pbhhHCw6mrqhbFgEToaEMIakbACfaRGO
+niyQk3thDrhyhsfjYVWZy2s=
+=steW
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-gcc43.patch b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-gcc43.patch
new file mode 100644
index 000000000000..d86d63f938e6
--- /dev/null
+++ b/net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-gcc43.patch
@@ -0,0 +1,46 @@
+--- 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/kdebluetooth-1.0_beta8.ebuild b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild
index eb1dced5bec2..e2bc74aef9b3 100644
--- a/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild
+++ b/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.ebuild,v 1.1 2007/09/21 19:38:20 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild,v 1.2 2008/03/31 21:42:57 deathwing00 Exp $
 
 inherit kde
 
@@ -28,6 +28,8 @@ RDEPEND="${DEPEND}
 
 need-kde 3.5
 
+PATCHES="${FILESDIR}/${P}-gcc43.patch"
+
 src_unpack() {
 	kde_src_unpack
 
@@ -43,7 +45,7 @@ src_install() {
 
 	# Fix the desktop file
 	sed -i -e 's:^\(Categories=.*\):\1;:' \
-		${D}/usr/share/applications/kde/kbtobexsrv.desktop || die "sed #1 failed"
+		"${D}/usr/share/applications/kde/kbtobexsrv.desktop" || die "sed #1 failed"
 	sed -i -e 's:^\(MimeTypes\):X-\1:' \
-		${D}/usr/share/applications/kde/kbtobexsrv.desktop || die "sed #2 failed"
+		"${D}/usr/share/applications/kde/kbtobexsrv.desktop" || die "sed #2 failed"
 }