Permalink
Browse files

qt, qt5: don't depend on png, jpeg.

Closes Homebrew/legacy-homebrew#21255.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
  • Loading branch information...
MikeMcQuaid committed Jul 17, 2013
1 parent 505ed07 commit d3f7250ff73a24ff256be861d69e0b5c6ba8154e
Showing with 2 additions and 8 deletions.
  1. +1 −3 Formula/qt.rb
  2. +1 −5 Formula/qt5.rb
View
@@ -21,16 +21,14 @@ class Qt < Formula
option 'with-debug-and-release', 'Compile Qt in debug and release mode'
option 'developer', 'Compile and link Qt with developer options'
depends_on :libpng
depends_on "d-bus" if build.with? 'qtdbus'
depends_on "mysql" => :optional
def install
ENV.append "CXXFLAGS", "-fvisibility=hidden"
args = ["-prefix", prefix,
"-system-libpng", "-system-zlib",
"-system-zlib",
"-confirm-license", "-opensource",
"-cocoa", "-fast" ]
View
@@ -16,23 +16,19 @@ class Qt5 < Formula
option 'with-mysql', 'Enable MySQL plugin'
option 'developer', 'Compile and link Qt with developer options'
depends_on :libpng
depends_on "d-bus" if build.include? 'with-qtdbus'
depends_on "mysql" => :optional
depends_on "jpeg"
def install
args = ["-prefix", prefix,
"-system-libpng", "-system-zlib",
"-system-zlib",
"-confirm-license", "-opensource"]
unless MacOS::CLT.installed?
# ... too stupid to find CFNumber.h, so we give a hint:
ENV.append 'CXXFLAGS', "-I#{MacOS.sdk_path}/System/Library/Frameworks/CoreFoundation.framework/Headers"
end
args << "-L#{Formula.factory('jpeg').opt_prefix}/lib" << "-I#{Formula.factory('jpeg').opt_prefix}/include"
args << "-L#{MacOS::X11.prefix}/lib" << "-I#{MacOS::X11.prefix}/include" if MacOS::X11.installed?
args << "-plugin-sql-mysql" if build.with? 'mysql'

0 comments on commit d3f7250

Please sign in to comment.