rpms/psi/FC-4 psi-0.9.3-gcc4.patch,NONE,1.1 psi.spec,1.11,1.12

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/psi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24478

Modified Files:
	psi.spec 
Added Files:
	psi-0.9.3-gcc4.patch 
Log Message:
[might need further patches - this is where it broke on x86_64 first]

* Wed Jun  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.3-4
- patch it for 64-bit/GCC 4



psi-0.9.3-gcc4.patch:

--- NEW FILE psi-0.9.3-gcc4.patch ---
diff -Nur psi-0.9.3-orig/libpsi/psiwidgets/iconaction.cpp psi-0.9.3/libpsi/psiwidgets/iconaction.cpp
--- psi-0.9.3-orig/libpsi/psiwidgets/iconaction.cpp	2004-10-24 11:42:19.000000000 +0200
+++ psi-0.9.3/libpsi/psiwidgets/iconaction.cpp	2005-06-01 07:32:53.000000000 +0200
@@ -71,7 +71,7 @@
 
 			QMap<QPopupMenu *, int>::Iterator it = popups.begin();
 			for ( ; it != popups.end(); ++it ) {
-				if ( (int)it.key() == (int)obj ) {
+				if ( it.key() == obj ) {
 					dirty = true;
 					popups.remove( it );
 					break;


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/psi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- psi.spec	22 May 2005 23:45:43 -0000	1.11
+++ psi.spec	1 Jun 2005 09:16:06 -0000	1.12
@@ -3,9 +3,8 @@
 
 Name:       psi
 Version:    0.9.3
-Release:    3%{?dist}
-
-Summary:    Jabber client using QT3
+Release:    4%{?dist}
+Summary:    Jabber client using Qt 3
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
@@ -13,6 +12,7 @@
 Source2:    psi-uicwrapper.sh
 Patch1:     psi-0.9.2-strip.patch
 Patch2:     psi-0.9.2-mach-build.patch
+Patch3:     psi-0.9.3-gcc4.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -114,6 +114,8 @@
 %patch1 -p1 -b .strip
 # needed to build with mach
 %patch2 -p1 -b .mach-build
+%patch3 -p1 -b .gcc4
+
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -228,10 +230,13 @@
 
 
 %changelog
-* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.9.3
+* Wed Jun  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.3-4
+- patch it for 64-bit/GCC 4
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.9.3-3
 - rebuild on all arches
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.3-2
 - rebuilt
 
 * Sun Jan 09 2005 Aurelien Bompard <gauret[AT]free.fr> 0:0.9.3-1