rpms/qcad/devel qcad-64bit.patch,NONE,1.1 qcad.spec,1.7,1.8

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/rpms/qcad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31731

Modified Files:
	qcad.spec 
Added Files:
	qcad-64bit.patch 
Log Message:
* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.0.4.0-4.fc4
- fix build on 64bit arches (#158650)


qcad-64bit.patch:

--- NEW FILE qcad-64bit.patch ---
--- qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_entity.cpp.64bit	2005-05-25 18:09:58.000000000 -0400
+++ qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_entity.cpp	2005-05-25 18:10:29.000000000 -0400
@@ -849,7 +849,7 @@
         os << " layer: NULL ";
     } else {
         os << " layer: " << e.layer->getName().latin1() << " ";
-        os << " layer address: " << (int)(e.layer) << " ";
+        os << " layer address: " << (e.layer) << " ";
     }
 
     os << e.pen << "\n";
--- qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_layer.cpp.64bit	2005-05-25 18:15:22.000000000 -0400
+++ qcad-2.0.4.0-1.src/qcadlib/src/engine/rs_layer.cpp	2005-05-25 18:16:12.000000000 -0400
@@ -57,7 +57,7 @@
     os << " name: " << l.getName().latin1()
     << " pen: " << l.getPen()
 	<< " frozen: " << (int)l.isFrozen()
-	<< " address: " << (int)(&l)
+	<< " address: " << (&l)
     << std::endl;
     return os;
 }


Index: qcad.spec
===================================================================
RCS file: /cvs/extras/rpms/qcad/devel/qcad.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qcad.spec	22 May 2005 23:03:38 -0000	1.7
+++ qcad.spec	26 May 2005 00:06:46 -0000	1.8
@@ -10,6 +10,7 @@
 Patch:		qcad-qass.patch
 Patch1:		qcad-assistant.patch
 Patch2:		qcad-manual-bugs.patch
+Patch3:         qcad-64bit.patch
 URL:		http://www.ribbonsoft.com/qcad.html
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{subversion}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	qt-devel >= 3.1.2, python-devel, desktop-file-utils, xorg-x11-devel
@@ -32,6 +33,7 @@
 %patch1 -p1 -b .assistanterror
 # no backup file here, so it doesn't get packaged
 %patch2 -p0
+%patch3 -p1 -b .64bit
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -104,6 +106,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.0.4.0-4.fc4
+- fix build on 64bit arches (#158650)
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 2.0.4.0-4.fc4
 - rebuild on all arches