aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorMike McQuaid2014-01-09 20:12:27 +0000
committerMike McQuaid2014-01-09 20:15:21 +0000
commit221e28364c4372da163088adfdd883fb19950c5c (patch)
tree716255699a8d7b9c8585e2b7520e2fdda8149327 /Library/Formula
parente9967cb2deb8c1da5b2535fcf88c266066fa3758 (diff)
downloadhomebrew-221e28364c4372da163088adfdd883fb19950c5c.tar.bz2
phantomjs: use upstreamed patch instead of inline.
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/phantomjs.rb23
1 files changed, 1 insertions, 22 deletions
diff --git a/Library/Formula/phantomjs.rb b/Library/Formula/phantomjs.rb
index 5fd2554c6..dcea2b38f 100644
--- a/Library/Formula/phantomjs.rb
+++ b/Library/Formula/phantomjs.rb
@@ -15,7 +15,7 @@ class Phantomjs < Formula
def patches
[
- DATA,
+ 'https://github.com/ariya/phantomjs/commit/fe6a96.patch',
'https://github.com/ariya/phantomjs/commit/b67866.patch',
]
end
@@ -31,24 +31,3 @@ class Phantomjs < Formula
(share+'phantomjs').install 'examples'
end
end
-__END__
-diff --git a/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h
-index c068234..90d2ca0 100644
---- a/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h
-+++ b/src/qt/src/gui/kernel/qt_cocoa_helpers_mac_p.h
-@@ -110,6 +110,7 @@
- #include "private/qt_mac_p.h"
-
- struct HIContentBorderMetrics;
-+struct TabletProximityRec;
-
- #ifdef Q_WS_MAC32
- typedef struct _NSPoint NSPoint; // Just redefine here so I don't have to pull in all of Cocoa.
-@@ -155,7 +156,6 @@ bool qt_dispatchKeyEvent(void * /*NSEvent * */ keyEvent, QWidget *widgetToGetEve
- void qt_dispatchModifiersChanged(void * /*NSEvent * */flagsChangedEvent, QWidget *widgetToGetEvent);
- bool qt_mac_handleTabletEvent(void * /*QCocoaView * */view, void * /*NSEvent * */event);
- inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreApplication::instance()); }
--struct ::TabletProximityRec;
- void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec);
- Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags);
- Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations);