pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/42481: Update inputmethod/uim and Remove inputmethod/uim-immodule-qt4
>Number: 42481
>Category: pkg
>Synopsis: Update inputmethod/uim and Remove inputmethod/uim-immodule-qt4
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Dec 20 10:00:00 +0000 2009
>Originator: YAMASHIRO Jun
>Release: NetBSD/i386 5.0
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD maturi.local 5.0 NetBSD 5.0 (GENERIC) #0: Sun Apr 26 18:50:08 UTC 2009
builds%b6.netbsd.org@localhost:/home/builds/ab/netbsd-5-0-RELEASE/i386/200904260229Z-obj/home/builds/ab/netbsd-5-0-RELEASE/src/sys/arch/i386/compile/GENERIC
i386
>Description:
This request want update inputmethod/uim and remove
inputmethod/uim-qt4-immodule.
Please remove inputmethod/uim-qt4-immmodule. Because, uim-1.5.7 improved
Qt4 support.
pkgsrc changelog:
* Enable Anthy's UTF-8 dictionary support.
* Improved configure option for 'eb' option.
* Add qt4/kde4 option
(Note: UIM widget for KDE4("kde4" option) still buggy)
Overview of changes from 1.5.6 to 1.5.7
=======================================
* New features
- uim-chardict-qt4
- uim-toolbar-qt4
- uim-pref-qt4
- uim-candwin-qt4
- uim-applet-kde4
* Experimental support of Qt4 tools by Muneyuki Noguchi (#24123,
#24620)
* Enhancement
- uim-toolbar-gtk-systray
* Support transparent background
* Fixes
- GTK+ bridge
* Fix crash in combination with Firefox and flashplayer plugin
(#25139)
- uim-fep
* Fix compilation on NetBSD current ([uim-ja 148])
- uim.el
* Fix bug: uim.el doesn't work when linum-mode is activated and
the inline candidates displaying mode is enabled ([uim-en 245])
* Fix bug: Some special keys (such as arrow keys) cannot be used
when uim.el is enabled on emacs23 with -nw option.
- Qt4 bridge
* Don't enable knotify3 when qt4-immodule is enabled in configure
time (#19877)
* Fix compilation when srcdir != builddir
- uim-notify
* Disable uim-notify on build phase to prevent dependency library
mismatch
- uim-chardict-qt
* Install translation file properly ([uim-ja 150])
Overview of changes from 1.5.5 to 1.5.6
=======================================
* Enhancement
- uim-dict-gtk
* Support UTF-8 characters with Anthy personal dictionary
* Fixes
- XIM bridge (uim-xim)
* Fix segfault with latest X.Org
* Fix segfault with PRIME
* Others
- Apply build fix from Fedora
>How-To-Repeat:
>Fix:
Apply this patch to inputmethod/uim and remove inputmethod/uim-qt4-immmodule
diff -Nru uim.orig/Makefile uim/Makefile
--- uim.orig/Makefile 2009-08-27 04:58:45.000000000 +0900
+++ uim/Makefile 2009-12-20 18:20:43.000000000 +0900
@@ -3,7 +3,6 @@
.include "../../inputmethod/uim/Makefile.common"
-PKGREVISION= 1
COMMENT= Multilingual input method library
PKG_DESTDIR_SUPPORT= user-destdir
@@ -32,8 +31,10 @@
CONFIGURE_ARGS+= --with-libedit=no
.endif
+INSTALLATION_DIRS+= share/doc/uim
+INSTALLATION_DIRS+= share/doc/uim/uim-fep
+
post-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/uim
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/uim
${INSTALL_DATA} ${WRKSRC}/doc/COMPATIBILITY
${DESTDIR}${PREFIX}/share/doc/uim
${INSTALL_DATA} ${WRKSRC}/doc/CUSTOM ${DESTDIR}${PREFIX}/share/doc/uim
@@ -44,11 +45,11 @@
${INSTALL_DATA} ${WRKSRC}/doc/PLUGIN ${DESTDIR}${PREFIX}/share/doc/uim
${INSTALL_DATA} ${WRKSRC}/doc/UIM-SCM ${DESTDIR}${PREFIX}/share/doc/uim
${INSTALL_DATA} ${WRKSRC}/doc/UIM-SH ${DESTDIR}${PREFIX}/share/doc/uim
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep
${INSTALL_DATA} ${WRKSRC}/fep/README
${DESTDIR}${PREFIX}/share/doc/uim/uim-fep
${INSTALL_DATA} ${WRKSRC}/fep/README.ja
${DESTDIR}${PREFIX}/share/doc/uim/uim-fep
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgcroots/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff -Nru uim.orig/Makefile.common uim/Makefile.common
--- uim.orig/Makefile.common 2009-01-23 22:40:32.000000000 +0900
+++ uim/Makefile.common 2009-11-23 12:02:26.000000000 +0900
@@ -4,7 +4,7 @@
# used by inputmethod/uim-elisp/Makefile
# used by inputmethod/uim-qt4-immodule/Makefile
-UIM_VERSION= 1.5.5
+UIM_VERSION= 1.5.7
DISTNAME= uim-${UIM_VERSION}
CATEGORIES= inputmethod
MASTER_SITES= http://uim.googlecode.com/files/
diff -Nru uim.orig/PLIST uim/PLIST
--- uim.orig/PLIST 2009-10-01 21:30:32.000000000 +0900
+++ uim/PLIST 2009-12-20 17:55:49.000000000 +0900
@@ -1,19 +1,23 @@
@comment $NetBSD: PLIST,v 1.12 2009/10/01 12:30:32 obache Exp $
${PLIST.qt}bin/uim-chardict-qt
+${PLIST.qt4}bin/uim-chardict-qt4
${PLIST.uim-dict-gtk}bin/uim-dict-gtk
${PLIST.fep}bin/uim-fep
${PLIST.fep}bin/uim-fep-tick
${PLIST.gtk}bin/uim-im-switcher-gtk
${PLIST.qt}bin/uim-im-switcher-qt
+${PLIST.qt4}bin/uim-im-switcher-qt4
${PLIST.gtk}bin/uim-input-pad-ja
${PLIST.m17nlib}bin/uim-m17nlib-relink-icons
bin/uim-module-manager
${PLIST.gtk}bin/uim-pref-gtk
${PLIST.qt}bin/uim-pref-qt
+${PLIST.qt4}bin/uim-pref-qt4
bin/uim-sh
${PLIST.gtk}bin/uim-toolbar-gtk
${PLIST.gtk}bin/uim-toolbar-gtk-systray
${PLIST.qt}bin/uim-toolbar-qt
+${PLIST.qt4}bin/uim-toolbar-qt4
${PLIST.xim}bin/uim-xim
include/uim/plugin.h
include/uim/uim-custom.h
@@ -28,11 +32,13 @@
${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server
${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
${PLIST.kde}lib/kde3/uim_panelapplet.la
+${PLIST.kde4}lib/kde4/plasma_applet_uim.so
lib/libuim-custom.la
lib/libuim-scm.la
lib/libuim.la
lib/pkgconfig/uim.pc
${PLIST.anthy}lib/uim/plugin/libuim-anthy.la
+${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la
${PLIST.canna}lib/uim/plugin/libuim-canna.la
lib/uim/plugin/libuim-custom-enabler.la
${PLIST.editline}lib/uim/plugin/libuim-editline.la
@@ -44,9 +50,11 @@
${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
${PLIST.gtk}libexec/uim-candwin-gtk
${PLIST.qt}libexec/uim-candwin-qt
+${PLIST.qt4}libexec/uim-candwin-qt4
libexec/uim-helper-server
${PLIST.gnome}libexec/uim-toolbar-applet
${PLIST.xim}man/man1/uim-xim.1
+${PLIST.qt4}qt4/plugins/inputmethods/libuiminputcontextplugin.la
share/applications/uim.desktop
share/doc/uim/COMPATIBILITY
share/doc/uim/CUSTOM
@@ -61,9 +69,11 @@
share/doc/uim/uim-fep/README
share/doc/uim/uim-fep/README.ja
${PLIST.kde}share/kde/apps/kicker/applets/uimapplet.desktop
+${PLIST.kde4}share/kde4/services/plasma-applet-uim.desktop
share/locale/fr/LC_MESSAGES/uim.mo
share/locale/ja/LC_MESSAGES/uim.mo
${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
+${PLIST.qt4}share/locale/ja/LC_MESSAGES/uim-chardict-qt4.mo
share/locale/ko/LC_MESSAGES/uim.mo
share/uim/action.scm
share/uim/anthy-custom.scm
@@ -94,7 +104,7 @@
share/uim/hangul.scm
share/uim/hangul2.scm
share/uim/hangul3.scm
-${PLIST.qt}share/uim/helperdata/bushu.t
+${PLIST.helperdata}share/uim/helperdata/bushu.t
${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml
share/uim/i18n.scm
share/uim/ichar.scm
@@ -130,6 +140,7 @@
share/uim/mana.scm
share/uim/pinyin-big5.scm
share/uim/pixmaps/anthy.png
+share/uim/pixmaps/anthy-utf8.png
share/uim/pixmaps/byeoru.png
share/uim/pixmaps/byeoru.svg
share/uim/pixmaps/canna.png
diff -Nru uim.orig/distinfo uim/distinfo
--- uim.orig/distinfo 2009-01-23 22:40:32.000000000 +0900
+++ uim/distinfo 2009-12-20 18:22:42.000000000 +0900
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.15 2009/01/23 13:40:32 obache Exp $
-SHA1 (uim-1.5.5.tar.bz2) = d688f962073f0f95391fa38cb82ee5703c2ff3b8
-RMD160 (uim-1.5.5.tar.bz2) = ac3815658d02abde9d2bf68b90f3e3777734d7e9
-Size (uim-1.5.5.tar.bz2) = 3259238 bytes
+SHA1 (uim-1.5.7.tar.bz2) = fbea2590286ddc857a7824d8544cb08842f4299f
+RMD160 (uim-1.5.7.tar.bz2) = 037677cd583c2b69293fbbc1c0393756d7c7adac
+Size (uim-1.5.7.tar.bz2) = 3330555 bytes
SHA1 (patch-ab) = 81693dd1b62bec4deb99b469a0b8e53ff11e86a8
SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
+SHA1 (patch-ad) = d02f5169b4dcf76da2e8a60d9f75e65b34f2683e
diff -Nru uim.orig/options.mk uim/options.mk
--- uim.orig/options.mk 2009-10-01 21:30:32.000000000 +0900
+++ uim/options.mk 2009-12-20 18:10:10.000000000 +0900
@@ -1,14 +1,14 @@
# $NetBSD: options.mk,v 1.17 2009/10/01 12:30:32 obache Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.uim
-#PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk kde m17nlib qt prime
sj3 uim-fep wnn xim
-PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk kde m17nlib qt prime uim-fep
xim
+#PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk kde kde4 m17nlib qt
qt4 prime sj3 uim-fep wnn xim
+PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk kde kde4 m17nlib qt qt4 prime
uim-fep xim
PKG_SUGGESTED_OPTIONS= anthy canna gtk uim-fep xim
.include "../../mk/bsd.options.mk"
PLIST_VARS+= helperdata uim-dict-gtk fep
-PLIST_VARS+= anthy canna gnome gtk kde m17nlib prime qt sj3 wnn xim
+PLIST_VARS+= anthy canna gnome gtk kde kde4 m17nlib prime qt qt4 sj3
wnn xim
.if !empty(PKG_OPTIONS:Mxim)
.include "../../x11/libX11/buildlink3.mk"
@@ -34,7 +34,7 @@
.if !empty(PKG_OPTIONS:Manthy)
. include "../../inputmethod/anthy/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-dict
+CONFIGURE_ARGS+= --enable-dict --with-anthy-utf8
PLIST.anthy= yes
. if !empty(PKG_OPTIONS:Mgtk)
PLIST.helperdata= yes
@@ -53,6 +53,7 @@
.if !empty(PKG_OPTIONS:Meb)
.include "../../textproc/eb/buildlink3.mk"
CONFIGURE_ARGS+= --with-eb
+CONFIGURE_ARGS+= --with-eb-conf=$(BUILDLINK_PREFIX.eb)/etc/eb.conf
.endif
.if !empty(PKG_OPTIONS:Mgnome)
@@ -80,6 +81,16 @@
PLIST.kde= yes
.endif
+.if !empty(PKG_OPTIONS:Mkde4)
+. include "../../x11/kdelibs4/buildlink3.mk"
+. include "../../x11/qt4-libs/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-kde4-applet
+PLIST.kde4= yes
+PLIST.qt4= yes
+.else
+CONFIGURE_ARGS+= --disable-kde4-applet
+.endif
+
.if !empty(PKG_OPTIONS:Mm17nlib)
. include "../../devel/m17n-lib/buildlink3.mk"
DEPENDS+= m17n-contrib-[0-9]*:../../misc/m17n-contrib
@@ -99,6 +110,14 @@
PLIST.qt= yes
.endif
+.if !empty(PKG_OPTIONS:Mqt4) || !empty(PKG_OPTIONS:Mkde4)
+. include "../../x11/qt4-libs/buildlink3.mk"
+. include "../../x11/qt4-tools/buildlink3.mk"
+CONFIGURE_ARGS+= --with-qt4 --with-qt4-immodule
+PLIST.helperdata= yes
+PLIST.qt4= yes
+.endif
+
.if !empty(PKG_OPTIONS:Mprime)
. include "../../inputmethod/prime/buildlink3.mk"
CONFIGURE_ARGS+= --with-prime
@@ -120,3 +139,21 @@
#CONFIGURE_ARGS+=
--with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
#PLIST.wnn= yes
#.endif
+
+.if !empty(PKG_OPTIONS:Mqt4)
+.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
+pre-extract:
+ @${ECHO} "****************************************"
+ @${ECHO} " 'qt4' conflict with 'qt' or 'kde'
+ @${ECHO} "****************************************"
+ ${FALSE}
+.endif
+.elif !empty(PKG_OPTIONS:Mqt)
+.if !empty(PKG_OPTIONS:Mkde4)
+pre-extract:
+ @${ECHO} "****************************************"
+ @${ECHO} " 'qt' conflict with 'kde4'
+ @${ECHO} "****************************************"
+ ${FALSE}
+.endif
+.endif
diff -Nru uim.orig/patches/patch-ad uim/patches/patch-ad
--- uim.orig/patches/patch-ad 1970-01-01 09:00:00.000000000 +0900
+++ uim/patches/patch-ad 2009-12-20 18:22:37.000000000 +0900
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- qt4/toolbar/CMakeLists.txt.orig 2009-12-20 12:32:01.000000000 +0900
++++ qt4/toolbar/CMakeLists.txt 2009-12-20 12:57:41.000000000 +0900
+@@ -12,6 +12,9 @@
+ common-quimhelpertoolbar.cpp
+ common-uimstateindicator.cpp
+ applet-kde4.cpp)
++
++# pkgsrc patch: install failed at RPATH replace process. Skip it.
++set(CMAKE_SKIP_RPATH TRUE)
+
+ kde4_add_plugin(plasma_applet_uim ${uim_SRCS})
+ target_link_libraries(plasma_applet_uim ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}
Home |
Main Index |
Thread Index |
Old Index