Tue Jan 30 06:47:01 2018 UTC ()
qt5-uim: build with qt 5.10


(markd)
diff -r1.21 -r1.22 pkgsrc/inputmethod/qt5-uim/Makefile
diff -r1.3 -r1.4 pkgsrc/inputmethod/qt5-uim/PLIST
diff -r1.4 -r1.5 pkgsrc/inputmethod/qt5-uim/distinfo
diff -r1.1 -r1.2 pkgsrc/inputmethod/qt5-uim/patches/patch-qt4_common.pro.in
cvs diff -r1.21 -r1.22 pkgsrc/inputmethod/qt5-uim/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/qt5-uim/Attic/Makefile 2017/11/30 16:45:27 1.21
+++ pkgsrc/inputmethod/qt5-uim/Attic/Makefile 2018/01/30 06:47:01 1.22
@@ -1,51 +1,54 @@ @@ -1,51 +1,54 @@
1# $NetBSD: Makefile,v 1.21 2017/11/30 16:45:27 adam Exp $ 1# $NetBSD: Makefile,v 1.22 2018/01/30 06:47:01 markd Exp $
2 2
3.include "../../x11/qt5/Makefile.common" 3.include "../../x11/qt5/Makefile.common"
4 4
5DISTNAME= uim-1.8.6 5DISTNAME= uim-1.8.6
6PKGNAME= qt5-${DISTNAME} 6PKGNAME= qt5-${DISTNAME}
7PKGREVISION= 17 7PKGREVISION= 18
8CATEGORIES= x11 8CATEGORIES= x11
9MASTER_SITES= http://uim.googlecode.com/files/ 9MASTER_SITES= http://uim.googlecode.com/files/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11DISTFILES= ${DEFAULT_DISTFILES} uim-1.8.7pre1.tar.gz 11DISTFILES= ${DEFAULT_DISTFILES} uim-1.8.7pre1.tar.gz
12SITES.uim-1.8.7pre1.tar.gz= ${MASTER_SITE_LOCAL} 12SITES.uim-1.8.7pre1.tar.gz= ${MASTER_SITE_LOCAL}
13 13
14MAINTAINER= ryoon@NetBSD.org 14MAINTAINER= ryoon@NetBSD.org
15HOMEPAGE= https://github.com/uim/uim 15HOMEPAGE= https://github.com/uim/uim
16COMMENT= Qt5 input module for uim 16COMMENT= Qt5 input module for uim
17LICENSE= modified-bsd 17LICENSE= modified-bsd
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_TOOLS+= gmake gsed intltool pkg-config xgettext 21USE_TOOLS+= gmake gsed intltool pkg-config xgettext
22BUILDLINK_DEPMETHOD.gtk2= build 22BUILDLINK_DEPMETHOD.gtk2= build
23 23
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25 25
26PKGCONFIG_OVERRIDE+= uim.pc.in 26PKGCONFIG_OVERRIDE+= uim.pc.in
27 27
28CONFIGURE_ENV+= QMAKE5=${QTPREFIX}/bin/qmake 28CONFIGURE_ENV+= _QMAKE5=${QTPREFIX}/bin/qmake
29CONFIGURE_ENV.SunOS+= ac_cv_func_strcasecmp=yes 29CONFIGURE_ENV.SunOS+= ac_cv_func_strcasecmp=yes
30 30
31CONFIGURE_ARGS+= --with-qt5-immodule 31CONFIGURE_ARGS+= --with-qt5-immodule
32CONFIGURE_ARGS+= --disable-emacs 32CONFIGURE_ARGS+= --disable-emacs
33CONFIGURE_ARGS+= --with-libgcroots=installed 33CONFIGURE_ARGS+= --with-libgcroots=installed
34 34
35INSTALL_DIRS+= qt5 35INSTALL_DIRS+= qt5
36 36
37post-extract: 37post-extract:
38 cd ${WRKSRC} && \ 38 cd ${WRKSRC} && \
39 ${CP} -r ../uim-1.8.7pre1/qt5 . 39 ${CP} -r ../uim-1.8.7pre1/qt5 .
40 cd ${WRKSRC} && \ 40 cd ${WRKSRC} && \
41 ${RM} -fr qt4 &&\ 41 ${RM} -fr qt4 &&\
42 ${CP} -r ../uim-1.8.7pre1/qt4 . 42 ${CP} -r ../uim-1.8.7pre1/qt4 .
43 cd ${WRKSRC} && \ 43 cd ${WRKSRC} && \
44 ${CP} ../uim-1.8.7pre1/configure . 44 ${CP} ../uim-1.8.7pre1/configure .
45 45
 46post-install:
 47 rm ${DESTDIR}${QTPREFIX}/lib/cmake/Qt5Gui/Qt5Gui_.cmake
 48
