From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5B5DA1381F3 for ; Sat, 19 Oct 2013 18:44:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4D3EE09AF; Sat, 19 Oct 2013 18:44:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3996EE0A4F for ; Sat, 19 Oct 2013 18:44:22 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A3D233F3ED for ; Sat, 19 Oct 2013 18:44:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EEB7FE5308 for ; Sat, 19 Oct 2013 18:44:19 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1382208240.cfee184b068eb9507ee2d0770dc5b80fde4fe96b.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/, kde-misc/kdiff3/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-misc/kdiff3/files/kdiff3-build.patch kde-misc/kdiff3/kdiff3-9999.ebuild X-VCS-Directories: kde-misc/kdiff3/ kde-misc/kdiff3/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: cfee184b068eb9507ee2d0770dc5b80fde4fe96b X-VCS-Branch: master Date: Sat, 19 Oct 2013 18:44:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 23ec3a60-ac46-4d90-b64b-9eedb8166455 X-Archives-Hash: 3c83a0147201e9aaead232ed17ee925f commit: cfee184b068eb9507ee2d0770dc5b80fde4fe96b Author: Johannes Huber gentoo org> AuthorDate: Sat Oct 19 18:44:00 2013 +0000 Commit: Johannes Huber gentoo 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 + #include + #include ++#include ++#include + + + +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 + #include + #include ++#include + #include + + #include 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