diff options
| author | adam <adam@pkgsrc.org> | 2013-05-19 09:10:10 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2013-05-19 09:10:10 +0000 |
| commit | 4194063703c0816bdaf9ec08b7889476af7b18fb (patch) | |
| tree | 926f3bff8ee7270901aee7927c678068ec742de5 /x11/qt4-libs | |
| parent | fa6364ebf54d6101dfae10c39afa8a75c57dc598 (diff) | |
| download | pkgsrc-4194063703c0816bdaf9ec08b7889476af7b18fb.tar.gz | |
Fix building on Mac OS X with Xcode 4.6
Diffstat (limited to 'x11/qt4-libs')
| -rw-r--r-- | x11/qt4-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 29b2fc03885..7133ebc87cb 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.85 2013/05/09 14:07:08 joerg Exp $ +$NetBSD: distinfo,v 1.86 2013/05/19 09:10:10 adam Exp $ SHA1 (qt-everywhere-opensource-src-4.8.4.tar.gz) = f5880f11c139d7d8d01ecb8d874535f7d9553198 RMD160 (qt-everywhere-opensource-src-4.8.4.tar.gz) = 3c09a3b1411385d0917225f01ac2ff3a2ce83fda @@ -75,5 +75,6 @@ SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268 SHA1 (patch-src_corelib_tools_qiterator.h) = 40c4807719e6555a40f6a738330ad5037d6c80ad SHA1 (patch-src_declarative_util_qdeclarativefontloader.cpp) = 0bb76eac102a4325cadb5bcb4e7a1ac85a3d099f +SHA1 (patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h) = 84d356628d764797524fe72139ea6829a33524ea SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 3ad682b86d2e9bd2b282caa298508dc3e9dd8566 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80 diff --git a/x11/qt4-libs/patches/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h b/x11/qt4-libs/patches/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h new file mode 100644 index 00000000000..72dbd1b98fb --- /dev/null +++ b/x11/qt4-libs/patches/patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_gui_kernel_qt_cocoa_helpers_mac_p.h,v 1.1 2013/05/19 09:10:10 adam Exp $ + +Fix building on Mac OS X. + +--- src/gui/kernel/qt_cocoa_helpers_mac_p.h.orig 2013-05-19 08:02:18.000000000 +0000 ++++ src/gui/kernel/qt_cocoa_helpers_mac_p.h +@@ -155,7 +155,7 @@ bool qt_dispatchKeyEvent(void * /*NSEven + 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; ++struct TabletProximityRec; + void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec); + Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags); + Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations); |