rpms/kdepimlibs/devel fix-invitations.diff, NONE, 1.1 kdepimlibs.spec, 1.47, 1.48
Rex Dieter
rdieter at fedoraproject.org
Fri Sep 5 14:43:41 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/kdepimlibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15355
Modified Files:
kdepimlibs.spec
Added Files:
fix-invitations.diff
Log Message:
* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
- invitations crasher/regression (kde #170203)
fix-invitations.diff:
--- NEW FILE fix-invitations.diff ---
--- branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp 2008/09/03 18:28:53 856767
+++ branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp 2008/09/03 18:33:54 856768
@@ -1132,6 +1132,9 @@
IncidenceCompareVisitor() : mExistingIncidence( 0 ) {}
bool act( IncidenceBase *incidence, Incidence *existingIncidence )
{
+ if (!existingIncidence) {
+ return false;
+ }
Incidence *inc = dynamic_cast<Incidence *>( incidence );
if ( inc && inc->revision() <= existingIncidence->revision() ) {
return false;
Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/devel/kdepimlibs.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- kdepimlibs.spec 29 Aug 2008 16:08:20 -0000 1.47
+++ kdepimlibs.spec 5 Sep 2008 14:43:10 -0000 1.48
@@ -14,7 +14,7 @@
Name: kdepimlibs
Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: K Desktop Environment 4 - PIM Libraries
License: LGPLv2
@@ -40,6 +40,10 @@
# pulling in phonon-backend-xine
#BuildRequires: phonon-backend-gstreamer
+## upstream patches
+# http://bugs.kde.org/170203
+Patch100: fix-invitations.diff
+
%if 0%{?apidocs}
BuildRequires: doxygen
BuildRequires: graphviz
@@ -75,6 +79,8 @@
%prep
%setup -q -n kdepimlibs-%{version}
+%patch100 -p4 -b .invitations
+
%build
@@ -165,6 +171,9 @@
%changelog
+* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
+- invitations crasher/regression (kde #170203)
+
* Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
- 4.1.1
More information about the scm-commits
mailing list