diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-29 19:30:58 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-12-29 19:30:58 +0000 |
| commit | 2913adb281eb74ba231df89dc3ba3bf5ec5b993e (patch) | |
| tree | 60506a51f485d9124b926a373fe2f38ff615ca99 /kde-base/kopete | |
| parent | version bump (diff) | |
| download | gentoo-2-2913adb281eb74ba231df89dc3ba3bf5ec5b993e.tar.gz gentoo-2-2913adb281eb74ba231df89dc3ba3bf5ec5b993e.tar.bz2 gentoo-2-2913adb281eb74ba231df89dc3ba3bf5ec5b993e.zip | |
Add patch to build with linux-headers-2.6.18 and later, see bug #151391.
(Portage version: 2.1.2_rc4-r2)
Diffstat (limited to 'kde-base/kopete')
| -rw-r--r-- | kde-base/kopete/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kopete/files/kdenetwork-3.5.5-linux-headers-2.6.18.patch | 24 | ||||
| -rw-r--r-- | kde-base/kopete/kopete-3.5.5-r2.ebuild | 4 |
3 files changed, 33 insertions, 2 deletions
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index 416a04b1736b..31174c3a6206 100644 --- 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 index 000000000000..30f2ee727ee3 --- /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 e83ff58b15d4..7b0acf71b33d 100644 --- 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 |