diff options
| author |   Ioannis Aslanidis <deathwing00@gentoo.org> | 2008-03-31 21:42:57 +0000 |
|---|---|---|
| committer | Ioannis Aslanidis <deathwing00@gentoo.org> | 2008-03-31 21:42:57 +0000 |
| commit | 5609a16b135637fdbdb42624992bf41f2b8eb5b0 (patch) | |
| tree | b0901b96b7b519a761bdb811f5a6caa3fb7a2250 /net-wireless/kdebluetooth | |
| parent | old (diff) | |
| download | gentoo-2-5609a16b135637fdbdb42624992bf41f2b8eb5b0.tar.gz gentoo-2-5609a16b135637fdbdb42624992bf41f2b8eb5b0.tar.bz2 gentoo-2-5609a16b135637fdbdb42624992bf41f2b8eb5b0.zip | |
Fixed bug #215620 (gcc 4.3 patch). Added missing quotes. Fixed header date.
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-wireless/kdebluetooth')
| -rw-r--r-- | net-wireless/kdebluetooth/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/kdebluetooth/files/kdebluetooth-1.0_beta8-gcc43.patch | 46 | ||||
| -rw-r--r-- | net-wireless/kdebluetooth/kdebluetooth-1.0_beta8.ebuild | 10 |
3 files changed, 57 insertions, 5 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/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" } |