[packages/ucblogo] - added lp64 patch (fixes build on LP64 platforms, like x86_64)
qboosh
qboosh at pld-linux.org
Sun May 19 10:45:40 CEST 2013
commit 173b5aa26229130a42c885a89f0375504820b970
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun May 19 10:45:54 2013 +0200
- added lp64 patch (fixes build on LP64 platforms, like x86_64)
ucblogo-lp64.patch | 20 ++++++++++++++++++++
ucblogo.spec | 2 ++
2 files changed, 22 insertions(+)
---
diff --git a/ucblogo.spec b/ucblogo.spec
index a6d5789..ee8c1d5 100644
--- a/ucblogo.spec
+++ b/ucblogo.spec
@@ -10,6 +10,7 @@ Source0: ftp://anarres.cs.berkeley.edu/pub/ucblogo/%{name}-%{version}.tar.gz
Patch0: %{name}-signals.patch
Patch1: %{name}-make.patch
Patch2: %{name}-wx.patch
+Patch3: %{name}-lp64.patch
URL: http://www.cs.berkeley.edu/~bh/logo.html
BuildRequires: ncurses-devel
BuildRequires: wxGTK2-unicode-devel
@@ -45,6 +46,7 @@ plot i wiele innych.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%{__rm} -r csls/CVS
diff --git a/ucblogo-lp64.patch b/ucblogo-lp64.patch
new file mode 100644
index 0000000..9e9ac59
--- /dev/null
+++ b/ucblogo-lp64.patch
@@ -0,0 +1,20 @@
+--- ucblogo-6.0/wxTerminal.cpp.orig 2013-05-19 09:50:57.119887675 +0200
++++ ucblogo-6.0/wxTerminal.cpp 2013-05-19 10:04:05.197846901 +0200
+@@ -2202,7 +2202,7 @@
+ lpos.offset = 0;
+ wxterm_charpos pos_1 = line_of(lpos);
+
+- fprintf(stderr, "WXTERMINAL STATS: \n width: %d, height: %d, \n cw: %d, ch: %d \n x_max: %d, y_max: %d \n cursor_x: %d, cursor_y: %d \n last_logo_x : %d, last_logo_y: %d \ncurr_charpos buf %d offset %d \ncurr_line buf %d offset %d\n", m_width, m_height, m_charWidth, m_charHeight, x_max, y_max,cursor_x, cursor_y, last_logo_x, last_logo_y,(int)curr_char_pos.buf, curr_char_pos.offset, (int)curr_line_pos.buf, curr_line_pos.offset);
++ fprintf(stderr, "WXTERMINAL STATS: \n width: %d, height: %d, \n cw: %d, ch: %d \n x_max: %d, y_max: %d \n cursor_x: %d, cursor_y: %d \n last_logo_x : %d, last_logo_y: %d \ncurr_charpos buf %ld offset %d \ncurr_line buf %ld offset %d\n", m_width, m_height, m_charWidth, m_charHeight, x_max, y_max,cursor_x, cursor_y, last_logo_x, last_logo_y,(long)curr_char_pos.buf, curr_char_pos.offset, (long)curr_line_pos.buf, curr_line_pos.offset);
+ fprintf(stderr, "WXTERMINAL CHARACTER BUFFER\n###############\n");
+ while(char_of(pos_1) != '\0') {
+ if(char_of(pos_1) == '\n') {
+@@ -2218,7 +2218,7 @@
+ fprintf(stderr, "\n#############\n");
+ fprintf(stderr, "WXTERMINAL LINE BUFFER\n##############\n");
+ for(int i = 0; i <= y_max; i++) {
+- fprintf(stderr, "LINE %d: buf: %d, offset: %d, len: %d\n", i,(int)line_of(lpos).buf, line_of(lpos).offset, line_of(lpos).line_length);
++ fprintf(stderr, "LINE %d: buf: %ld, offset: %d, len: %d\n", i,(long)line_of(lpos).buf, line_of(lpos).offset, line_of(lpos).line_length);
+ inc_linepos(lpos);
+ }
+ fprintf(stderr, "\n#############\n\n");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ucblogo.git/commitdiff/173b5aa26229130a42c885a89f0375504820b970
More information about the pld-cvs-commit
mailing list