46.include "../../converters/libiconv/buildlink3.mk" 49.include "../../converters/libiconv/buildlink3.mk"
47.include "../../devel/gettext-lib/buildlink3.mk" 50.include "../../devel/gettext-lib/buildlink3.mk"
48.include "../../devel/libgcroots/buildlink3.mk" 51.include "../../devel/libgcroots/buildlink3.mk"
49.include "../../inputmethod/uim/buildlink3.mk" 52.include "../../inputmethod/uim/buildlink3.mk"
50.include "../../x11/qt5-qtbase/buildlink3.mk" 53.include "../../x11/qt5-qtbase/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/inputmethod/qt5-uim/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/qt5-uim/Attic/PLIST 2015/12/23 12:40:37 1.3
+++ pkgsrc/inputmethod/qt5-uim/Attic/PLIST 2018/01/30 06:47:01 1.4
@@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
1@comment $NetBSD: PLIST,v 1.3 2015/12/23 12:40:37 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2018/01/30 06:47:01 markd Exp $
2qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.la 2qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.so
cvs diff -r1.4 -r1.5 pkgsrc/inputmethod/qt5-uim/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/qt5-uim/Attic/distinfo 2015/12/23 12:40:37 1.4
+++ pkgsrc/inputmethod/qt5-uim/Attic/distinfo 2018/01/30 06:47:01 1.5
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.4 2015/12/23 12:40:37 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2018/01/30 06:47:01 markd Exp $
2 2
3SHA1 (uim-1.8.6.tar.bz2) = 43b9dbdead6797880e6cfc9c032ecb2d37d42777 3SHA1 (uim-1.8.6.tar.bz2) = 43b9dbdead6797880e6cfc9c032ecb2d37d42777
4RMD160 (uim-1.8.6.tar.bz2) = 5f94218d82475ac463534ec681769f34547e5707 4RMD160 (uim-1.8.6.tar.bz2) = 5f94218d82475ac463534ec681769f34547e5707
5SHA512 (uim-1.8.6.tar.bz2) = 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b 5SHA512 (uim-1.8.6.tar.bz2) = 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
6Size (uim-1.8.6.tar.bz2) = 6500739 bytes 6Size (uim-1.8.6.tar.bz2) = 6500739 bytes
7SHA1 (uim-1.8.7pre1.tar.gz) = cfe281d7d3e56eca7e6b140e7fb4ed4b712514b9 7SHA1 (uim-1.8.7pre1.tar.gz) = cfe281d7d3e56eca7e6b140e7fb4ed4b712514b9
8RMD160 (uim-1.8.7pre1.tar.gz) = 252b3337009d896eef9027029a806bc60c126da0 8RMD160 (uim-1.8.7pre1.tar.gz) = 252b3337009d896eef9027029a806bc60c126da0
9SHA512 (uim-1.8.7pre1.tar.gz) = b1c0250a32770818e895c977f1c78530a84ebd56dc81476a364ace6cf0cfe89a5227e9b43d9a1f0c04112b42fb2963d1fd72d584500599dd1a0ed2632538fa4f 9SHA512 (uim-1.8.7pre1.tar.gz) = b1c0250a32770818e895c977f1c78530a84ebd56dc81476a364ace6cf0cfe89a5227e9b43d9a1f0c04112b42fb2963d1fd72d584500599dd1a0ed2632538fa4f
10Size (uim-1.8.7pre1.tar.gz) = 5821262 bytes 10Size (uim-1.8.7pre1.tar.gz) = 5821262 bytes
11SHA1 (patch-Makefile.in) = 15f8a9adbc7f7b7d3307630f2adb9cffdc4c524f 11SHA1 (patch-Makefile.in) = 15f8a9adbc7f7b7d3307630f2adb9cffdc4c524f
12SHA1 (patch-qt4_common.pro.in) = 4c1f24d0301cd9d2bd05fdbdd92c82096de7c3c1 12SHA1 (patch-qt4_common.pro.in) = b998c2b9624dfb0cb07519dc9ead8687bdc2e566
13SHA1 (patch-qt4_immodule_plugin.cpp) = d7ec1c6f49cd9993e86b89537b1b48d6b4ba42d7 13SHA1 (patch-qt4_immodule_plugin.cpp) = d7ec1c6f49cd9993e86b89537b1b48d6b4ba42d7
14SHA1 (patch-qt4_immodule_plugin.h) = 395f320deebc4b5aa8721e4e69cd2cc3aaeffd9d 14SHA1 (patch-qt4_immodule_plugin.h) = 395f320deebc4b5aa8721e4e69cd2cc3aaeffd9d
15SHA1 (patch-qt5_immodule_quimplatforminputcontextplugin.pro.in) = 63bbf7057b61df14a52430e8c12b9bb9b3d69096 15SHA1 (patch-qt5_immodule_quimplatforminputcontextplugin.pro.in) = 63bbf7057b61df14a52430e8c12b9bb9b3d69096
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/qt5-uim/patches/Attic/patch-qt4_common.pro.in (expand / switch to unified diff)

