kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix macro conflict between X and Qt5 header. Drop cmake file no longer

Browse source 
installed.
This commit is contained in:
joerg 2015-12-23 12:40:37 +00:00
parent debdae9ef8
commit 77a9e9223e
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
inputmethod/qt5-uim/PLIST
View file

@ -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

3
inputmethod/qt5-uim/distinfo
View file

@ -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

12
inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.h Normal file
View file

@ -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