rpms/kdebluetooth/devel kdebluetooth-1.0_beta8-gcc43.patch, NONE, 1.1 kdebluetooth.spec, 1.13, 1.14

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/kdebluetooth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2973

Modified Files:
	kdebluetooth.spec 
Added Files:
	kdebluetooth-1.0_beta8-gcc43.patch 
Log Message:
* Sun Jan  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.40.beta8
- Fix build with gcc 4.3.


kdebluetooth-1.0_beta8-gcc43.patch:

--- NEW FILE kdebluetooth-1.0_beta8-gcc43.patch ---
diff -up kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h~ kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h
--- kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h~	2007-09-17 19:52:30.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h	2008-01-06 15:45:56.000000000 +0200
@@ -29,6 +29,7 @@
 #define PAIREDTAB_H
 
 #include "pairedtabbase.h"
+#include <stdint.h>
 #include <qcstring.h>
 #include <qdatastream.h>
 #include <qstringlist.h>
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp	2008-01-06 15:58:29.000000000 +0200
@@ -28,6 +28,7 @@
 #include "qobexserverops.h"
 #include "qobexauth.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp	2008-01-06 15:57:54.000000000 +0200
@@ -42,6 +42,7 @@
 #include "qobexnullserverops.h"
 #include "qobexserverops.h"
 
+#undef myDebug
 #undef DEBUG
 #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp	2008-01-06 15:56:55.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include "qobexclient.h"
 
+#undef myDebug
 //#undef DEBUG
 #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp	2008-01-06 15:59:12.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include "qobexserialtransport.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp	2008-01-06 15:57:32.000000000 +0200
@@ -46,6 +46,7 @@
 
 #include "qobextransport.h"
 
+#undef myDebug
 //#undef DEBUG
 #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp	2008-01-06 15:58:59.000000000 +0200
@@ -43,6 +43,7 @@
 #include "qttylock.h"
 #include "qserialdevice.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp	2008-01-06 15:58:05.000000000 +0200
@@ -23,6 +23,7 @@
 
 #include "qobexbase.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp	2008-01-06 15:57:13.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include "qobexserver.h"
 
+#undef myDebug
 #undef DEBUG
 // #define DEBUG
 #ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp~	2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp	2008-01-06 15:58:44.000000000 +0200
@@ -31,6 +31,7 @@
 
 #include "qobexericssontransport.h"
 
+#undef myDebug
 #undef DEBUG
 #define DEBUG
 #ifdef DEBUG


Index: kdebluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebluetooth/devel/kdebluetooth.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kdebluetooth.spec	9 Dec 2007 20:35:36 -0000	1.13
+++ kdebluetooth.spec	6 Jan 2008 18:20:46 -0000	1.14
@@ -3,11 +3,12 @@
 Summary:		The KDE Bluetooth Framework
 Name:			kdebluetooth
 Version:		1.0 
-Release:		0.39.%{reltype}%{?dist}
+Release:		0.40.%{reltype}%{?dist}
 License:		GPLv2+
 Group:			Applications/Communications
 URL:			http://bluetooth.kmobiletools.org/
 Source0:		http://downloads.sourceforge.net/kde-bluetooth/%{name}-%{version}_%{reltype}.tar.bz2
+Patch0:			%{name}-1.0_beta8-gcc43.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gettext
 BuildRequires:	desktop-file-utils
@@ -63,6 +64,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}_%{reltype}
+%patch0 -p1
 
 
 %build
@@ -164,6 +166,9 @@
 
 
 %changelog
+* Sun Jan  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.40.beta8
+- Fix build with gcc 4.3.
+
 * Sun Dec  9 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.39.beta8
 - Require kdesu in main package.