rpms/aplus-fsf/devel aplus-fsf-4.22-gcc44.patch, NONE, 1.1 aplus-fsf.spec, 1.40, 1.41

[Jochen Schmitt]

Author: s4504kr

Update of /cvs/extras/rpms/aplus-fsf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26425

Modified Files:
	aplus-fsf.spec 
Added Files:
	aplus-fsf-4.22-gcc44.patch 
Log Message:
Fix gcc-44 related issues

aplus-fsf-4.22-gcc44.patch:

--- NEW FILE aplus-fsf-4.22-gcc44.patch ---
diff -up aplus-fsf-4.22/src/MSTypes/MSFloat.C.gcc44 aplus-fsf-4.22/src/MSTypes/MSFloat.C
--- aplus-fsf-4.22/src/MSTypes/MSFloat.C.gcc44	2008-03-27 20:10:29.000000000 +0100
+++ aplus-fsf-4.22/src/MSTypes/MSFloat.C	2009-03-10 21:07:07.000000000 +0100
@@ -112,6 +112,8 @@ const MSSymbol& MSFloat::symbol(void)   
 MSError::ErrorStatus MSFloat::internalSet(const char *pString_)
 {
   char	*np,buf[512];
+
+  char *xp = const_cast<char *>(pString_);
   
   _real=0.0;
   _flags=MSFloat::Set; // clear the Valid bit, i.e. isValid==MSFalse
@@ -120,15 +122,15 @@ MSError::ErrorStatus MSFloat::internalSe
    { _real=0.0; setToValid(); return (MSError::MSSuccess); }
   else if (strncmp(pString_,"NaN",3)==0) 
    { _real=0.0; return (MSError::MSSuccess); }
-  else if ((np=strchr(pString_,'.'))&&(strchr(++np,'.')))
+  else if ((np=strchr(xp,'.'))&&(strchr(++np,'.')))
    { return (MSError::BadReal); } // Disallow more than one decimal point
-  else if ((np=strchr(pString_,'.'))&&(strchr(++np,','))) 
+  else if ((np=strchr(xp,'.'))&&(strchr(++np,','))) 
    { return (MSError::BadReal); } // Disallow commas after the decimal point
   else if (*pString_==',') 
    { return (MSError::BadReal); } // Disallow leading commas
   
   // Make sure we don't save too many characters after the decimal
-  char *decimal=strchr(pString_,'.');
+  char *decimal=strchr(xp,'.');
   if ((decimal!=0)&&(strlen(decimal+1)>MSRealMaximumLength))
    { return (MSError::IntTooBig); }
   strcpy(buf,pString_);
diff -up aplus-fsf-4.22/src/MSTypes/MSUtil.C.gcc44 aplus-fsf-4.22/src/MSTypes/MSUtil.C
--- aplus-fsf-4.22/src/MSTypes/MSUtil.C.gcc44	2008-03-27 20:10:34.000000000 +0100
+++ aplus-fsf-4.22/src/MSTypes/MSUtil.C	2009-03-10 21:08:17.000000000 +0100
@@ -26,8 +26,10 @@ void MSUtil::comma(const char *fromBuffe
 {
   int places,len,i,j;
   char *cp;
+
+  char *xp = const_cast<char *>(fromBuffer_);
   
-  if ((cp=strchr(fromBuffer_,'.'))!=NULL)
+  if ((cp=strchr(xp,'.'))!=NULL)
    {
      places=cp-fromBuffer_;
      for (i=0,j=0,len=strlen(fromBuffer_); j<=len&&i<(size_-1); j++,i++)


Index: aplus-fsf.spec
===================================================================
RCS file: /cvs/extras/rpms/aplus-fsf/devel/aplus-fsf.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- aplus-fsf.spec	28 Feb 2009 01:32:03 -0000	1.40
+++ aplus-fsf.spec	10 Mar 2009 20:20:22 -0000	1.41
@@ -20,7 +20,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -34,6 +34,7 @@
 Patch1: aplus-fsf-4.22.4-makefile.patch
 Patch3: aplus-fsf-4.20-el.patch
 Patch4: aplus-fsf-4.22.3-atree.patch
+Patch5:	aplus-fsf-4.22-gcc44.patch
 
 BuildRequires: libtool
 BuildRequires: xorg-x11-proto-devel
@@ -69,6 +70,8 @@
 
 Requires: fontpackages-filesystem
 
+BuildArch: noarch
+
 %description KAPL-fonts
 The A+ programming language development environment requires these 
 APL fonts to properly display A+ code in XTerm or XEmacs.
@@ -81,6 +84,7 @@
 Summary: XEmacs lisp for A+ development
 Group: Applications/Editors
 Requires: xemacs, aplus-fsf
+BuildArch: noarch
 %description -n xemacs-%{name}
 This package contains the XEmacs lisp required for the development
 of A+ programs. It does the key bindings, set of fonts property 
@@ -99,6 +103,7 @@
 %patch1 -p1 -b .org
 %patch3 -p1
 %patch4 -p1 
+%patch5 -p1 -b .gcc44
 
 %build
 # export CXXFLAGS=-O3 CFLAGS=-O3
@@ -188,6 +193,10 @@
 %{xemacs_startdir}/aplus-fsf-init.el
 
 %changelog
+* Tue Mar 10 2009 Jochen Schmitt <Jochen herr-schmitt de> 4.22.4-15
+- Support noach subpackages
+- fix gcc-44 releated issues (workaround)
+
 * Fri Feb 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.22.4-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild