rpms/ktechlab/devel ktechlab-0.3.69-gcc43.patch, NONE, 1.1 ktechlab-0.3.6-gcc42.patch, 1.1, 1.2 ktechlab.spec, 1.20, 1.21
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Thu Jul 17 22:08:11 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/ktechlab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13000
Modified Files:
ktechlab-0.3.6-gcc42.patch ktechlab.spec
Added Files:
ktechlab-0.3.69-gcc43.patch
Log Message:
* Thu Jul 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.69-8
- fix gcc42 patch to actually apply (remove hunk already applied in 0.3.69)
- adapt Debian g++ 4.3 patch by Georges Khaznadar
ktechlab-0.3.69-gcc43.patch:
--- NEW FILE ktechlab-0.3.69-gcc43.patch ---
diff -ur ktechlab-0.3.69/src/cnitem.cpp ktechlab-0.3.69-gcc43/src/cnitem.cpp
--- ktechlab-0.3.69/src/cnitem.cpp 2007-06-26 00:27:12.000000000 +0200
+++ ktechlab-0.3.69-gcc43/src/cnitem.cpp 2008-07-18 00:01:32.000000000 +0200
@@ -59,8 +59,8 @@
bool CNItem::preResize( QRect sizeRect )
{
- if ( (std::abs(sizeRect.width()) < minimumSize().width()) ||
- (std::abs(sizeRect.height()) < minimumSize().height()) )
+ if ( (std::abs((double)sizeRect.width()) < minimumSize().width()) ||
+ (std::abs((double)sizeRect.height()) < minimumSize().height()) )
return false;
updateConnectorPoints(false);
diff -ur ktechlab-0.3.69/src/conrouter.cpp ktechlab-0.3.69-gcc43/src/conrouter.cpp
--- ktechlab-0.3.69/src/conrouter.cpp 2007-06-26 00:27:12.000000000 +0200
+++ ktechlab-0.3.69-gcc43/src/conrouter.cpp 2008-07-18 00:04:44.000000000 +0200
@@ -454,7 +454,7 @@
{
for ( int x = start; x!=end; x+=dd )
{
- if ( std::abs(x-start)>1 && std::abs(x-end)>1 && (cells->cell( x, y ).CIpenalty > maxCIScore || cells->cell( x, y ).Cpenalty > maxConScore) )
+ if ( std::abs((double)(x-start))>1 && std::abs((double)(x-end))>1 && (cells->cell( x, y ).CIpenalty > maxCIScore || cells->cell( x, y ).Cpenalty > maxConScore) )
{
return false;
} else {
@@ -466,7 +466,7 @@
{
for ( int y = start; y!=end; y+=dd )
{
- if ( std::abs(y-start)>1 && std::abs(y-end)>1 && (cells->cell( x, y ).CIpenalty > maxCIScore || cells->cell( x, y ).Cpenalty > maxConScore) )
+ if ( std::abs((double)(y-start))>1 && std::abs((double)(y-end))>1 && (cells->cell( x, y ).CIpenalty > maxCIScore || cells->cell( x, y ).Cpenalty > maxConScore) )
{
return false;
} else {
diff -ur ktechlab-0.3.69/src/electronics/simulation/matrix.cpp ktechlab-0.3.69-gcc43/src/electronics/simulation/matrix.cpp
--- ktechlab-0.3.69/src/electronics/simulation/matrix.cpp 2007-06-26 00:27:07.000000000 +0200
+++ ktechlab-0.3.69-gcc43/src/electronics/simulation/matrix.cpp 2008-07-18 00:01:32.000000000 +0200
@@ -288,7 +288,7 @@
Map::Map( const uint size )
{
m_size = size;
- m_map = new ETMap( m_size, m_size );
+ m_map = new ETMap( m_size );
reset();
}
diff -ur ktechlab-0.3.69/src/nodegroup.cpp ktechlab-0.3.69-gcc43/src/nodegroup.cpp
--- ktechlab-0.3.69/src/nodegroup.cpp 2007-06-26 00:27:12.000000000 +0200
+++ ktechlab-0.3.69-gcc43/src/nodegroup.cpp 2008-07-18 00:01:32.000000000 +0200
@@ -16,6 +16,7 @@
#include <kdebug.h>
#include <assert.h>
+#include <cmath>
NodeGroup::NodeGroup( ICNDocument *icnDocument, const char *name )
: QObject( icnDocument, name )
@@ -274,7 +275,7 @@
{
if ( *it1 != *it2 && (*it1)->y() == (*it2)->y() && canRoute( *it1, *it2 ) )
{
- const int distance = std::abs(int( (*it1)->x()-(*it2)->x() ));
+ const int distance = std::abs((double)( (*it1)->x()-(*it2)->x() ));
if ( distance < shortest )
{
shortest = distance;
@@ -296,7 +297,7 @@
{
if ( *it1 != *it2 && (*it1)->x() == (*it2)->x() && canRoute( *it1, *it2 ) )
{
- const int distance = std::abs(int( (*it1)->y()-(*it2)->y() ));
+ const int distance = std::abs((double)( (*it1)->y()-(*it2)->y() ));
if ( distance < shortest )
{
shortest = distance;
@@ -320,7 +321,7 @@
{
const int dx = (int)((*it1)->x()-(*it2)->x());
const int dy = (int)((*it1)->y()-(*it2)->y());
- const int distance = std::abs(dx) + std::abs(dy);
+ const int distance = std::abs((double)dx) + std::abs((double)dy);
if ( distance < shortest )
{
shortest = distance;
ktechlab-0.3.6-gcc42.patch:
Index: ktechlab-0.3.6-gcc42.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/devel/ktechlab-0.3.6-gcc42.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ktechlab-0.3.6-gcc42.patch 26 Feb 2008 10:23:55 -0000 1.1
+++ ktechlab-0.3.6-gcc42.patch 17 Jul 2008 22:07:38 -0000 1.2
@@ -10,12 +10,3 @@
/**
* @returns A pointer to the canvas
*/
-@@ -215,7 +215,7 @@
- * Set the given QCanvasItem (which will attempt to be casted to known
- * items to be deleted.
- */
-- virtual void appendDeleteList( QCanvasItem * ) = 0l;
-+ virtual void appendDeleteList( QCanvasItem * ) = 0;
- /**
- * Save the current state of the document to the undo/redo history.
- * @param actionTicket if this is non-negative, and the last state save
Index: ktechlab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ktechlab/devel/ktechlab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ktechlab.spec 26 Feb 2008 10:12:13 -0000 1.20
+++ ktechlab.spec 17 Jul 2008 22:07:38 -0000 1.21
@@ -1,6 +1,6 @@
Name: ktechlab
Version: 0.3.69
-Release: 7%{?dist}
+Release: 8%{?dist}
# revision checkout 18 with chitlesh's enhancements that upstream
# haven't added since 2 months
Summary: Development and simulation of microcontrollers and electronic circuits
@@ -14,6 +14,7 @@
Patch0: ktechlab-0.3.6-multilib.patch
Patch1: ktechlab-bugfix.diff
Patch2: ktechlab-0.3.6-gcc42.patch
+Patch3: ktechlab-0.3.69-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +47,8 @@
%patch0 -p0 -b .multilib
%patch1 -p0 -b .bugfix
-%patch2 -p0 -b .gcc42
+%patch2 -p1 -b .gcc42
+%patch3 -p1 -b .gcc43
%build
@@ -112,6 +114,10 @@
%Changelog
+* Thu Jul 17 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.3.69-8
+- fix gcc42 patch to actually apply (remove hunk already applied in 0.3.69)
+- adapt Debian g++ 4.3 patch by Georges Khaznadar
+
* Mon Feb 25 2008 Chitlesh Goorah <chitlesh [AT] fedoraproject DOT org> - 0.3.69-7
- fixed for KDE4
More information about the fedora-extras-commits
mailing list