rpms/koffice/devel koffice-2.1.91-kde#235345.patch, NONE, 1.1 koffice.spec, 1.164, 1.165
Kevin Kofler
kkofler at fedoraproject.org
Wed May 12 11:03:26 UTC 2010
Author: kkofler
Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32338/devel
Modified Files:
koffice.spec
Added Files:
koffice-2.1.91-kde#235345.patch
Log Message:
* Wed May 12 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:2.1.91-4
- apply upstream workaround for KWord crash on exit (kde#235345)
koffice-2.1.91-kde#235345.patch:
KoToolBase_p.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE koffice-2.1.91-kde#235345.patch ---
Index: koffice/libs/flake/KoToolBase_p.h
===================================================================
--- koffice/libs/flake/KoToolBase_p.h (revision 1125745)
+++ koffice/libs/flake/KoToolBase_p.h (revision 1125746)
@@ -42,7 +42,7 @@
~KoToolBasePrivate()
{
- qDeleteAll(optionWidgets);
+ //qDeleteAll(optionWidgets); // disabled means Mem leak, but no crash...
}
QMap<QString, QWidget *> optionWidgets; ///< the optionwidgets associated witth this tool
Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- koffice.spec 4 May 2010 19:13:46 -0000 1.164
+++ koffice.spec 12 May 2010 11:03:24 -0000 1.165
@@ -21,7 +21,7 @@
Name: koffice
Epoch: 3
Version: 2.1.91
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An integrated office suite
Group: Applications/Productivity
@@ -29,6 +29,9 @@ Group: Applications/Productivit
License: GPLv2+
URL: http://www.koffice.org/
Source0: http://download.kde.org/unstable/koffice-%{version}/koffice-%{version}.tar.bz2
+# don't crash on exit in at least KWord (kde#235345)
+# (workaround from upstream 2.2 branch revision 1125746)
+Patch100: koffice-2.1.91-kde#235345.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstreamable patches
@@ -455,6 +458,7 @@ Requires: libxml2-devel
%prep
%setup -q
+%patch100 -p1 -b .kde#235345
## kdchart munging begin
pushd kchart/kdchart
@@ -1130,6 +1134,9 @@ fi
%changelog
+* Wed May 12 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3:2.1.91-4
+- apply upstream workaround for KWord crash on exit (kde#235345)
+
* Tue May 04 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.91-3
- rebuild (poppler)
More information about the scm-commits
mailing list