diff options
| author | Johannes Huber <johu@gentoo.org> | 2014-08-06 18:55:51 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2014-08-06 18:55:51 +0200 |
| commit | 25346e04f3c3b328aa32bfba97bef42cba4e1cb3 (patch) | |
| tree | 8259615f7387ee7029d42603720509e2e7164e63 | |
| parent | 95f2e4ae93a6a2862aa8f26ff72d9db0a509e835 (diff) | |
| download | kde-25346e04f3c3b328aa32bfba97bef42cba4e1cb3.tar.gz kde-25346e04f3c3b328aa32bfba97bef42cba4e1cb3.tar.bz2 kde-25346e04f3c3b328aa32bfba97bef42cba4e1cb3.zip | |
[kde-misc/kdiff3] Sync with tree
Package-Manager: portage-2.2.11-r1
| -rw-r--r-- | kde-misc/kdiff3/files/kdiff3-build.patch | 25 | ||||
| -rw-r--r-- | kde-misc/kdiff3/kdiff3-9999.ebuild | 9 |
2 files changed, 5 insertions, 29 deletions
diff --git a/kde-misc/kdiff3/files/kdiff3-build.patch b/kde-misc/kdiff3/files/kdiff3-build.patch deleted file mode 100644 index 14b7147c8cc..00000000000 --- a/kde-misc/kdiff3/files/kdiff3-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 f8ccf8c005d..cc8c4814e37 100644 --- a/kde-misc/kdiff3/kdiff3-9999.ebuild +++ b/kde-misc/kdiff3/kdiff3-9999.ebuild @@ -26,19 +26,20 @@ LICENSE="GPL-2" SLOT="4" IUSE="debug kde" -DEPEND=" +CDEPEND=" dev-qt/qtcore:4 dev-qt/qtgui:4 kde? ( $(add_kdebase_dep kdelibs) ) " -RDEPEND="${DEPEND} +DEPEND="${CDEPEND} + sys-devel/gettext +" +RDEPEND="${CDEPEND} sys-apps/diffutils " RESTRICT="!kde? ( test )" -PATCHES=( "${FILESDIR}/${PN}-build.patch" ) - src_unpack(){ if [[ ${PV} == *9999* ]]; then git-r3_src_unpack |