Add patch to build with linux-headers-2.6.18 and later, see bug #151391.

Package-Manager: portage-2.1.2_rc4-r2

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 4ddf344172ffa640192c38e1037397632e2f1b58..b03b948ce13f6a24ce1370d9a961894ccd274116 100644 (file)
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.234 2006/12/11 15:14:38 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.235 2006/12/29 19:34:36 flameeyes Exp $
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdenetwork-3.5.5-linux-headers-2.6.18.patch,
+  kdenetwork-3.5.5-r1.ebuild:
+  Add patch to build with linux-headers-2.6.18 and later, see bug #151391.
 
   11 Dec 2006; <kloeri@gentoo.org> kdenetwork-3.5.5-r1.ebuild:
   Stable on ia64.

diff --git a/kde-base/kdenetwork/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch b/kde-base/kdenetwork/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch
new file mode 100644 (file)
index 0000000..30f2ee7
--- /dev/null
+++ b/kde-base/kdenetwork/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch
@@ -0,0 +1,24 @@
+--- kopete/libkopete/avdevice/videodevice.h.orig       2006-10-17 14:34:13.000000000 +0200
++++ kopete/libkopete/avdevice/videodevice.h    2006-10-17 14:37:00.000000000 +0200
+@@ -35,8 +35,8 @@
+ 
+ #if defined(__linux__) && defined(ENABLE_AV)
+ 
+-#include <asm/types.h>
+ #undef __STRICT_ANSI__
++#include <linux/types.h>
+ #ifndef __u64 //required by videodev.h
+ #define __u64 unsigned long long
+ #endif // __u64
+--- kopete/libkopete/avdevice/videoinput.h.orig        2006-10-17 14:38:43.000000000 +0200
++++ kopete/libkopete/avdevice/videoinput.h     2006-10-17 14:39:50.000000000 +0200
+@@ -21,8 +21,8 @@
+ #define KOPETE_AVVIDEOINPUT_H
+ 
+ #ifdef __linux__
+-#include <asm/types.h>
+ #undef __STRICT_ANSI__
++#include <linux/types.h>
+ #endif // __linux__
+ #ifndef __u64 //required by videodev.h
+ #define __u64 unsigned long long

diff --git a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
index b5e82a2fbc9f962911ee887716255d8cfff115f6..86938a8b7e047cb1edff44ab16c0f270e959e715 100644 (file)
--- a/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.13 2006/12/11 15:14:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild,v 1.14 2006/12/29 19:34:36 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -45,7 +45,8 @@ DEPEND="${BOTH_DEPEND}
                ) <virtual/x11-7 )
        dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch"
+PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
+       ${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
 
 pkg_setup() {
        if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 416a04b1736baee5ae2c0980b7e0e8e9d90f6c1f..31174c3a62062eea2c587e1137913ee269a5db29 100644 (file)
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.100 2006/12/11 15:11:32 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.101 2006/12/29 19:30:58 flameeyes Exp $
+
+  29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdenetwork-3.5.5-linux-headers-2.6.18.patch,
+  kopete-3.5.5-r2.ebuild:
+  Add patch to build with linux-headers-2.6.18 and later, see bug #151391.
 
   11 Dec 2006; <kloeri@gentoo.org> kopete-3.5.5-r2.ebuild:
   Stable on ia64.

diff --git a/kde-base/kopete/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch b/kde-base/kopete/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch
new file mode 100644 (file)
index 0000000..30f2ee7
--- /dev/null
+++ b/kde-base/kopete/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch
@@ -0,0 +1,24 @@
+--- kopete/libkopete/avdevice/videodevice.h.orig       2006-10-17 14:34:13.000000000 +0200
++++ kopete/libkopete/avdevice/videodevice.h    2006-10-17 14:37:00.000000000 +0200
+@@ -35,8 +35,8 @@
+ 
+ #if defined(__linux__) && defined(ENABLE_AV)
+ 
+-#include <asm/types.h>
+ #undef __STRICT_ANSI__
++#include <linux/types.h>
+ #ifndef __u64 //required by videodev.h
+ #define __u64 unsigned long long
+ #endif // __u64
+--- kopete/libkopete/avdevice/videoinput.h.orig        2006-10-17 14:38:43.000000000 +0200
++++ kopete/libkopete/avdevice/videoinput.h     2006-10-17 14:39:50.000000000 +0200
+@@ -21,8 +21,8 @@
+ #define KOPETE_AVVIDEOINPUT_H
+ 
+ #ifdef __linux__
+-#include <asm/types.h>
+ #undef __STRICT_ANSI__
++#include <linux/types.h>
+ #endif // __linux__
+ #ifndef __u64 //required by videodev.h
+ #define __u64 unsigned long long

diff --git a/kde-base/kopete/kopete-3.5.5-r2.ebuild b/kde-base/kopete/kopete-3.5.5-r2.ebuild
index e83ff58b15d49a17c939bf9e0c778ee8f06abf4d..7b0acf71b33d355d5cfd0302abfb6fb5fec0d684 100644 (file)
--- a/kde-base/kopete/kopete-3.5.5-r2.ebuild
+++ b/kde-base/kopete/kopete-3.5.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.5-r2.ebuild,v 1.12 2006/12/11 15:11:32 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.5-r2.ebuild,v 1.13 2006/12/29 19:30:58 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -82,6 +82,8 @@ src_unpack() {
 
        epatch "${FILESDIR}/${P}-icqfix.patch"
 
+       epatch "${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+
        use latex || kopete_disable plugin latex
        use crypt || kopete_disable plugin cryptography
        use netmeeting || kopete_disable plugin netmeeting