rpms/kdepim/devel kdepim-4.3.80-qt-4.6-crash.patch, NONE, 1.1 kdepim.spec, 1.250, 1.251 kdepim-4.3.75-build-kalarm.patch, 1.1, NONE

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21248

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.80-qt-4.6-crash.patch 
Removed Files:
	kdepim-4.3.75-build-kalarm.patch 
Log Message:
apply upstream patch to fix crash in Kontact+KOrganizer with Qt4.6



kdepim-4.3.80-qt-4.6-crash.patch:
 monthscene.cpp |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE kdepim-4.3.80-qt-4.6-crash.patch ---
diff -up kdepim-4.3.80/korganizer/views/monthview/monthscene.cpp.orig kdepim-4.3.80/korganizer/views/monthview/monthscene.cpp
--- kdepim-4.3.80/korganizer/views/monthview/monthscene.cpp.orig	2009-12-09 16:26:08.000000000 +0100
+++ kdepim-4.3.80/korganizer/views/monthview/monthscene.cpp	2009-12-09 16:26:52.000000000 +0100
@@ -64,6 +64,8 @@ MonthScene::MonthScene( MonthView *paren
   mReadonlyPixmap  = KOGlobals::self()->smallIcon( "object-locked" );
   mReplyPixmap     = KOGlobals::self()->smallIcon( "mail-reply-sender" );
   mHolidayPixmap   = KOGlobals::self()->smallIcon( "view-calendar-holiday" );
+
+  setSceneRect( 0, 0, parent->width(), parent->height() );
 }
 
 MonthScene::~MonthScene()


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- kdepim.spec	8 Dec 2009 21:29:24 -0000	1.250
+++ kdepim.spec	9 Dec 2009 15:19:58 -0000	1.251
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.80
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -20,9 +20,11 @@ Patch1:  kdepim-4.3.1-kmail-saveAttachme
 # add -fno-var-tracking-assignments for kmail/globalsettings_base.cpp (#538233)
 Patch2:  kdepim-4.3.3-kmail_globalsettings_no_var_tracking.patch 
 Patch3:  kdepim-4.3.75-desktop-fixes.patch
-Patch4:  kdepim-4.3.75-build-kalarm.patch
 
-# upstream patches (4.3 branch):
+# upstream patches (4.4 branch):
+
+# upstream patches (trunk)
+Patch200: kdepim-4.3.80-qt-4.6-crash.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -102,8 +104,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %patch1 -p0 -b .kmail-saveAttachments
 %patch2 -p1 -b .kmail_globalsettings_no_var_tracking
 %patch3 -p1 -b .desktop-fixes
-%patch4 -p0 -b .build-kalarm
 
+%patch200 -p1 -b .qt4.6-crash
 
 %build
 mkdir -p %{_target_platform}
@@ -227,6 +229,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 09 2009 Than Ngo <than at redhat.com> - 4.3.80-4
+- apply upstream patch to fix crash in Kontact+KOrganizer with Qt4.6
+
 * Tue Dec  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 4.3.80-3
 - Explicitly BR libassuan-static in accordance with the Packaging
   Guidelines (libassuan-devel is still static-only).


--- kdepim-4.3.75-build-kalarm.patch DELETED ---