diff options
| author | Charlie Sharpsteen | 2011-10-04 23:37:40 -0700 |
|---|---|---|
| committer | Charlie Sharpsteen | 2011-10-04 23:38:14 -0700 |
| commit | 2840cc1eed9449366bb9750ef5ec0057b59c2a1b (patch) | |
| tree | ef22853726b896cb4ab7e89240e1276b2beb60ec /Library/Formula/diffpdf.rb | |
| parent | f7f7222561f1bc96fcd4dcc0769d0fe39e26ebdf (diff) | |
| download | homebrew-2840cc1eed9449366bb9750ef5ec0057b59c2a1b.tar.bz2 | |
DiffPDF: Fix header include path
Fixes #7975.
Diffstat (limited to 'Library/Formula/diffpdf.rb')
| -rw-r--r-- | Library/Formula/diffpdf.rb | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/Library/Formula/diffpdf.rb b/Library/Formula/diffpdf.rb index 1a1b19168..f0ea3bbea 100644 --- a/Library/Formula/diffpdf.rb +++ b/Library/Formula/diffpdf.rb @@ -13,6 +13,11 @@ class Diffpdf < Formula depends_on 'qt' depends_on 'poppler' + def patches + # Fix header include path. + DATA + end + def install if poppler_has_qt4? # Generate makefile and disable .app creation @@ -32,3 +37,29 @@ class Diffpdf < Formula end end end + +__END__ + +The location of Poppler includes is hardcoded in the project file which causes +builds to fail if Homebrew is not installed to /usr/local. + +diff --git a/diffpdf.pro b/diffpdf.pro +index d561963..530d3d5 100644 +--- a/diffpdf.pro ++++ b/diffpdf.pro +@@ -9,14 +9,4 @@ SOURCES += sequence_matcher.cpp + SOURCES += main.cpp + RESOURCES += resources.qrc + LIBS += -lpoppler-qt4 +-exists($(HOME)/opt/poppler016/) { +- message(Using locally built Poppler library) +- INCLUDEPATH += $(HOME)/opt/poppler016/include/poppler/qt4 +- LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler016/lib -Wl,-L$(HOME)/opt/poppler016/lib +-} else { +- exists(/usr/include/poppler/qt4) { +- INCLUDEPATH += /usr/include/poppler/qt4 +- } else { +- INCLUDEPATH += /usr/local/include/poppler/qt4 +- } +-} ++INCLUDEPATH += HOMEBREW_PREFIX/include/poppler/qt4 |