aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Vandenberg2012-02-26 07:31:21 -0800
committerAdam Vandenberg2012-02-26 07:31:21 -0800
commit23ae23b003fe8f5edce9f90bef90caeacff6b33b (patch)
tree5201d0bbdfa8c3d667e06cf4eeec3dead65387f9
parent40346af256268b5a4799373ddbd35fd6c8da290b (diff)
downloadhomebrew-23ae23b003fe8f5edce9f90bef90caeacff6b33b.tar.bz2
Fix QT
Pathname.glob returns Pathnames, so is not interchangable with dir.
-rw-r--r--Library/Formula/qt.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
index 311e1d6d8..0aa45160c 100644
--- a/Library/Formula/qt.rb
+++ b/Library/Formula/qt.rb
@@ -25,11 +25,9 @@ class Qt < Formula
depends_on "d-bus" if ARGV.include? '--with-qtdbus'
depends_on 'sqlite' if MacOS.leopard?
+ # Fix compilation with llvm-gcc. Remove for 4.8.1.
def patches
- [
- # Fix compilation with llvm-gcc. Remove for 4.8.1.
- "https://qt.gitorious.org/qt/qt/commit/448ab7cd150ab7bb7d12bcac76bc2ce1c72298bd?format=patch"
- ]
+ "https://qt.gitorious.org/qt/qt/commit/448ab7cd150ab7bb7d12bcac76bc2ce1c72298bd?format=patch"
end
def install
@@ -105,7 +103,7 @@ class Qt < Formula
# The pkg-config files installed suggest that geaders can be found in the
# `include` directory. Make this so by creating symlinks from `include` to
# the Frameworks' Headers folders.
- Dir["#{lib}/*.framework/Headers"].each do |path|
+ Pathname.glob(lib + '*.framework/Headers').each do |path|
framework_name = File.basename(File.dirname(path), '.framework')
ln_s path.realpath, include+framework_name
end