rev 11883 - in trunk/packages/kdenetwork/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2008-08-08 21:00:05 +0000 (Fri, 08 Aug 2008)
New Revision: 11883

Added:
   trunk/packages/kdenetwork/debian/patches/26_kfreebsd.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
Log:
  +++ Changes by Aurelien Jarno:

  * Add GNU/kFreeBSD patch:
    - 26_kfreebsd.diff



Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2008-08-08 20:57:59 UTC (rev 11882)
+++ trunk/packages/kdenetwork/debian/changelog	2008-08-08 21:00:05 UTC (rev 11883)
@@ -1,3 +1,12 @@
+kdenetwork (4:3.5.9-4) unstable; urgency=low
+
+  +++ Changes by Aurelien Jarno:
+
+  * Add GNU/kFreeBSD patch:
+    - 26_kfreebsd.diff
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 08 Aug 2008 02:18:31 +0200
+
 kdenetwork (4:3.5.9-3) unstable; urgency=low
   
   * KDE_3_5_BRANCH update (up to r825626):

Added: trunk/packages/kdenetwork/debian/patches/26_kfreebsd.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/26_kfreebsd.diff	                        (rev 0)
+++ trunk/packages/kdenetwork/debian/patches/26_kfreebsd.diff	2008-08-08 21:00:05 UTC (rev 11883)
@@ -0,0 +1,40 @@
+--- kdenetwork-3.5.9.orig/kopete/libkopete/avdevice/videocontrol.h
++++ kdenetwork-3.5.9/kopete/libkopete/avdevice/videocontrol.h
+@@ -20,15 +20,7 @@
+ #ifndef KOPETE_AVVIDEOCONTROL_H
+ #define KOPETE_AVVIDEOCONTROL_H
+ 
+-#include <asm/types.h>
+-#undef __STRICT_ANSI__
+-#ifndef __u64 //required by videodev.h
+-#define __u64 unsigned long long
+-#endif // __u64
+-
+-#ifndef __s64 //required by videodev.h
+-#define __s64 long long
+-#endif // __s64
++#include <stdint.h>
+ 
+ #include <qstring.h>
+ #include <kdebug.h>
+@@ -65,14 +57,14 @@
+ 	~VideoControl();
+ 
+ protected:
+-	__u32 m_id;
++	uint32_t m_id;
+ 	control_type m_type;
+ 	QString m_name;
+-	__s32 m_minimum;
+-	__s32 m_maximum;
+-	__s32 m_step;
+-	__s32 m_default;
+-	__u32 m_flags;
++	int32_t m_minimum;
++	int32_t m_maximum;
++	int32_t m_step;
++	int32_t m_default;
++	uint32_t m_flags;
+ };
+ 
+ }