Skip to content
This repository has been archived by the owner on Dec 2, 2020. It is now read-only.

Commit

Permalink
Fix qt on mountain lion
Browse files Browse the repository at this point in the history
  • Loading branch information
dgoodlad committed May 21, 2014
1 parent 9b217e8 commit 0803a2e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
6 changes: 1 addition & 5 deletions files/brews/qt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class Qt < Formula
url "http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz"
sha1 "ddf9c20ca8309a116e0466c42984238009525da6"

version "4.8.6-boxen1"
version "4.8.6-boxen2"

bottle do
sha1 "114242a849d7ade7d55d46097b1f7790b871df8f" => :mavericks
Expand Down Expand Up @@ -35,10 +35,6 @@ def install
"-nomake", "demos", "-nomake", "examples",
"-cocoa", "-fast", "-release"]

# we have to disable these to avoid triggering optimization code
# that will fail in superenv (in --env=std, Qt seems aware of this)
args << "-no-3dnow" << "-no-ssse3" if superenv?

args << "-L#{MacOS::X11.lib}" << "-I#{MacOS::X11.include}" if MacOS::X11.installed?

if ENV.compiler == :clang
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}

package { 'boxen/brews/qt':
ensure => '4.8.6-boxen1',
ensure => '4.8.6-boxen2',
require => Class['xquartz'],
}
}
2 changes: 1 addition & 1 deletion spec/classes/qt_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
should include_class('xquartz')

should contain_homebrew__formula('qt')
should contain_package('boxen/brews/qt').with_ensure('4.8.6-boxen1')
should contain_package('boxen/brews/qt').with_ensure('4.8.6-boxen2')
end
end

0 comments on commit 0803a2e

Please sign in to comment.