diff options
| author | Charlie Sharpsteen | 2011-05-28 10:42:13 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2011-06-04 17:03:23 -0700 |
| commit | c7c44ab78716b8cfb656dd21acd621cb14605d1c (patch) | |
| tree | f9116b1e2fc685a9db4957b96b4d0ffca159e1a0 | |
| parent | c3aafb91f95003386c2a65d9ac0a92addd4ae457 (diff) | |
| download | homebrew-c7c44ab78716b8cfb656dd21acd621cb14605d1c.tar.bz2 | |
Poppler: use ENV.x11 instead of a patch
Adding paths to `/usr/X11` through ENV.x11 allows Poppler's configure script to
find Fontconfig without resorting to patching `Makefile.in`.
Tested on OS X 10.5.x and 10.6.x
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
| -rw-r--r-- | Library/Formula/poppler.rb | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb index 1238eaeb6..79f8e4f81 100644 --- a/Library/Formula/poppler.rb +++ b/Library/Formula/poppler.rb @@ -13,10 +13,6 @@ class Poppler < Formula depends_on 'pkg-config' => :build depends_on "qt" if ARGV.include? "--with-qt4" - def patches - DATA - end - def options [ ["--with-qt4", "Include Qt4 support (which compiles all of Qt4!)"], @@ -25,6 +21,8 @@ class Poppler < Formula end def install + ENV.x11 # For Fontconfig headers + if ARGV.include? "--with-qt4" ENV['POPPLER_QT4_CFLAGS'] = `pkg-config QtCore QtGui --libs`.chomp.strip ENV.append 'LDFLAGS', "-Wl,-F#{HOMEBREW_PREFIX}/lib" @@ -43,20 +41,3 @@ class Poppler < Formula end end end - -__END__ -fix location of fontconfig: - http://www.mail-archive.com/poppler@lists.freedesktop.org/msg03837.html - ---- a/cpp/Makefile.in 2010-07-08 20:57:56.000000000 +0200 -+++ b/cpp/Makefile.in 2010-08-06 11:11:27.000000000 +0200 -@@ -375,7 +375,8 @@ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/goo \ -- -I$(top_srcdir)/poppler -+ -I$(top_srcdir)/poppler \ -+ $(FONTCONFIG_CFLAGS) - - SUBDIRS = . tests - poppler_includedir = $(includedir)/poppler/cpp |