rpms/blokkal/devel blokkal-1.2_qt47-fix.patch, NONE, 1.1 blokkal.spec, 1.3, 1.4

thomasj thomasj at fedoraproject.org
Fri Jul 2 07:17:31 UTC 2010


Author: thomasj

Update of /cvs/pkgs/rpms/blokkal/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1753

Modified Files:
	blokkal.spec 
Added Files:
	blokkal-1.2_qt47-fix.patch 
Log Message:
added qt47 patch

blokkal-1.2_qt47-fix.patch:
 accountwizard.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE blokkal-1.2_qt47-fix.patch ---
--- src/core/config/accountwizard.cpp	2009-10-23 17:16:07.000000000 +0200
+++ src/core/config/accountwizard.cpp.old	2010-07-02 09:10:56.000000000 +0200
@@ -46,8 +46,8 @@
 
 BlokkalAccountWizard::BlokkalAccountWizard( QWidget *parent ) :
 KAssistantDialog( parent ),
-m_editAccountPage( 0 ),
-m_accountName( 0 ),
+m_editAccountPage(),
+m_accountName(),
 m_fetcher( new RsdDataFetcher( this ) )
 {
 	setWindowTitle( i18n( "Add Account" ) );


Index: blokkal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blokkal/devel/blokkal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- blokkal.spec	3 Jun 2010 16:10:40 -0000	1.3
+++ blokkal.spec	2 Jul 2010 07:17:31 -0000	1.4
@@ -12,6 +12,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 ## Upstreamable patches
 # Fix DSO patch
 patch10:	blokkal-0.1.2-DSO-fix.patch
+patch20:	blokkal-1.2_qt47-fix.patch
 
 BuildRequires:	kdepimlibs-devel
 BuildRequires:	gettext
@@ -57,6 +58,7 @@ Blokkal libraries
 %prep
 %setup -q -n Blokkal-%{version}
 %patch10 -p0
+%patch20 -p0
 
 %build
 mkdir -p %{_target_platform}
@@ -128,7 +130,7 @@ update-mime-database %{_kde4_datadir}/mi
 
 %changelog
 * Thu Jun 03 2010 Thomas Janssen <thomasj at fedoraproject.org> 0.1.2-2
-- test build
+- fix to build blokkal with qt47
 
 * Sun Feb 14 2010 Thomas Janssen <thomasj at fedoraproject.org> 0.1.2-1%{?dist}.1
 - fix DSO



More information about the scm-commits mailing list