mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
automoc: don't hang when CMake doesn't respond (patch from FreeBSD).
This commit is contained in:
@@ -4,9 +4,10 @@ CMake that generates lists of files to run MOC on. It's required for \
|
||||
building KDE."
|
||||
HOMEPAGE="https://techbase.kde.org/Development/Tools/Automoc4"
|
||||
SRC_URI="git+git://anongit.kde.org/automoc.git#afddb64aa0"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
LICENSE="BSD (2-clause)"
|
||||
COPYRIGHT="2007 Matthias Kretz"
|
||||
PATCHES="automoc-$portVersion.patch"
|
||||
|
||||
ARCHITECTURES="x86"
|
||||
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
|
||||
|
||||
25
dev-qt/automoc/patches/automoc-0.9.88.patch
Normal file
25
dev-qt/automoc/patches/automoc-0.9.88.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
From 9d0025fb6ed0fc31dd20d800ed3189f8bc82c0b1 Mon Sep 17 00:00:00 2001
|
||||
From: Augustin Cavalier <waddlesplash@gmail.com>
|
||||
Date: Thu, 17 Jul 2014 12:33:12 -0400
|
||||
Subject: [PATCH] Don't hang on CMake colored text output. From FreeBSD.
|
||||
|
||||
---
|
||||
kde4automoc.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kde4automoc.cpp b/kde4automoc.cpp
|
||||
index ae2cff4..a6a5634 100644
|
||||
--- a/kde4automoc.cpp
|
||||
+++ b/kde4automoc.cpp
|
||||
@@ -71,7 +71,7 @@ class AutoMoc
|
||||
QStringList args(cmakeEchoColorArgs);
|
||||
args << msg;
|
||||
cmakeEcho.start(cmakeExecutable, args, QIODevice::NotOpen);
|
||||
- cmakeEcho.waitForFinished(-1);
|
||||
+ cmakeEcho.waitForFinished(2000);
|
||||
}
|
||||
|
||||
QString builddir;
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
Reference in New Issue
Block a user