Author: pterjan
Date: Sat Dec 2 13:47:54 2006
New Revision: 90043
Added:
packages/cooker/nil/current/SOURCES/nil-64.patch
Modified:
packages/cooker/nil/current/SPECS/nil.spec
Log:
Fix build on x86_64
Added: packages/cooker/nil/current/SOURCES/nil-64.patch
==============================================================================
--- (empty file)
+++ packages/cooker/nil/current/SOURCES/nil-64.patch Sat Dec 2 13:47:54 2006
@@ -0,0 +1,20 @@
+--- ./nil/nil/tcp_socket.cpp~ 2000-02-15 04:49:22.000000000 +0100
++++ ./nil/nil/tcp_socket.cpp 2006-12-02 13:39:55.000000000 +0100
+@@ -21,7 +21,7 @@
+ int recv_result = recv(s,((char*)buf)+bytes_done,bytes_left,0);
+
+ if (recv_result < 0) {
+- logmsg(lt_error,"recv(%i,((char*)%x)+%i,%i,0); returned
%i (%s)",s,(int)buf,bytes_done,bytes_left,errno,strerror(errno));
++ logmsg(lt_error,"recv(%i,((char*)%p)+%i,%i,0); returned
%i (%s)",s,buf,bytes_done,bytes_left,errno,strerror(errno));
+ return -2; //uh, it went bad.
+
+ } else if (recv_result > 0) {
+@@ -52,7 +52,7 @@
+ int send_result = send(s,((char*)buf)+bytes_done,bytes_left,0);
+
+ if (send_result < 0) {
+- logmsg(lt_error,"send(%i,((char*)%x)+%i,%i,0); returned
%i (%s)",s,(int)buf,bytes_done,bytes_left,errno,strerror(errno));
++ logmsg(lt_error,"send(%i,((char*)%p)+%i,%i,0); returned
%i (%s)",s,buf,bytes_done,bytes_left,errno,strerror(errno));
+ return -2; //uh, it went bad.
+
+ } else if (send_result > 0) {
Modified: packages/cooker/nil/current/SPECS/nil.spec
==============================================================================
--- packages/cooker/nil/current/SPECS/nil.spec (original)
+++ packages/cooker/nil/current/SPECS/nil.spec Sat Dec 2 13:47:54 2006
@@ -22,6 +22,7 @@
Patch1: nil-000516-i18ned-keys.patch.bz2
Patch2: nil-remove-debug-printings.patch.bz2
Patch3: nil-000516-gcc31.patch.bz2
+Patch4: nil-64.patch
URL: http://nil.sf.net/
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
@@ -45,6 +46,7 @@
%patch1 -p1
%patch2 -p0
%patch3 -p0
+%patch4 -p1
# remove nasty no-newline-at-end-of-line, it bothers gcc-2.96
find . -name "*.h" -exec perl -pi -e '$_.="\n" if eof' {} \;
