diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2008-12-04 23:58:23 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2008-12-04 23:58:23 +0000 |
| commit | 213403da7b43a13099771f1628716f5053e69e5f (patch) | |
| tree | a216e76aa44dafd03598d783bf11781a4b807d38 /app-admin/fam | |
| parent | Bump for important fixes to Banshee edit boxes. (diff) | |
| download | gentoo-2-213403da7b43a13099771f1628716f5053e69e5f.tar.gz gentoo-2-213403da7b43a13099771f1628716f5053e69e5f.tar.bz2 gentoo-2-213403da7b43a13099771f1628716f5053e69e5f.zip | |
Expand gcc 4.3 patch to cover NULL not being declared in Interest.h and
BTree.h (bug #237953 by robs)
(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64)
Diffstat (limited to 'app-admin/fam')
| -rw-r--r-- | app-admin/fam/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/fam/files/fam-2.7.0-gcc43.patch | 37 |
2 files changed, 36 insertions, 7 deletions
diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog index 90cf21796fd3..3bec2fd69835 100644 --- a/app-admin/fam/ChangeLog +++ b/app-admin/fam/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/fam # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.50 2008/05/09 01:41:10 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.51 2008/12/04 23:58:23 dirtyepic Exp $ + + 04 Dec 2008; Ryan Hill <dirtyepic@gentoo.org> files/fam-2.7.0-gcc43.patch: + Expand gcc 4.3 patch to cover NULL not being declared in Interest.h and + BTree.h (bug #237953 by robs) 09 May 2008; Mark Loeser <halcy0n@gentoo.org> +files/fam-2.7.0-gcc43.patch, fam-2.7.0-r4.ebuild: diff --git a/app-admin/fam/files/fam-2.7.0-gcc43.patch b/app-admin/fam/files/fam-2.7.0-gcc43.patch index 7cb3cdab4f43..3ffeeca77eb3 100644 --- a/app-admin/fam/files/fam-2.7.0-gcc43.patch +++ b/app-admin/fam/files/fam-2.7.0-gcc43.patch @@ -1,5 +1,17 @@ ---- lib/Client.c++ -+++ lib/Client.c++ +diff -Naur fam-2.7.0-orig/include/BTree.h fam-2.7.0/include/BTree.h +--- fam-2.7.0-orig/include/BTree.h 2003-01-19 22:22:30.000000000 -0600 ++++ fam-2.7.0/include/BTree.h 2008-12-04 17:51:22.000000000 -0600 +@@ -24,6 +24,7 @@ + #define BTree_included + + #include "Boolean.h" ++#include <cstdlib> + + // This is an in-core B-Tree implementation. + // +diff -Naur fam-2.7.0-orig/lib/Client.c++ fam-2.7.0/lib/Client.c++ +--- fam-2.7.0-orig/lib/Client.c++ 2003-01-18 08:18:12.000000000 -0600 ++++ fam-2.7.0/lib/Client.c++ 2008-12-04 17:51:19.000000000 -0600 @@ -34,7 +34,7 @@ #include <syslog.h> #include <errno.h> @@ -9,8 +21,9 @@ #include "fam.h" #include "Client.h" ---- src/DNotify.c++ -+++ src/DNotify.c++ +diff -Naur fam-2.7.0-orig/src/DNotify.c++ fam-2.7.0/src/DNotify.c++ +--- fam-2.7.0-orig/src/DNotify.c++ 2008-12-04 17:50:48.000000000 -0600 ++++ fam-2.7.0/src/DNotify.c++ 2008-12-04 17:51:19.000000000 -0600 @@ -31,6 +31,7 @@ #include <sys/types.h> #include <sys/stat.h> @@ -19,8 +32,9 @@ #include "DNotify.h" ---- src/IMon.c++ -+++ src/IMon.c++ +diff -Naur fam-2.7.0-orig/src/IMon.c++ fam-2.7.0/src/IMon.c++ +--- fam-2.7.0-orig/src/IMon.c++ 2003-01-18 08:18:12.000000000 -0600 ++++ fam-2.7.0/src/IMon.c++ 2008-12-04 17:51:19.000000000 -0600 @@ -40,7 +40,7 @@ #include "Interest.h" #include "Log.h" @@ -30,3 +44,14 @@ int IMon::imonfd = -2; IMon::EventHandler IMon::ehandler = NULL; +diff -Naur fam-2.7.0-orig/src/Interest.h fam-2.7.0/src/Interest.h +--- fam-2.7.0-orig/src/Interest.h 2008-12-04 17:50:48.000000000 -0600 ++++ fam-2.7.0/src/Interest.h 2008-12-04 17:51:22.000000000 -0600 +@@ -29,6 +29,7 @@ + #include <netinet/in.h> // for in_addr + + #include "Boolean.h" ++#include <cstdlib> + + class Event; + class FileSystem; |