pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/inputmethod inputmethod: Remove qt5-uim
details: https://anonhg.NetBSD.org/pkgsrc/rev/c845ebc13719
branches: trunk
changeset: 411223:c845ebc13719
user: nia <nia%pkgsrc.org@localhost>
date: Sat Feb 08 15:37:56 2020 +0000
description:
inputmethod: Remove qt5-uim
Package is redundant with uim including qt5 support, and no longer builds.
diffstat:
inputmethod/Makefile | 3 +-
inputmethod/qt5-uim/DESCR | 1 -
inputmethod/qt5-uim/Makefile | 54 ----------
inputmethod/qt5-uim/PLIST | 2 -
inputmethod/qt5-uim/distinfo | 15 --
inputmethod/qt5-uim/patches/patch-Makefile.in | 17 ---
inputmethod/qt5-uim/patches/patch-qt4_common.pro.in | 12 --
inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.cpp | 12 --
inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.h | 12 --
inputmethod/qt5-uim/patches/patch-qt5_immodule_quimplatforminputcontextplugin.pro.in | 15 --
10 files changed, 1 insertions(+), 142 deletions(-)
diffs (193 lines):
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/Makefile
--- a/inputmethod/Makefile Sat Feb 08 15:35:27 2020 +0000
+++ b/inputmethod/Makefile Sat Feb 08 15:37:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2018/08/18 01:22:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.77 2020/02/08 15:37:56 nia Exp $
#
COMMENT= Input method tools and libraries
@@ -70,7 +70,6 @@
SUBDIR+= p5-zinnia
SUBDIR+= py-input-pad
SUBDIR+= py-zinnia
-SUBDIR+= qt5-uim
SUBDIR+= ruby-zinnia
SUBDIR+= scim
SUBDIR+= scim-anthy
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/qt5-uim/DESCR
--- a/inputmethod/qt5-uim/DESCR Sat Feb 08 15:35:27 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Qt5 input module for uim
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/qt5-uim/Makefile
--- a/inputmethod/qt5-uim/Makefile Sat Feb 08 15:35:27 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-# $NetBSD: Makefile,v 1.30 2020/01/18 21:49:41 jperkin Exp $
-
-.include "../../x11/qt5/Makefile.common"
-
-DISTNAME= uim-1.8.6
-PKGNAME= qt5-${DISTNAME}
-PKGREVISION= 25
-CATEGORIES= x11
-MASTER_SITES= http://uim.googlecode.com/files/
-EXTRACT_SUFX= .tar.bz2
-DISTFILES= ${DEFAULT_DISTFILES} uim-1.8.7pre1.tar.gz
-SITES.uim-1.8.7pre1.tar.gz= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= ryoon%NetBSD.org@localhost
-HOMEPAGE= https://github.com/uim/uim
-COMMENT= Qt5 input module for uim
-LICENSE= modified-bsd
-
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake gsed intltool pkg-config xgettext
-BUILDLINK_DEPMETHOD.gtk2= build
-
-USE_LANGUAGES= c c++03
-
-PKGCONFIG_OVERRIDE+= uim.pc.in
-
-CONFIGURE_ENV+= _QMAKE5=${QTPREFIX}/bin/qmake
-CONFIGURE_ENV.SunOS+= ac_cv_func_strcasecmp=yes
-
-CONFIGURE_ARGS+= --with-qt5-immodule
-CONFIGURE_ARGS+= --disable-emacs
-CONFIGURE_ARGS+= --with-libgcroots=installed
-
-INSTALL_DIRS+= qt5
-
-post-extract:
- cd ${WRKSRC} && \
- ${CP} -r ../uim-1.8.7pre1/qt5 .
- cd ${WRKSRC} && \
- ${RM} -fr qt4 &&\
- ${CP} -r ../uim-1.8.7pre1/qt4 .
- 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"
-.include "../../inputmethod/uim/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/qt5-uim/PLIST
--- a/inputmethod/qt5-uim/PLIST Sat Feb 08 15:35:27 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2018/01/30 06:47:01 markd Exp $
-qt5/plugins/platforminputcontexts/libuimplatforminputcontextplugin.so
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/qt5-uim/distinfo
--- a/inputmethod/qt5-uim/distinfo Sat Feb 08 15:35:27 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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
-SHA512 (uim-1.8.6.tar.bz2) = 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
-Size (uim-1.8.6.tar.bz2) = 6500739 bytes
-SHA1 (uim-1.8.7pre1.tar.gz) = cfe281d7d3e56eca7e6b140e7fb4ed4b712514b9
-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) = b998c2b9624dfb0cb07519dc9ead8687bdc2e566
-SHA1 (patch-qt4_immodule_plugin.cpp) = d7ec1c6f49cd9993e86b89537b1b48d6b4ba42d7
-SHA1 (patch-qt4_immodule_plugin.h) = 395f320deebc4b5aa8721e4e69cd2cc3aaeffd9d
-SHA1 (patch-qt5_immodule_quimplatforminputcontextplugin.pro.in) = 63bbf7057b61df14a52430e8c12b9bb9b3d69096
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/qt5-uim/patches/patch-Makefile.in
--- a/inputmethod/qt5-uim/patches/patch-Makefile.in Sat Feb 08 15:35:27 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2013/12/13 14:38:36 ryoon Exp $
-
-* Do not build the stuffs that requires other packages
-
---- Makefile.in.orig 2013-06-30 04:27:10.000000000 +0000
-+++ Makefile.in
-@@ -441,8 +441,8 @@ top_srcdir = @top_srcdir@
- uim_pixmapsdir = @uim_pixmapsdir@
- AUTOMAKE_OPTIONS = foreign
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = m4 doc replace sigscheme uim scm test test2 gtk2 gtk3 qt3 \
-- notify qt4 xim fep emacs po pixmaps examples tables \
-+SUBDIRS = m4 doc replace sigscheme uim scm test \
-+ notify qt4 qt5 xim emacs pixmaps examples tables \
- byeoru-data
- EXTRA_DIST = RELNOTE ChangeLog.old ChangeLog.old.2 autogen.sh make-dist.sh \
- uim.pc.in uim.desktop \
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/qt5-uim/patches/patch-qt4_common.pro.in
--- a/inputmethod/qt5-uim/patches/patch-qt4_common.pro.in Sat Feb 08 15:35:27 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-qt4_common.pro.in,v 1.2 2018/01/30 06:47:01 markd Exp $
-
-Build with qt5 >= 5.9
-
---- qt4/common.pro.in.orig 2018-01-30 02:48:18.261046598 +0000
-+++ qt4/common.pro.in
-@@ -29,3 +29,5 @@ QMAKE_LFLAGS = @LDFLAGS@
- QMAKE_STRIP =
-
- INSTALLS += target
-+
-+load(qt_build_config)
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.cpp
--- a/inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.cpp Sat Feb 08 15:35:27 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-qt4_immodule_plugin.cpp,v 1.1 2013/12/15 19:38:33 joerg Exp $
-
---- qt4/immodule/plugin.cpp.orig 2013-12-15 17:58:04.000000000 +0000
-+++ qt4/immodule/plugin.cpp
-@@ -33,6 +33,7 @@
- */
-
- #include "plugin.h"
-+#include <clocale>
-
- #include <QtCore/QStringList>
- #ifdef Q_WS_X11
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.h
--- a/inputmethod/qt5-uim/patches/patch-qt4_immodule_plugin.h Sat Feb 08 15:35:27 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$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
-
diff -r dc5c7037dedb -r c845ebc13719 inputmethod/qt5-uim/patches/patch-qt5_immodule_quimplatforminputcontextplugin.pro.in
--- a/inputmethod/qt5-uim/patches/patch-qt5_immodule_quimplatforminputcontextplugin.pro.in Sat Feb 08 15:35:27 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-qt5_immodule_quimplatforminputcontextplugin.pro.in,v 1.1 2013/12/13 14:38:36 ryoon Exp $
-
-* Add DESTDIR support, fix unprivileged build
-
---- qt5/immodule/quimplatforminputcontextplugin.pro.in.orig 2013-12-13 13:28:40.000000000 +0000
-+++ qt5/immodule/quimplatforminputcontextplugin.pro.in
-@@ -11,6 +11,8 @@ LIBS += @X11_LIBS@ -luim-counted-init
-
- QT += gui-private
-
-+DESTDIR = quimplatforminputcontext_DEST
-+
- # Input
- HEADERS += @srcdir@/quimplatforminputcontext.h \
- @srcdir@/../../qt4/immodule/candidatewindowproxy.h \
Home |
Main Index |
Thread Index |
Old Index