From 57496116c6ae8bc892c9300f05347fb47a5a8439 Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Fri, 27 Jan 2012 00:49:53 -0800 Subject: [PATCH] DiffPDF: Update to 1.8.0 --- Formula/diffpdf.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Formula/diffpdf.rb b/Formula/diffpdf.rb index d92592f81d..98eba8fe15 100644 --- a/Formula/diffpdf.rb +++ b/Formula/diffpdf.rb @@ -7,8 +7,8 @@ end class Diffpdf < Formula homepage 'http://www.qtrac.eu/diffpdf.html' - url 'http://www.qtrac.eu/diffpdf-1.2.2.tar.gz' - md5 '1c35151d9216e2225aa921e1faef91ca' + url 'http://www.qtrac.eu/diffpdf-1.8.0.tar.gz' + md5 'bfede6ebd3cc4993c50aec5b90628807' depends_on 'qt' depends_on 'poppler' @@ -44,18 +44,18 @@ The location of Poppler library/include paths 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..0f9618f 100644 +index 1566ed7..7d37a3d 100644 --- a/diffpdf.pro +++ b/diffpdf.pro -@@ -8,15 +8,5 @@ HEADERS += sequence_matcher.hpp +@@ -17,15 +17,6 @@ HEADERS += sequence_matcher.hpp SOURCES += sequence_matcher.cpp SOURCES += main.cpp RESOURCES += resources.qrc -LIBS += -lpoppler-qt4 --exists($(HOME)/opt/poppler016/) { +-exists($(HOME)/opt/poppler018/) { - 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 +- INCLUDEPATH += $(HOME)/opt/poppler018/include/poppler/qt4 +- LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler018/lib -Wl,-L$(HOME)/opt/poppler018/lib -} else { - exists(/usr/include/poppler/qt4) { - INCLUDEPATH += /usr/include/poppler/qt4 @@ -63,5 +63,6 @@ index d561963..0f9618f 100644 - INCLUDEPATH += /usr/local/include/poppler/qt4 - } -} -+LIBS += -L$$quote(HOMEBREW_PREFIX/lib) -lpoppler-qt4 ++ ++LIBS += -L$$quote(HOMEBREW_PREFIX/lib) -lpoppler-qt4 +INCLUDEPATH += $$quote(HOMEBREW_PREFIX/include/poppler/qt4)