--- pkgsrc/inputmethod/qt5-uim/patches/Attic/patch-qt4_common.pro.in 2013/12/13 14:38:36 1.1
+++ pkgsrc/inputmethod/qt5-uim/patches/Attic/patch-qt4_common.pro.in 2018/01/30 06:47:01 1.2
@@ -1,18 +1,12 @@ @@ -1,18 +1,12 @@
1$NetBSD: patch-qt4_common.pro.in,v 1.1 2013/12/13 14:38:36 ryoon Exp $ 1$NetBSD: patch-qt4_common.pro.in,v 1.2 2018/01/30 06:47:01 markd Exp $
2 2
3* Fix for libtoolized qt5 3Build with qt5 >= 5.9
4 4
5--- qt4/common.pro.in.orig 2013-12-13 13:28:40.000000000 +0000 5--- qt4/common.pro.in.orig 2018-01-30 02:48:18.261046598 +0000
6+++ qt4/common.pro.in 6+++ qt4/common.pro.in
7@@ -5,9 +5,9 @@ INCLUDEPATH += @abs_top_builddir@ @abs_t 7@@ -29,3 +29,5 @@ QMAKE_LFLAGS = @LDFLAGS@
8 @abs_top_srcdir@/replace 8 QMAKE_STRIP =
9 QMAKE_LIBDIR += @abs_top_builddir@/uim @abs_top_builddir@/replace \ 9
10 @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs 10 INSTALLS += target
11-LIBS += -lreplace -luim -luim-scm 11+
12+LIBS += ../../replace/libreplace.la ../../uim/libuim.la ../../uim/libuim-scm.la 12+load(qt_build_config)
13 !win32:!embedded:!mac { 
14- LIBS += -luim-x-util 
15+ LIBS += ../../uim/libuim-x-util.la 
16 } 
17  
18 greaterThan(QT_MAJOR_VERSION, 4) {