Update missing headers patch for gcc-4.4; bug #276288

(Portage version: 2.2_rc33-r1/cvs/Linux i686)

2 files changed, 37 insertions, 28 deletions

diff --git a/app-text/sdcv/ChangeLog b/app-text/sdcv/ChangeLog
index 363440aad0d2..80b22dc85ec0 100644
--- a/app-text/sdcv/ChangeLog
+++ b/app-text/sdcv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/sdcv
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sdcv/ChangeLog,v 1.1 2008/12/16 19:39:34 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sdcv/ChangeLog,v 1.2 2009/07/25 21:46:52 halcy0n Exp $
+
+  25 Jul 2009; Mark Loeser <halcy0n@gentoo.org>
+  files/sdcv-0.4.2-missing-headers.patch:
+  Update missing headers patch for gcc-4.4; bug #276288
 
 *sdcv-0.4.2 (16 Dec 2008)
 
diff --git a/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch b/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch
index 2011e2637e1e..8c96c65fa93b 100644
--- a/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch
+++ b/app-text/sdcv/files/sdcv-0.4.2-missing-headers.patch
@@ -1,16 +1,18 @@
-Fixes compilation with recent GCC which is more strict about C++.
---- a/src/readline.cpp
-+++ b/src/readline.cpp
-@@ -23,6 +23,7 @@
- #endif
+diff -ur sdcv-0.4.2-orig/src/lib/lib.cpp sdcv-0.4.2/src/lib/lib.cpp
+--- sdcv-0.4.2-orig/src/lib/lib.cpp	2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/lib/lib.cpp	2009-07-25 17:39:11.000000000 -0400
+@@ -517,7 +517,7 @@
+ {
+ 	fseek(idxfile, wordoffset[page_idx], SEEK_SET);
+ 	guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
+-	fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
++	fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
+ 	return wordentry_buf;
+ }
  
- #include <cstdio>
-+#include <cstdlib>
- #ifdef WITH_READLINE
- #  include <readline/readline.h>
- #  include <readline/history.h>
---- a/src/libwrapper.cpp
-+++ b/src/libwrapper.cpp
+diff -ur sdcv-0.4.2-orig/src/libwrapper.cpp sdcv-0.4.2/src/libwrapper.cpp
+--- sdcv-0.4.2-orig/src/libwrapper.cpp	2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/libwrapper.cpp	2009-07-25 17:39:11.000000000 -0400
 @@ -24,6 +24,7 @@
  
  #include <glib/gi18n.h>
@@ -19,24 +21,27 @@ Fixes compilation with recent GCC which is more strict about C++.
  
  #include "utils.hpp"
  
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -22,6 +22,7 @@
+diff -ur sdcv-0.4.2-orig/src/readline.cpp sdcv-0.4.2/src/readline.cpp
+--- sdcv-0.4.2-orig/src/readline.cpp	2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/readline.cpp	2009-07-25 17:39:11.000000000 -0400
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <cstdio>
++#include <cstdlib>
+ #ifdef WITH_READLINE
+ #  include <readline/readline.h>
+ #  include <readline/history.h>
+diff -ur sdcv-0.4.2-orig/src/utils.cpp sdcv-0.4.2/src/utils.cpp
+--- sdcv-0.4.2-orig/src/utils.cpp	2009-07-25 17:44:48.000000000 -0400
++++ sdcv-0.4.2/src/utils.cpp	2009-07-25 17:44:17.000000000 -0400
+@@ -22,6 +22,8 @@
  #  include "config.h"
  #endif
  
++#include <cstdio>
 +#include <cstdlib>
  #include <glib.h>
  #include <glib/gi18n.h>
  
---- a/src/lib/lib.cpp
-+++ b/src/lib/lib.cpp
-@@ -513,7 +513,7 @@
- {
- 	fseek(idxfile, wordoffset[page_idx], SEEK_SET);
- 	guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx];
--	fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
-+	fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255.
- 	return wordentry_buf;
- }
- 
+Only in sdcv-0.4.2/src: utils.o