diff options
| author | Johannes Huber <johu@gentoo.org> | 2013-10-19 20:44:00 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2013-10-19 20:44:00 +0200 |
| commit | cfee184b068eb9507ee2d0770dc5b80fde4fe96b (patch) | |
| tree | b44571b81b9310d259d7c1a3d6b30efbb45b208a /kde-misc/kdiff3 | |
| parent | 12b8b6e2de80468f9a9f65d205d63775d12c57cb (diff) | |
| download | kde-cfee184b068eb9507ee2d0770dc5b80fde4fe96b.tar.gz kde-cfee184b068eb9507ee2d0770dc5b80fde4fe96b.tar.bz2 kde-cfee184b068eb9507ee2d0770dc5b80fde4fe96b.zip | |
[kde-misc/kdiff3] Fix build.
Package-Manager: portage-2.2.7
Diffstat (limited to 'kde-misc/kdiff3')
| -rw-r--r-- | kde-misc/kdiff3/files/kdiff3-build.patch | 25 | ||||
| -rw-r--r-- | kde-misc/kdiff3/kdiff3-9999.ebuild | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/kde-misc/kdiff3/files/kdiff3-build.patch b/kde-misc/kdiff3/files/kdiff3-build.patch new file mode 100644 index 00000000000..14b7147c8cc --- /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 feafd7c58aa..5c3eccc55a1 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 |
