[kte-collaborative/f18] Fix build against KDE 4.10
Daniel Vrátil
dvratil at fedoraproject.org
Thu Aug 29 16:14:01 UTC 2013
commit 39ebaf7322c1d0df77626cb8c2ad5451a8abdbdd
Author: Dan Vrátil <dvratil at redhat.com>
Date: Thu Aug 29 18:10:02 2013 +0200
Fix build against KDE 4.10
kte-collaborative-fix-kde-410-build.patch | 12 ++++++++++++
kte-collaborative.spec | 3 +++
2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/kte-collaborative-fix-kde-410-build.patch b/kte-collaborative-fix-kde-410-build.patch
new file mode 100644
index 0000000..e29a25e
--- /dev/null
+++ b/kte-collaborative-fix-kde-410-build.patch
@@ -0,0 +1,12 @@
+diff --git a/kte-plugin/ui/sharedocumentdialog.cpp b/kte-plugin/ui/sharedocumentdialog.cpp
+index 3303339..5166dff 100644
+--- a/kte-plugin/ui/sharedocumentdialog.cpp
++++ b/kte-plugin/ui/sharedocumentdialog.cpp
+@@ -53,7 +53,6 @@ ShareDocumentDialog::ShareDocumentDialog(KTextEditor::View* activeView)
+ infobox->setCloseButtonVisible(false);
+ infobox->setMessageType(KMessageWidget::Information);
+ infobox->setWordWrap(true);
+- infobox->setIcon(KIcon("help-about"));
+ infobox->setText(i18n("<p>You can select a contact or chatroom to share this document with below.</p>"
+ "<p>Since each such connection to a contact or chatroom can contain "
+ "an arbitrary number of documents, you can also add this document "
diff --git a/kte-collaborative.spec b/kte-collaborative.spec
index def1164..7bee68f 100644
--- a/kte-collaborative.spec
+++ b/kte-collaborative.spec
@@ -10,6 +10,7 @@ URL: https://projects.kde.org/projects/playground/network/kte-collabo
Source0: http://download.kde.org/unstable/%{name}/%{version}/src/%{name}-%{version}.tar.xz
Patch0: kte-collaborative-versioned-sonames.patch
+Patch1: kte-collaborative-fix-kde-410-build.patch
BuildRequires: cmake
BuildRequires: kdelibs-devel
@@ -30,6 +31,7 @@ A plugin for KTextEditor which allows to edit text documents collaboratively
%setup -q
%patch0 -p1 -b .sonames
+%patch1 -p1 -b .kde410
%build
mkdir -p %{_target_platform}
@@ -59,6 +61,7 @@ rm %{buildroot}/%{_kde4_libdir}/*.so
%changelog
* Thu Aug 29 2013 Daniel Vrátil <dvratil at redhat.com> 0.0.95-5
- add missing BR
+ - fix build against KDE 4.10
* Wed Aug 28 2013 Daniel Vrátil <dvratil at redhat.com> 0.0.95-4
- versioned sonames (backported an upstream patch)
More information about the scm-commits
mailing list