rpms/ucblogo/F-10 ucblogo-6.0-wx.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 ucblogo.spec, 1.9, 1.10

Fri Nov 21 00:33:20 UTC 2008

Author: gemi

Update of /cvs/pkgs/rpms/ucblogo/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5093/F-10

Modified Files:
	.cvsignore sources ucblogo.spec 
Added Files:
	ucblogo-6.0-wx.patch 
Log Message:
new release 6.0

ucblogo-6.0-wx.patch:

--- NEW FILE ucblogo-6.0-wx.patch ---
diff -up ucblogo-6.0/wxTerminal.cpp.wx ucblogo-6.0/wxTerminal.cpp
--- ucblogo-6.0/wxTerminal.cpp.wx	2008-09-14 06:57:09.000000000 +0200
+++ ucblogo-6.0/wxTerminal.cpp	2008-11-21 01:05:26.000000000 +0100
@@ -938,7 +938,7 @@ wxTerminal::GetCharSize(int *cw, int *ch
   //dc.GetTextExtent("(", &dummy, ch);
 
   int descent, extlead; 
-  dc.GetTextExtent("M", cw, ch, &descent, &extlead);
+  dc.GetTextExtent(wxString("M", wxConvUTF8, wxSTRING_MAXLEN), cw, ch, &descent, &extlead);
   //for the tails of g's and y's, if needed.
 #ifdef __WXMSW__
     *ch += descent + extlead + 1;
@@ -2202,8 +2202,8 @@ void wxTerminal::DebugOutputBuffer() {
   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 CHARACTER BUFFER\n###############\n");
+  //    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 CHARACTER BUFFER\n###############\n");
   while(char_of(pos_1) != '\0') {
     if(char_of(pos_1) == '\n') {
       fprintf(stderr, "\\n\n");
@@ -2218,7 +2218,7 @@ void wxTerminal::DebugOutputBuffer() {
     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: %d, offset: %d, len: %d\n", i,(int)line_of(lpos).buf, line_of(lpos).offset, line_of(lpos).line_length);
     inc_linepos(lpos);
   }
     fprintf(stderr, "\n#############\n\n");
diff -up ucblogo-6.0/wxTurtleGraphics.cpp.wx ucblogo-6.0/wxTurtleGraphics.cpp
--- ucblogo-6.0/wxTurtleGraphics.cpp.wx	2008-09-14 01:23:42.000000000 +0200
+++ ucblogo-6.0/wxTurtleGraphics.cpp	2008-11-21 01:05:35.000000000 +0100
@@ -558,7 +558,7 @@ extern "C" FLONUM y_scale;
 extern "C" void wx_get_label_size(int *w, int *h) {
     /* returns size in pixels; converted to turtle steps in wxterm.c */
   int descent, extlead;
-  m_memDC->GetTextExtent("M", w, h, &descent, &extlead);  
+  m_memDC->GetTextExtent(wxString("M", wxConvUTF8, wxSTRING_MAXLEN), w, h, &descent, &extlead);  
 }
 
 extern "C" void wx_adjust_label_height() {
@@ -573,7 +573,7 @@ extern "C" void wx_adjust_label_height()
     label_font.SetPointSize(font_size);
 
     m_memDC->SetFont(label_font);	
-    m_memDC->GetTextExtent("M", &cw, &ch, &descent, &extlead);
+    m_memDC->GetTextExtent(wxString("M", wxConvUTF8, wxSTRING_MAXLEN), &cw, &ch, &descent, &extlead);
 
     //now... first figure out whether we undershot or overshot...
     //this determines which direction to change the size
@@ -592,7 +592,7 @@ extern "C" void wx_adjust_label_height()
 	    }
 	    if (expected == 100) break;
 	    m_memDC->SetFont(tmp_font);	
-	    m_memDC->GetTextExtent("M", &cw, &tmp_height, &descent, &extlead);
+	    m_memDC->GetTextExtent(wxString("M", wxConvUTF8, wxSTRING_MAXLEN), &cw, &tmp_height, &descent, &extlead);
 
 	    if(tmp_height >= px_height) break;
 
@@ -611,7 +611,7 @@ extern "C" void wx_adjust_label_height()
 	    }
 	    if (expected == 2) break;
 	    m_memDC->SetFont(tmp_font);	
-	    m_memDC->GetTextExtent("M", &cw, &tmp_height, &descent, &extlead);
+	    m_memDC->GetTextExtent(wxString("M", wxConvUTF8, wxSTRING_MAXLEN), &cw, &tmp_height, &descent, &extlead);
 
 	    if(tmp_height <= px_height) break;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ucblogo/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jun 2006 19:02:28 -0000	1.2
+++ .cvsignore	21 Nov 2008 00:32:49 -0000	1.3
@@ -1 +1 @@
-ucblogo-5.5.tar.gz
+ucblogo-6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ucblogo/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jun 2006 19:02:28 -0000	1.2
+++ sources	21 Nov 2008 00:32:49 -0000	1.3
@@ -1 +1 @@
-caf68577630645718492fd7d10fd4927  ucblogo-5.5.tar.gz
+36a56765b18136c817880c5381af196b  ucblogo-6.0.tar.gz


Index: ucblogo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucblogo/F-10/ucblogo.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ucblogo.spec	9 Sep 2008 02:55:15 -0000	1.9
+++ ucblogo.spec	21 Nov 2008 00:32:49 -0000	1.10
@@ -1,15 +1,16 @@
 Name:		ucblogo
-Version:	5.5
-Release:	11%{?dist}
+Version:	6.0
+Release:	1%{?dist}
 Summary:	An interpreter for the Logo programming language
 
 Group: 		Development/Languages
 License:	GPLv2+
-Source: 	ftp://ftp.cs.berkeley.edu/pub/ucblogo/ucblogo-5.5.tar.gz
+Source: 	ftp://ftp.cs.berkeley.edu/pub/ucblogo/ucblogo-%{version}.tar.gz
 Patch0:         ucblogo-5.5-ospeed.patch
+Patch1:         ucblogo-6.0-wx.patch
 URL: 		http://www.cs.berkeley.edu/~bh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	emacs
+#BuildRequires:	emacs
 BuildRequires:	texinfo
 BuildRequires:	texinfo-tex
 BuildRequires:	texi2html
@@ -20,6 +21,7 @@
 BuildRequires:	libSM-devel
 BuildRequires:	libICE-devel
 BuildRequires:	ncurses-devel
+BuildRequires:  wxGTK-devel
 Requires(post):  /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -36,29 +38,42 @@
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .ospeed
+%patch1 -p1 -b .wx
+
+sed -i 's|everything|all|g' makefile*
 
 # no dot files in directories
-perl -pi -e 's|\.logo|dot.logo|g' emacs/dot.*
-perl -pi -e 's|/\.logo|/dot.logo|g' emacs/makefile
-perl -pi -e 's|\.LOOPS|dot.LOOPS|g' emacs/dot.*
-perl -pi -e 's|/\.LOOPS|/dot.LOOPS|g' emacs/makefile
+# -pi -e 's|\.logo|dot.logo|g' emacs/dot.*
+#sed -i 's|/\.logo|/dot.logo|g' emacs/makefile
+#sed -i 's|\.LOOPS|dot.LOOPS|g' emacs/dot.*
+#sed -i 's|/\.LOOPS|/dot.LOOPS|g' emacs/makefile
 
 # correct directories /usr/lib -> /usr/share and /usr/local ->  /usr
-perl -pi -e 's|/local/lib/logo|/share/logo|g' emacs/* *.c README
-perl -pi -e 's|/lib/logo|/share/logo|g' emacs/* *.c makefile*
-perl -pi -e 's|/usr/local/bin/logo|/usr/bin/logo|g' docs/html/usermanual_1.html
-perl -pi -e 's|/usr/local/bin/logo|/usr/bin/logo|g' docs/ucblogo.info-1
-perl -pi -e 's|/usr/local/bin/logo|/usr/bin/logo|g' docs/usermanual.texi
-perl -pi -e 's|/usr/local/bin/logo|/usr/bin/logo|g' README
-perl -pi -e 's|/usr/local/info|/usr/share/info|g' emacs/logo.el emacs/README README
-perl -pi -e 's|/usr/info|/usr/share/info|g' emacs/dot.emacs
-perl -pi -e 's|\$\(prefix\)/info|/usr/share/info|' emacs/makefile
+#sed -i 's|/local/lib/logo|/share/logo|g' emacs/*
+sed -i 's|/local/lib/logo|/share/logo|g' *.c README
+#sed -i 's|/lib/logo|/share/logo|g' emacs/*
+sed -i 's|/lib/logo|/share/logo|g' *.c makefile*
+sed -i 's|/usr/local/bin/logo|/usr/bin/logo|g' docs/html/usermanual_1.html
+sed -i 's|/usr/local/bin/logo|/usr/bin/logo|g' docs/ucblogo.info*
+sed -i 's|/usr/local/bin/logo|/usr/bin/logo|g' docs/usermanual.texi
+sed -i 's|/usr/local/bin/logo|/usr/bin/logo|g' README
+#sed -i 's|/usr/local/info|/usr/share/info|g' emacs/logo.el emacs/README
+sed -i 's|/usr/local/info|/usr/share/info|g' README
+#sed -i 's|/usr/info|/usr/share/info|g' emacs/dot.emacs
+#sed -i 's|\$\(prefix\)/info|/usr/share/info|' emacs/makefile
 
 # use cursesw instead of curses
-#perl -pi -e 's|lcurses|lcursesw|' configure
+#sed -i 's|lcurses|lcursesw|' configure
+
+find -name 'CVS' | xargs rm -rf
+find -name '.svn' | xargs rm -rf
 
 %build
+%configure --x-includes=%{_includedir} --x-libraries=%{_libdir} --with-x --wx-enable --wx-config_path=/usr/bin/wx-config
+make %{_smp_mflags} logo
+mv logo logo-wx
+make clean
 %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} --with-x
 make %{_smp_mflags}
 
@@ -67,15 +82,16 @@
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
 
+install -m0755 logo-wx ${RPM_BUILD_ROOT}%{_bindir}
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/info
 mv -f ${RPM_BUILD_ROOT}/%{_prefix}/info/* ${RPM_BUILD_ROOT}/%{_datadir}/info
 rm -fr ${RPM_BUILD_ROOT}/%{_prefix}/info
 
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/site-start.d
-cp -f ${RPM_BUILD_ROOT}/%{_datadir}/logo/emacs/dot.emacs ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/site-start.d/logo-mode.el
+#mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/site-start.d
+#cp -f ${RPM_BUILD_ROOT}/%{_datadir}/logo/emacs/dot.emacs ${RPM_BUILD_ROOT}/%{_datadir}/emacs/site-lisp/site-start.d/logo-mode.el
 rm -f ${RPM_BUILD_ROOT}/%{_bindir}/install-logo-mode
-mkdir installdocs
-mv -f ${RPM_BUILD_ROOT}/%{_datadir}/logo/docs/html installdocs
+#mkdir installdocs
+#mv -f ${RPM_BUILD_ROOT}/%{_datadir}/logo/docs/html installdocs
 rm -fr ${RPM_BUILD_ROOT}/%{_datadir}/logo/docs
 
 %clean
@@ -83,27 +99,31 @@
 
 
 %post
-/sbin/install-info %{_infodir}/loops.info --entry="* Loops: (loops).	Berkeley Logo Object Oriented Programming System." --section="Programming Languages" %{_infodir}/dir 2>/dev/null || :
+#/sbin/install-info %{_infodir}/loops.info --entry="* Loops: (loops).	Berkeley Logo Object Oriented Programming System." --section="Programming Languages" %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/ucblogo.info --entry="* UCBLogo: (ucblogo).	Berkeley Logo User Manual." --section="Programming Languages"  %{_infodir}/dir 2>/dev/null || :
 
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/loops.info --entry="* Loops: (loops).	Berkeley Logo Object Oriented Programming System." --section="Programming Languages" %{_infodir}/dir 2>/dev/null || :
+#    /sbin/install-info --delete %{_infodir}/loops.info --entry="* Loops: (loops).	Berkeley Logo Object Oriented Programming System." --section="Programming Languages" %{_infodir}/dir 2>/dev/null || :
     /sbin/install-info --delete  %{_infodir}/ucblogo.info --entry="* UCBLogo: (ucblogo).	Berkeley Logo User Manual." --section="Programming Languages"  %{_infodir}/dir 2>/dev/null || :
 fi
 
 
 %files
 %defattr(-,root,root,-)
+%doc docs/html docs/usermanual.pdf README gpl plm changes.txt
+%doc 
 %{_bindir}/*
 %{_datadir}/logo
 %{_infodir}/*
-%{_datadir}/emacs/site-lisp/site-start.d
-%doc installdocs/* README gpl plm
+#%{_datadir}/emacs/site-lisp/site-start.d
 
 
 %changelog
+* Thu Nov 20 2008 Gerard Milmeister <gemi at bluewin.ch> - 6.0-1
+- new release 6.0
+
 * Mon Sep  8 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 5.5-11
 - fix license tag
 


