diff options
-rw-r--r-- | inputmethod/qt5-uim/Makefile | 9 | ||||
-rw-r--r-- | inputmethod/qt5-uim/PLIST | 4 | ||||
-rw-r--r-- | inputmethod/qt5-uim/distinfo | 4 | ||||
-rw-r--r-- | inputmethod/qt5-uim/patches/patch-qt4_common.pro.in | 24 |
4 files changed, 19 insertions, 22 deletions
diff --git a/inputmethod/qt5-uim/Makefile b/inputmethod/qt5-uim/Makefile index b78ed8f2925..4c857341c82 100644 --- a/inputmethod/qt5-uim/Makefile +++ b/inputmethod/qt5-uim/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.21 2017/11/30 16:45:27 adam Exp $ +# $NetBSD: Makefile,v 1.22 2018/01/30 06:47:01 markd Exp $ .include "../../x11/qt5/Makefile.common" DISTNAME= uim-1.8.6 PKGNAME= qt5-${DISTNAME} -PKGREVISION= 17 +PKGREVISION= 18 CATEGORIES= x11 MASTER_SITES= http://uim.googlecode.com/files/ EXTRACT_SUFX= .tar.bz2 @@ -25,7 +25,7 @@ USE_LANGUAGES= c c++ PKGCONFIG_OVERRIDE+= uim.pc.in -CONFIGURE_ENV+= QMAKE5=${QTPREFIX}/bin/qmake +CONFIGURE_ENV+= _QMAKE5=${QTPREFIX}/bin/qmake CONFIGURE_ENV.SunOS+= ac_cv_func_strcasecmp=yes CONFIGURE_ARGS+= --with-qt5-immodule @@ -43,6 +43,9 @@ post-extract: cd ${WRKSRC} && \ ${CP} ../uim-1.8.7pre1/configure . +post-install: + rm ${DESTDIR}${QTPREFIX}/lib/cmake/Qt5Gui/Qt5Gui_.cmake + .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libgcroots/buildlink3.mk" diff --git a/inputmethod/qt5-uim/PLIST b/inputmethod/qt5-uim/PLIST index b6f605b93c7..c10312785da 100644 --- a/inputmethod/qt5-uim/PLIST +++ b/inputmethod/qt5-uim/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.3 2015/12/23 12:40:37 joerg Exp $ -qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.la +@comment $NetBSD: PLIST,v 1.4 2018/01/30 06:47:01 markd Exp $ +qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.so diff --git a/inputmethod/qt5-uim/distinfo b/inputmethod/qt5-uim/distinfo index 664a2e431d7..953f1f8ee13 100644 --- a/inputmethod/qt5-uim/distinfo +++ b/inputmethod/qt5-uim/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2015/12/23 12:40:37 joerg Exp $ +$NetBSD: distinfo,v 1.5 2018/01/30 06:47:01 markd Exp $ SHA1 (uim-1.8.6.tar.bz2) = 43b9dbdead6797880e6cfc9c032ecb2d37d42777 RMD160 (uim-1.8.6.tar.bz2) = 5f94218d82475ac463534ec681769f34547e5707 @@ -9,7 +9,7 @@ RMD160 (uim-1.8.7pre1.tar.gz) = 252b3337009d896eef9027029a806bc60c126da0 SHA512 (uim-1.8.7pre1.tar.gz) = b1c0250a32770818e895c977f1c78530a84ebd56dc81476a364ace6cf0cfe89a5227e9b43d9a1f0c04112b42fb2963d1fd72d584500599dd1a0ed2632538fa4f Size (uim-1.8.7pre1.tar.gz) = 5821262 bytes SHA1 (patch-Makefile.in) = 15f8a9adbc7f7b7d3307630f2adb9cffdc4c524f -SHA1 (patch-qt4_common.pro.in) = 4c1f24d0301cd9d2bd05fdbdd92c82096de7c3c1 +SHA1 (patch-qt4_common.pro.in) = b998c2b9624dfb0cb07519dc9ead8687bdc2e566 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_common.pro.in b/inputmethod/qt5-uim/patches/patch-qt4_common.pro.in index 51799f4f994..ef89bf016e5 100644 --- a/inputmethod/qt5-uim/patches/patch-qt4_common.pro.in +++ b/inputmethod/qt5-uim/patches/patch-qt4_common.pro.in @@ -1,18 +1,12 @@ -$NetBSD: patch-qt4_common.pro.in,v 1.1 2013/12/13 14:38:36 ryoon Exp $ +$NetBSD: patch-qt4_common.pro.in,v 1.2 2018/01/30 06:47:01 markd Exp $ -* Fix for libtoolized qt5 +Build with qt5 >= 5.9 ---- qt4/common.pro.in.orig 2013-12-13 13:28:40.000000000 +0000 +--- qt4/common.pro.in.orig 2018-01-30 02:48:18.261046598 +0000 +++ qt4/common.pro.in -@@ -5,9 +5,9 @@ INCLUDEPATH += @abs_top_builddir@ @abs_t - @abs_top_srcdir@/replace - QMAKE_LIBDIR += @abs_top_builddir@/uim @abs_top_builddir@/replace \ - @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs --LIBS += -lreplace -luim -luim-scm -+LIBS += ../../replace/libreplace.la ../../uim/libuim.la ../../uim/libuim-scm.la - !win32:!embedded:!mac { -- LIBS += -luim-x-util -+ LIBS += ../../uim/libuim-x-util.la - } - - greaterThan(QT_MAJOR_VERSION, 4) { +@@ -29,3 +29,5 @@ QMAKE_LFLAGS = @LDFLAGS@ + QMAKE_STRIP = + + INSTALLS += target ++ ++load(qt_build_config) |