diff options
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/automoc4.rb | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/Library/Formula/automoc4.rb b/Library/Formula/automoc4.rb index ee8c30298..e9ad3783f 100644 --- a/Library/Formula/automoc4.rb +++ b/Library/Formula/automoc4.rb @@ -12,4 +12,39 @@ class Automoc4 <Formula system "cmake . #{std_cmake_parameters}" system "make install" end + + def patches + { :p0 => DATA } + end end +__END__ +--- kde4automoc.cpp.old 2009-01-22 18:50:09.000000000 +0000 ++++ kde4automoc.cpp 2010-03-15 22:26:03.000000000 +0000 +@@ -175,16 +175,22 @@ + dotFilesCheck(line == "MOC_INCLUDES:\n"); + line = dotFiles.readLine().trimmed(); + const QStringList &incPaths = QString::fromUtf8(line).split(';', QString::SkipEmptyParts); ++ QSet<QString> frameworkPaths; + foreach (const QString &path, incPaths) { + Q_ASSERT(!path.isEmpty()); + mocIncludes << "-I" + path; ++ if (path.endsWith(".framework/Headers")) { ++ QDir framework(path); ++ // Go up twice to get to the framework root ++ framework.cdUp(); ++ framework.cdUp(); ++ frameworkPaths << framework.path(); ++ } + } + +- // on the Mac, add -F always, otherwise headers in the frameworks won't be found +- // is it necessary to do this only optionally ? Alex +-#ifdef Q_OS_MAC +- mocIncludes << "-F/Library/Frameworks"; +-#endif ++ foreach (const QString &path, frameworkPaths) { ++ mocIncludes << "-F" << path; ++ } + + line = dotFiles.readLine(); + dotFilesCheck(line == "CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE:\n"); |
