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

Commit ffadee6

Browse files
author
Eebs Kobeissi
committed
bundle freetype 2.4.11 to fix GD conflict
1 parent 2514020 commit ffadee6

File tree

3 files changed

+40
-2
lines changed

3 files changed

+40
-2
lines changed

files/brews/freetype.rb

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
require 'formula'
2+
3+
class Freetype < Formula
4+
homepage 'http://www.freetype.org'
5+
url 'http://downloads.sf.net/project/freetype/freetype2/2.4.11/freetype-2.4.11.tar.gz'
6+
sha1 'a8373512281f74a53713904050e0d71c026bf5cf'
7+
8+
keg_only :provided_pre_mountain_lion
9+
10+
option :universal
11+
12+
bottle do
13+
# Included with X11 so no bottle needed before Mountain Lion.
14+
sha1 '7dc4747810e51beb99fd36c8f5baade6e65d19b7' => :mountain_lion
15+
end
16+
17+
def install
18+
ENV.universal_binary if build.universal?
19+
system "./configure", "--prefix=#{prefix}"
20+
system "make install"
21+
end
22+
23+
test do
24+
system "#{bin}/freetype-config", '--cflags', '--libs', '--ftversion',
25+
'--exec-prefix', '--prefix'
26+
end
27+
end

manifests/init.pp

+12-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
# Resolve dependencies
6363

6464
package { [
65-
'freetype',
6665
'gmp',
6766
'icu4c',
6867
'jpeg',
@@ -72,6 +71,18 @@
7271
provider => homebrew,
7372
}
7473

74+
# Install freetype version 2.4.11 due to conflict with GD
75+
# See https://github.com/boxen/puppet-php/issues/25
76+
77+
homebrew::formula { 'freetype':
78+
source => 'puppet:///modules/php/brews/freetype.rb',
79+
before => Package['boxen/brews/freetype'],
80+
}
81+
82+
package { 'boxen/brews/freetype':
83+
ensure => '2.4.11',
84+
}
85+
7586
# Need autoconf version less than 2.59 for php 5.3 (ewwwww)
7687

7788
homebrew::formula { 'autoconf213':

manifests/version.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
require => [
107107
Repository["${php::config::root}/php-src"],
108108
Package['gettext'],
109-
Package['freetype'],
109+
Package['boxen/brews/freetype'],
110110
Package['gmp'],
111111
Package['icu4c'],
112112
Package['jpeg'],

0 commit comments

Comments
 (0)