summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-09-12 19:05:42 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-09-12 19:05:42 +0000
commitd7e0933de4804491f0b7e1c1fd90466c31e1c5a0 (patch)
treeb1561d2cf139795d532f0f1919a4bb70daf0990b /net-im/kadu
parentStable on alpha, bug #327777 (diff)
downloadgentoo-2-d7e0933de4804491f0b7e1c1fd90466c31e1c5a0.tar.gz
gentoo-2-d7e0933de4804491f0b7e1c1fd90466c31e1c5a0.tar.bz2
gentoo-2-d7e0933de4804491f0b7e1c1fd90466c31e1c5a0.zip
Fix glibc 2.12 compilation, bug 336843
(Portage version: 2.2_rc80/cvs/Linux x86_64)
Diffstat (limited to 'net-im/kadu')
-rw-r--r--net-im/kadu/ChangeLog6
-rw-r--r--net-im/kadu/files/kadu-0.6.5.4-glibc211.patch12
-rw-r--r--net-im/kadu/kadu-0.6.5.4.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/net-im/kadu/ChangeLog b/net-im/kadu/ChangeLog
index e4e3213d232d..6dd91b65a545 100644
--- a/net-im/kadu/ChangeLog
+++ b/net-im/kadu/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/kadu
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.94 2010/07/20 02:07:37 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/ChangeLog,v 1.95 2010/09/12 19:05:42 reavertm Exp $
+
+ 12 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org> kadu-0.6.5.4.ebuild,
+ +files/kadu-0.6.5.4-glibc211.patch:
+ Fix glibc 2.12 compilation, bug 336843
20 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org>
-kadu-0.6.5.3-r2.ebuild, -files/kadu-0.6.5.3-linkage.patch:
diff --git a/net-im/kadu/files/kadu-0.6.5.4-glibc211.patch b/net-im/kadu/files/kadu-0.6.5.4-glibc211.patch
new file mode 100644
index 000000000000..ad65bc5202f3
--- /dev/null
+++ b/net-im/kadu/files/kadu-0.6.5.4-glibc211.patch
@@ -0,0 +1,12 @@
+diff -ru ../kadu/kadu-core/main.cpp ./kadu-core/main.cpp
+--- ../kadu/kadu-core/main.cpp 2010-01-17 22:37:09.000000000 +0100
++++ ./kadu-core/main.cpp 2010-09-12 20:45:41.600774558 +0200
+@@ -20,7 +20,7 @@
+ #include <winsock2.h>
+ #include <windows.h>
+ #endif
+-#ifdef Q_OS_BSD4
++#if defined(Q_OS_BSD4) || defined(Q_OS_LINUX)
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #endif
diff --git a/net-im/kadu/kadu-0.6.5.4.ebuild b/net-im/kadu/kadu-0.6.5.4.ebuild
index 0ddbf039662f..3ca3a1c7bb54 100644
--- a/net-im/kadu/kadu-0.6.5.4.ebuild
+++ b/net-im/kadu/kadu-0.6.5.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.6.5.4.ebuild,v 1.4 2010/07/18 13:10:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kadu/kadu-0.6.5.4.ebuild,v 1.5 2010/09/12 19:05:42 reavertm Exp $
EAPI="2"
@@ -51,6 +51,7 @@ S="${WORKDIR}/${PN}"
PATCHES=(
"${FILESDIR}/libgsm-ugly-code.patch"
+ "${FILESDIR}/${P}-glibc211.patch"
)
# set given .config variable to =m or =y