[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/

["Johannes Huber" <johu@gentoo.org>]

commit:     cfee184b068eb9507ee2d0770dc5b80fde4fe96b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 19 18:44:00 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 18:44:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cfee184b

[kde-misc/kdiff3] Fix build.

Package-Manager: portage-2.2.7

---
 kde-misc/kdiff3/files/kdiff3-build.patch | 25 +++++++++++++++++++++++++
 kde-misc/kdiff3/kdiff3-9999.ebuild       |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/kde-misc/kdiff3/files/kdiff3-build.patch b/kde-misc/kdiff3/files/kdiff3-build.patch
new file mode 100644
index 0000000..14b7147
--- /dev/null
+++ b/kde-misc/kdiff3/files/kdiff3-build.patch
@@ -0,0 +1,25 @@
+diff --git a/kdiff3/src-QT4/difftextwindow.cpp b/kdiff3/src-QT4/difftextwindow.cpp
+index c2c0779..ee104a3 100644
+--- a/kdiff3/src-QT4/difftextwindow.cpp
++++ b/kdiff3/src-QT4/difftextwindow.cpp
+@@ -33,6 +33,8 @@
+ #include <QUrl>
+ #include <QMenu>
+ #include <QTextLayout>
++#include <QRunnable>
++#include <QThreadPool>
+ 
+ 
+ 
+diff --git a/kdiff3/src-QT4/progress.cpp b/kdiff3/src-QT4/progress.cpp
+index 9e585a3..88947db 100644
+--- a/kdiff3/src-QT4/progress.cpp
++++ b/kdiff3/src-QT4/progress.cpp
+@@ -15,6 +15,7 @@
+ #include <QPushButton>
+ #include <QLabel>
+ #include <QApplication>
++#include <QThread>
+ #include <kio/job.h>
+ 
+ #include <klocale.h>

diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index feafd7c..5c3eccc 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -37,6 +37,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT="!kde? ( test )"
 
+PATCHES=( "${FILESDIR}/${PN}-build.patch" )
+
 src_unpack(){
 	if [[ ${PV} == *9999* ]]; then
 		git-r3_src_unpack