wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

imagemagick: default to not depending on freetype, x11.

Browse source 
freetype will be default when I bottle it in the next few days but
until then this just adds an extra unbottled dependency to the
bottle which won't be used anyway.

X11 should default to being off on everything; it's not around by
default on Lion or Mountain Lion and in this case it breaks the
bottle to depend on it.

References Homebrew/homebrew#14714, Homebrew/homebrew#14948.
This commit is contained in:
Mike McQuaid 2012-09-16 21:38:28 -07:00
parent 05c756124a
commit b3bef557b5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Formula/imagemagick.rb
View file

@ -34,15 +34,15 @@ class Imagemagick < Formula
option 'with-quantum-depth-8', 'Compile with a quantum depth of 8 bit'
option 'with-quantum-depth-16', 'Compile with a quantum depth of 16 bit'
option 'with-quantum-depth-32', 'Compile with a quantum depth of 32 bit'
option 'without-x', 'Compile without x11'
option 'without-freetype', 'Compile without freetype'
option 'with-x', 'Compile with x11'
option 'with-freetype', 'Compile with freetype'
depends_on 'pkg-config' => :build
depends_on 'jpeg' => :recommended
depends_on :libpng
depends_on :x11 unless build.include? 'without-x'
depends_on :freetype unless build.include? 'without-freetype'
depends_on :x11 if build.include? 'with-x'
depends_on :freetype if build.include? 'with-freetype'
depends_on 'ghostscript' => :optional if ghostscript_srsly?
@ -98,8 +98,8 @@ class Imagemagick < Formula
args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth
args << "--with-rsvg" if build.include? 'use-rsvg'
args << "--without-x" if build.include? 'without-x'
args << "--with-freetype=yes" unless build.include? 'without-freetype'
args << "--without-x" unless build.include? 'with-x'
args << "--with-freetype=yes" if build.include? 'with-freetype'
# versioned stuff in main tree is pointless for us
inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}'