[gentoo-commits] gentoo-x86 commit in app-crypt/eid-mw/files: eid-mw-4.0.2_p1188+gcc-4.7.patch

[gentoo-commits] gentoo-x86 commit in app-crypt/eid-mw/files: eid-mw-4.0.2_p1188+gcc-4.7.patch

[Diego Petteno (flameeyes)]

flameeyes    12/06/24 08:38:34

  Added:                eid-mw-4.0.2_p1188+gcc-4.7.patch
  Log:
  Add patch to build with GCC 4.7 (fixes bug #422873).
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch?rev=1.1&content-type=text/plain

Index: eid-mw-4.0.2_p1188+gcc-4.7.patch
===================================================================
Index: eid-mw-4.0.2/common/src/socket/socket.cpp
===================================================================
--- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
+++ eid-mw-4.0.2/common/src/socket/socket.cpp
@@ -21,6 +21,10 @@
 #include "../eiderrors.h"
 #include <iostream>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 namespace eIDMW
 {
 
Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp
===================================================================
--- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp
+++ eid-mw-4.0.2/common/src/socket/socketserver.cpp
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <errno.h>
+#include <unistd.h>
 #ifndef SOCKET_ERROR
 #define SOCKET_ERROR -1
 #endif
Index: eid-mw-4.0.2/common/src/util.cpp
===================================================================
--- eid-mw-4.0.2.orig/common/src/util.cpp
+++ eid-mw-4.0.2/common/src/util.cpp
@@ -27,6 +27,10 @@
 
 #include <stdlib.h>
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #ifdef WIN32
 #include <windows.h>
 #endif

[gentoo-commits] gentoo-x86 commit in app-crypt/eid-mw/files: eid-mw-4.0.2_p1188+gcc-4.7.patch

[Diego Petteno (flameeyes)]

flameeyes    12/06/24 20:01:52

  Modified:             eid-mw-4.0.2_p1188+gcc-4.7.patch
  Log:
  Fix patch to always include unistd.h without conditions for now. Thanks Xavier.
  
  (Portage version: 2.2.0_alpha112/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch?r1=1.1&r2=1.2

Index: eid-mw-4.0.2_p1188+gcc-4.7.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eid-mw-4.0.2_p1188+gcc-4.7.patch	24 Jun 2012 08:38:34 -0000	1.1
+++ eid-mw-4.0.2_p1188+gcc-4.7.patch	24 Jun 2012 20:01:52 -0000	1.2
@@ -2,13 +2,11 @@
 ===================================================================
 --- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
 +++ eid-mw-4.0.2/common/src/socket/socket.cpp
-@@ -21,6 +21,10 @@
+@@ -21,6 +21,8 @@
  #include "../eiderrors.h"
  #include <iostream>
  
-+#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
-+#endif
 +
  namespace eIDMW
  {
@@ -29,13 +27,11 @@
 ===================================================================
 --- eid-mw-4.0.2.orig/common/src/util.cpp
 +++ eid-mw-4.0.2/common/src/util.cpp
-@@ -27,6 +27,10 @@
+@@ -27,6 +27,8 @@
  
  #include <stdlib.h>
  
-+#ifdef HAVE_UNISTD_H
 +#include <unistd.h>
-+#endif
 +
  #ifdef WIN32
  #include <windows.h>