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

Cleanup Poppler formula

Browse source 
Consolidate `pkg-config` query into one command. Add Homebrew lib directory to
LDFLAGS so that Qt Frameworks can be found on 10.5.0 where
`libtool` strips the `-F` flag unless it is preceded by `-Wl`.

Move patch explanation into the patch.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
Charlie Sharpsteen 2011-05-18 09:38:12 -07:00 committed by Adam Vandenberg
parent 006f910865
commit e98006137a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Formula/poppler.rb
View file

@ -26,9 +26,8 @@ class Poppler < Formula
def install
if ARGV.include? "--with-qt4"
qt4Flags = `pkg-config QtCore --libs` + `pkg-config QtGui --libs`
qt4Flags.gsub!("\n","")
ENV['POPPLER_QT4_CFLAGS'] = qt4Flags
ENV['POPPLER_QT4_CFLAGS'] = `pkg-config QtCore QtGui --libs`.chomp.strip
ENV.append 'LDFLAGS', "-Wl,-F#{HOMEBREW_PREFIX}/lib"
end
args = ["--disable-dependency-tracking", "--prefix=#{prefix}"]
@ -45,8 +44,10 @@ class Poppler < Formula
end
end
# fix location of fontconfig, http://www.mail-archive.com/poppler@lists.freedesktop.org/msg03837.html
__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 @@