rpms/psi/F-9 psi-0.12-qt-4_5-compatibility.patch, NONE, 1.1 psi.spec, 1.24, 1.25

Sven Lankes slankes at fedoraproject.org
Sat Mar 28 18:12:18 UTC 2009


Author: slankes

Update of /cvs/pkgs/rpms/psi/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18812/F-9

Modified Files:
	psi.spec 
Added Files:
	psi-0.12-qt-4_5-compatibility.patch 
Log Message:
really add patch

psi-0.12-qt-4_5-compatibility.patch:

--- NEW FILE psi-0.12-qt-4_5-compatibility.patch ---
--- src/main.cpp.old	2009-02-14 21:52:12.000000000 +0500
+++ src/main.cpp	2009-02-14 21:54:42.000000000 +0500
@@ -274,9 +274,9 @@
 
 int main(int argc, char *argv[])
 {
+	PsiApplication app(argc, argv);
 	// it must be initialized first in order for ApplicationInfo::resourcesDir() to work
 	QCA::Initializer init;
-	PsiApplication app(argc, argv);
 	QApplication::addLibraryPath(ApplicationInfo::resourcesDir());
 	QApplication::addLibraryPath(ApplicationInfo::homeDir());
 	QApplication::setQuitOnLastWindowClosed(false);


Index: psi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-9/psi.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- psi.spec	3 Mar 2009 22:47:42 -0000	1.24
+++ psi.spec	28 Mar 2009 18:11:48 -0000	1.25
@@ -1,12 +1,13 @@
 Name:       psi
 Version:    0.12.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://psi-im.org
 Source0:    http://dl.sf.net/psi/psi-%{version}.tar.bz2
 Patch0:     psi-0.12-qca.patch
+Patch1:     psi-0.12-qt-4_5-compatibility.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,6 +69,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .qca
+%patch1 -p0 -b .qt45
 
 
 %build
@@ -141,6 +143,9 @@
 
 
 %changelog
+* Sat Mar 28 2009 Sven Lankes <sven at lank.es> 0.12.1-2
+- add patch for allow psi to work with Qt 4.5
+
 * Tue Mar 03 2009 Sven Lankes <sven at lank.es> 0.12.1-1
 - version 0.12.1
 




More information about the fedora-extras-commits mailing list