diff options
| author | joerg <joerg@pkgsrc.org> | 2015-12-23 12:40:37 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-12-23 12:40:37 +0000 |
| commit | 9882cf4eaea01eb2ada818f0702beb918b736a29 (patch) | |
| tree | 7c80a0f65d8d8515714429ea5bda3b133c4a7b82 | |
| parent | 3f443e7cd48f21db4687b2f7a14df345d394d984 (diff) | |
| download | pkgsrc-9882cf4eaea01eb2ada818f0702beb918b736a29.tar.gz | |
Fix macro conflict between X and Qt5 header. Drop cmake file no longer
installed.
| -rw-r--r-- | inputmethod/qt5-uim/PLIST | 3 | ||||
| -rw-r--r-- | inputmethod/qt5-uim/distinfo | 3 | ||||
| -rw-r--r-- | inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.h | 12 |
3 files changed, 15 insertions, 3 deletions
diff --git a/inputmethod/qt5-uim/PLIST b/inputmethod/qt5-uim/PLIST index 5d8f0f76079..b6f605b93c7 100644 --- a/inputmethod/qt5-uim/PLIST +++ b/inputmethod/qt5-uim/PLIST @@ -1,3 +1,2 @@ -@comment $NetBSD: PLIST,v 1.2 2015/01/25 13:10:19 joerg Exp $ -qt5/lib/cmake/Qt5Gui/Qt5Gui_.cmake +@comment $NetBSD: PLIST,v 1.3 2015/12/23 12:40:37 joerg Exp $ qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.la diff --git a/inputmethod/qt5-uim/distinfo b/inputmethod/qt5-uim/distinfo index d00bc6767a7..664a2e431d7 100644 --- a/inputmethod/qt5-uim/distinfo +++ b/inputmethod/qt5-uim/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2015/11/03 22:13:38 agc Exp $ +$NetBSD: distinfo,v 1.4 2015/12/23 12:40:37 joerg Exp $ SHA1 (uim-1.8.6.tar.bz2) = 43b9dbdead6797880e6cfc9c032ecb2d37d42777 RMD160 (uim-1.8.6.tar.bz2) = 5f94218d82475ac463534ec681769f34547e5707 @@ -11,4 +11,5 @@ Size (uim-1.8.7pre1.tar.gz) = 5821262 bytes SHA1 (patch-Makefile.in) = 15f8a9adbc7f7b7d3307630f2adb9cffdc4c524f SHA1 (patch-qt4_common.pro.in) = 4c1f24d0301cd9d2bd05fdbdd92c82096de7c3c1 SHA1 (patch-qt4_immodule_plugin.cpp) = d7ec1c6f49cd9993e86b89537b1b48d6b4ba42d7 +SHA1 (patch-qt4_immodule_plugin.h) = 395f320deebc4b5aa8721e4e69cd2cc3aaeffd9d SHA1 (patch-qt5_immodule_quimplatforminputcontextplugin.pro.in) = 63bbf7057b61df14a52430e8c12b9bb9b3d69096 diff --git a/inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.h b/inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.h new file mode 100644 index 00000000000..e38d8556ec9 --- /dev/null +++ b/inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.h @@ -0,0 +1,12 @@ +$NetBSD: patch-qt4_immodule_plugin.h,v 1.1 2015/12/23 12:40:37 joerg Exp $ + +--- qt4/immodule/plugin.h.orig 2015-12-22 23:30:50.000000000 +0000 ++++ qt4/immodule/plugin.h +@@ -38,6 +38,7 @@ + #if QT_VERSION < 0x050000 + # include <QtGui/QInputContextPlugin> + #else ++# include <QtCore/qdatastream.h> + # include <qpa/qplatforminputcontextplugin_p.h> + #endif + |