rpms/kdeutils/devel kdeutils-3.96.2-kcalc_32bit.patch, NONE, 1.1 kdeutils.spec, 1.103, 1.104

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdeutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20288

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-3.96.2-kcalc_32bit.patch 
Log Message:
* Sat Dec 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.96.2-2
- kcalc_32bit patch


kdeutils-3.96.2-kcalc_32bit.patch:

--- NEW FILE kdeutils-3.96.2-kcalc_32bit.patch ---
--- trunk/KDE/kdeutils/kcalc/knumber/knumber.cpp	2007/11/26 20:03:54	741947
+++ trunk/KDE/kdeutils/kcalc/knumber/knumber.cpp	2007/11/29 15:16:46	742986
@@ -77,7 +77,7 @@
 {
   if ( isinf(num) ) _num = new _knumerror( _knumber::Infinity );
   else if ( isnan(num) ) _num = new _knumerror( _knumber::UndefinedNumber );
-  else _num = new _knumfloat(num);      
+  else _num = new _knumfloat(num);
 
 }
 
@@ -142,7 +142,7 @@
 {
   if (type() != FractionType)
     return;
-  
+
   _knumfraction *tmp_num = dynamic_cast<_knumfraction *>(_num);
 
   if (tmp_num->isInteger()) {
@@ -156,7 +156,7 @@
 
 KNumber const & KNumber::operator=(KNumber const & num)
 {
-  if (this == & num) 
+  if (this == & num)
     return *this;
 
   delete _num;
@@ -175,7 +175,7 @@
     _num = new _knumfloat();
     break;
   };
-  
+
   _num->copy(*(num._num));
 
   return *this;
@@ -201,7 +201,7 @@
     _num = new _knumfloat();
     break;
   };
-  
+
   _num->copy(*(tmp_num._num));
 
   return *this;
@@ -227,7 +227,7 @@
     _num = new _knumfloat();
     break;
   };
-  
+
   _num->copy(*(tmp_num._num));
 
   return *this;
@@ -410,7 +410,7 @@
   default:
     return QString(_num->ascii());
   }
-  
+
   if (prec >= 0)
     return roundNumber(tmp_str, prec);
   else
@@ -674,9 +674,9 @@
   return static_cast<unsigned long int>(*_num);
 #elif SIZEOF_UNSIGNED_LONG == 4
   KNumber tmp_num1 = this->abs().integerPart();
-  quint64 tmp_num2 =  static_cast<unsigned long int>(tmp_num1) +
-    (static_cast<quint64>(static_cast<unsigned long int>(tmp_num1 >> KNumber("32"))) << 32) ;
-  
+  quint64 tmp_num2 =  static_cast<quint32>(tmp_num1) +
+    (static_cast<quint64>(static_cast<quint32>(tmp_num1 >> KNumber("32"))) << 32) ;
+
 #ifdef __GNUC__
 #warning "the cast operator from KNumber to quint64 is probably buggy, when a sign is involved"
 #endif
@@ -686,7 +686,7 @@
     return static_cast<quint64> (- static_cast<qint64>(tmp_num2));
 #else
 #error "SIZEOF_UNSIGNED_LONG is a unhandled case"
-#endif 
+#endif
 }
 
 KNumber::operator double(void) const


Index: kdeutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- kdeutils.spec	2 Dec 2007 03:56:45 -0000	1.103
+++ kdeutils.spec	2 Dec 2007 04:22:00 -0000	1.104
@@ -1,7 +1,7 @@
 Name:           kdeutils
 Epoch:          6
 Version:        3.96.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        K Desktop Environment - Utilities
 
 Group:          Applications/System
@@ -11,6 +11,8 @@
 Source0:        ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kdeutils-3.96.2-kcalc_32bit.patch
+
 # FIXME/TODO: Tpctl is needed for klaptopdaemon
 BuildRequires:  kde-filesystem >= 4
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
@@ -66,6 +68,8 @@
 %prep
 %setup -q
 
+%patch1 -p3 -b .kcalc_32bit
+
 
 %build
 
@@ -166,8 +170,11 @@
 
 
 %changelog
+* Sat Dec 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.96.2-2
+- kcalc_32bit patch
+
 * Sat Dec 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.96.2-1
-= kde-3.96.2
+- kde-3.96.2
 
 * Sat Nov 24 2007 Sebastian Vahl <fedora at deadbabylon.de> 6:3.96.1-1
 - kde-3.96.1