From 5758b588f6758d328d57d056006ee673590128f2 Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 27 Dec 2005 18:04:32 +0000 Subject: [PATCH] Add inputmodules patch. Fixed package name for debug flavor. --- x11/qt3/Makefile | 28 ++++++++++++++++++++++++---- x11/qt3/distinfo | 4 ++++ x11/qt3/pkg/PFRAG.shared | 6 +++++- x11/qt3/pkg/PLIST | 12 +++++++++++- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile index fce326737e5..e830a2ab7b7 100644 --- a/x11/qt3/Makefile +++ b/x11/qt3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.55 2005/11/10 11:15:13 espie Exp $ +# $OpenBSD: Makefile,v 1.56 2005/12/27 18:04:32 espie Exp $ # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $ COMMENT= "C++ X11 GUI toolkit" @@ -11,7 +11,7 @@ PKGNAME= qt3-${VERSION} PKGNAME-mysql= qt3-mysql-${VERSION} PKGNAME-postgresql= qt3-postgresql-${VERSION} PKGNAME-examples= qt3-examples-${VERSION} -FULLPKGNAME= qt3-mt-${VERSION}${PKGDEBUG}p0 +FULLPKGNAME= qt3-mt-${VERSION}p1${PKGDEBUG} FULLPKGNAME-html= qt3-html-${VERSION} VERSION= 3.5 @@ -19,6 +19,14 @@ DISTNAME= qt-x11-free-3.${VERSION} CATEGORIES= x11 MASTER_SITES= ftp://ftp.troll.no/qt/source/ +MASTER_SITES0= http://freedesktop.org/~daisuke/ + +PATCHFILES= qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2:0 +PATCH_DIST_STRIP= -p1 + +pre-configure: + cd ${WRKDIST} && /bin/sh ./make-symlinks.sh + HOMEPAGE= http://www.trolltech.com/qt/ MAINTAINER= Marc Espie @@ -53,6 +61,7 @@ CONFIGURE_ARGS= -qt-gif -system-libmng -system-libpng -system-libjpeg -system-zl -tablet \ -xinerama \ -cups \ + -inputmethod \ -I${LOCALBASE}/include/libpng \ -I${X11BASE}/include/freetype2 \ -I${LOCALBASE}/include \ @@ -153,7 +162,8 @@ QT_BINDIR= ${QT_LIBDIR}/bin SUBST_VARS= QT_LIBDIR QT_DOC DOCS= FAQ LICENSE.GPL README README-QT.TXT \ - changes-3* + changes-3* \ + README.immodule changes.immodule VMEM_WARNING= Yes NO_REGRESS= Yes @@ -244,7 +254,9 @@ do-install: .endfor # plugins ${INSTALL_DATA_DIR} ${QT_PLUGINSDIR}/designer \ - ${QT_PLUGINSDIR}/sqldrivers ${QT_PLUGINSDIR}/styles + ${QT_PLUGINSDIR}/sqldrivers ${QT_PLUGINSDIR}/styles \ + ${QT_PLUGINSDIR}/inputmethods + .if empty(FLAVOR:L:Mno_postgresql) ${INSTALL_DATA} ${WRKBUILD}/plugins/sqldrivers/libqsqlpsql.so \ ${QT_PLUGINSDIR}/sqldrivers @@ -261,6 +273,14 @@ do-install: ${QT_PLUGINSDIR}/designer ${INSTALL_DATA} ${WRKBUILD}/plugins/designer/librcplugin.so \ ${QT_PLUGINSDIR}/designer + ${INSTALL_DATA} ${WRKBUILD}/plugins/inputmethods/libqimsw-multi.so \ + ${QT_PLUGINSDIR}/inputmethods + ${INSTALL_DATA} ${WRKBUILD}/plugins/inputmethods/libqimsw-none.so \ + ${QT_PLUGINSDIR}/inputmethods + ${INSTALL_DATA} ${WRKBUILD}/plugins/inputmethods/libqsimple.so \ + ${QT_PLUGINSDIR}/inputmethods + ${INSTALL_DATA} ${WRKBUILD}/plugins/inputmethods/libqxim.so \ + ${QT_PLUGINSDIR}/inputmethods # compatibility transition .for p in ${PROGRAMS} cd ${PREFIX}/bin && ln -sf $p $p-mt diff --git a/x11/qt3/distinfo b/x11/qt3/distinfo index b31b48b03c3..fa47ee2bd66 100644 --- a/x11/qt3/distinfo +++ b/x11/qt3/distinfo @@ -1,4 +1,8 @@ MD5 (qt-x11-free-3.3.5.tar.gz) = fecaf5435c6b0a1a2c23e67991f74e7a +MD5 (qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2) = 2d1a6979301ee81da404f63670211416 RMD160 (qt-x11-free-3.3.5.tar.gz) = 564046358cdf24dc3778dda02fd36bf6e420dc5b +RMD160 (qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2) = 18fe91f54f2f18c2b1b2b870b36c7545132ed166 SHA1 (qt-x11-free-3.3.5.tar.gz) = d36db11111fdb30a82249b66bfe8bd2c78fb02e2 +SHA1 (qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2) = 0e4935f1b398a604f7a2046af026fb9a60e7f519 SIZE (qt-x11-free-3.3.5.tar.gz) = 17441192 +SIZE (qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2) = 110612 diff --git a/x11/qt3/pkg/PFRAG.shared b/x11/qt3/pkg/PFRAG.shared index d3593ee61b8..8608836f6e6 100644 --- a/x11/qt3/pkg/PFRAG.shared +++ b/x11/qt3/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.17 2005/09/19 10:24:57 espie Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.18 2005/12/27 18:04:32 espie Exp $ @lib lib/libqt-mt.so.3.35 @lib lib/libqui-mt.so.1.0 @lib lib/libqui.so.1.0 @@ -9,3 +9,7 @@ lib/qt3/plugins/designer/libcppeditor.so lib/qt3/plugins/designer/libdlgplugin.so lib/qt3/plugins/designer/librcplugin.so lib/qt3/plugins/designer/libwizards.so +lib/qt3/plugins/inputmethods/libqimsw-multi.so +lib/qt3/plugins/inputmethods/libqimsw-none.so +lib/qt3/plugins/inputmethods/libqsimple.so +lib/qt3/plugins/inputmethods/libqxim.so diff --git a/x11/qt3/pkg/PLIST b/x11/qt3/pkg/PLIST index 82498eaf05a..20c3d8f4ca7 100644 --- a/x11/qt3/pkg/PLIST +++ b/x11/qt3/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.25 2005/11/10 11:15:13 espie Exp $ +@comment $OpenBSD: PLIST,v 1.26 2005/12/27 18:04:32 espie Exp $ @conflict qt3-* @conflict qt3-base-* @pkgpath x11/qt3,mt @@ -55,6 +55,7 @@ include/X11/qt3/private/qgl_x11_p.h include/X11/qt3/private/qgpluginmanager_p.h include/X11/qt3/private/qimageformatinterface_p.h include/X11/qt3/private/qinputcontext_p.h +include/X11/qt3/private/qinputcontextinterface_p.h include/X11/qt3/private/qinternal_p.h include/X11/qt3/private/qisciicodec_p.h include/X11/qt3/private/qkbddriverinterface_p.h @@ -212,6 +213,9 @@ include/X11/qt3/qiconset.h include/X11/qt3/qiconview.h include/X11/qt3/qimage.h include/X11/qt3/qimageformatplugin.h +include/X11/qt3/qinputcontext.h +include/X11/qt3/qinputcontextfactory.h +include/X11/qt3/qinputcontextplugin.h include/X11/qt3/qinputdialog.h include/X11/qt3/qintcach.h include/X11/qt3/qintcache.h @@ -371,6 +375,7 @@ include/X11/qt3/qstyleplugin.h include/X11/qt3/qstylesheet.h include/X11/qt3/qsyntaxhighlighter.h include/X11/qt3/qt.h +include/X11/qt3/qt_pch.h include/X11/qt3/qtabbar.h include/X11/qt3/qtabdialog.h include/X11/qt3/qtabdlg.h @@ -387,6 +392,7 @@ include/X11/qt3/qthread.h include/X11/qt3/qthreadstorage.h include/X11/qt3/qtimer.h include/X11/qt3/qtl.h +include/X11/qt3/qtmultilineedit.h include/X11/qt3/qtoolbar.h include/X11/qt3/qtoolbox.h include/X11/qt3/qtoolbutton.h @@ -394,6 +400,7 @@ include/X11/qt3/qtooltip.h include/X11/qt3/qtranslator.h include/X11/qt3/qtsciicodec.h include/X11/qt3/qtstream.h +include/X11/qt3/qttableview.h include/X11/qt3/qurl.h include/X11/qt3/qurlinfo.h include/X11/qt3/qurloperator.h @@ -1481,6 +1488,7 @@ lib/qt3/mkspecs/win32-watcom/ lib/qt3/mkspecs/win32-watcom/qmake.conf lib/qt3/plugins/ lib/qt3/plugins/designer/ +lib/qt3/plugins/inputmethods/ lib/qt3/plugins/sqldrivers/ lib/qt3/plugins/styles/ share/doc/qt3/ @@ -1488,4 +1496,6 @@ share/doc/qt3/FAQ share/doc/qt3/LICENSE.GPL share/doc/qt3/README share/doc/qt3/README-QT.TXT +share/doc/qt3/README.immodule share/doc/qt3/changes-3.3.5 +share/doc/qt3/changes.immodule