[kdepim/f17] Resolves: #813257 - Ktimetracker shows only an empty window
Lukas Tinkl
ltinkl at fedoraproject.org
Fri Aug 17 13:01:15 UTC 2012
commit 16e7a44672b21c8721fb9ac63c5ec219742b4992
Author: Lukas Tinkl <lukas at kde.org>
Date: Fri Aug 17 15:01:09 2012 +0200
Resolves: #813257 - Ktimetracker shows only an empty window
..._rbb773366167af50fc99025473dc20ab5ab41e1cc.diff | 35 ++++++++++++++++++++
kdepim.spec | 9 ++++-
2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/changeset_rbb773366167af50fc99025473dc20ab5ab41e1cc.diff b/changeset_rbb773366167af50fc99025473dc20ab5ab41e1cc.diff
new file mode 100644
index 0000000..8edb633
--- /dev/null
+++ b/changeset_rbb773366167af50fc99025473dc20ab5ab41e1cc.diff
@@ -0,0 +1,35 @@
+commit bb773366167af50fc99025473dc20ab5ab41e1cc
+Author: Sergio Martins <iamsergio at gmail.com>
+Date: Wed Aug 15 13:01:48 2012 +0100
+
+ Make KTimeTracker start.
+
+ By using a dynamic_cast<> instead of a qobject_cast<>.
+
+ A proper fix would be fixing the CMakeLists.txt file:
+
+ ktimetrackerpart.cpp is defined twice, one in the ktimetracker
+ binary, and one in the plugin, this will make qobject_cast fail
+ somewhere in KPluginLoaded/KPluginFactory code.
+
+ I tried fixing CMakeLists.txt but it's not trivial, there's
+ a interdependency between stuff and couldn't get it to work with
+ the little time I have for it.
+
+ CCBUG: 285434
+ BUG: 283479
+ BUG: 291258
+
+diff --git a/ktimetracker/mainwindow.cpp b/ktimetracker/mainwindow.cpp
+index 1fcc98a..67e5c9f 100644
+--- a/ktimetracker/mainwindow.cpp
++++ b/ktimetracker/mainwindow.cpp
+@@ -65,7 +65,7 @@ MainWindow::MainWindow( const QString &icsfile )
+ {
+ // now that the Part is loaded, we cast it to a Part to get
+ // our hands on it
+- m_part = factory->create<ktimetrackerpart>( this );
++ m_part = dynamic_cast<ktimetrackerpart*>( factory->create<KParts::ReadWritePart>( this ) );
+
+ if (m_part)
+ {
diff --git a/kdepim.spec b/kdepim.spec
index 9ebaceb..f4a0386 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -2,7 +2,7 @@ Name: kdepim
Summary: KDE PIM (Personal Information Manager) applications
Epoch: 7
Version: 4.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Group: Applications/Productivity
@@ -23,6 +23,9 @@ Patch2: kdepim-4.7.2-kmail-migration.patch
## upstream patches
+# fix ktimetracker
+Patch100: changeset_rbb773366167af50fc99025473dc20ab5ab41e1cc.diff
+
Provides: kdepim4 = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -94,6 +97,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%patch0 -p1 -b .install-headers
%patch2 -p1 -b .kmail-migration
+%patch100 -p1 -b .ktimetracker
%build
@@ -218,6 +222,9 @@ rm -rf %{buildroot}
%changelog
+* Fri Aug 17 2012 Lukas Tinkl <ltinkl at redhat.com> - 7:4.8.5-2
+- Resolves: #813257 - Ktimetracker shows only an empty window
+
* Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 7:4.8.5-1
- 4.8.5
More information about the scm-commits
mailing list