diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-29 19:34:36 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-29 19:34:36 +0000 |
| commit | accd9aae29eba96f5908c55f7cbb0905144caa3b (patch) | |
| tree | 29b599634510fccb6e021d1e62e9cfc1956033c5 /kde-base/kdenetwork | |
| parent | version bump (diff) | |
| download | historical-accd9aae29eba96f5908c55f7cbb0905144caa3b.tar.gz historical-accd9aae29eba96f5908c55f7cbb0905144caa3b.tar.bz2 historical-accd9aae29eba96f5908c55f7cbb0905144caa3b.zip | |
Add patch to build with linux-headers-2.6.18 and later, see bug #151391.
Package-Manager: portage-2.1.2_rc4-r2
Diffstat (limited to 'kde-base/kdenetwork')
| -rw-r--r-- | kde-base/kdenetwork/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdenetwork/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch | 24 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.5.5-r1.ebuild | 5 |
3 files changed, 33 insertions, 3 deletions
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog index 4ddf344172ff..b03b948ce13f 100644 --- 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 index 000000000000..30f2ee727ee3 --- /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 b5e82a2fbc9f..86938a8b7e04 100644 --- 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 |