Date: Monday, February 15, 2010 @ 11:57:43 Author: eric Revision: 68968
upgpkg: fcitx 3.6.3-1 Upstream update Modified: fcitx/trunk/PKGBUILD Deleted: fcitx/trunk/fcitx362-qt46.patch ---------------------+ PKGBUILD | 13 ++++----- fcitx362-qt46.patch | 67 -------------------------------------------------- 2 files changed, 6 insertions(+), 74 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-02-15 16:55:32 UTC (rev 68967) +++ PKGBUILD 2010-02-15 16:57:43 UTC (rev 68968) @@ -3,20 +3,19 @@ # Contributor: damir <da...@archlinux.org> pkgname=fcitx -pkgver=3.6.2 -pkgrel=2 +pkgver=3.6.3 +pkgrel=1 pkgdesc="Free Chinese Input Toy of X - Input Method Server for X window system (XIM)" arch=('i686' 'x86_64') url="http://www.fcitx.org/" license=('GPL') -depends=('libxft' 'libxpm' 'libxtst') -source=(http://www.fcitx.org/download/${pkgname}-${pkgver}.tar.bz2 fcitx362-qt46.patch) -md5sums=('6a66cda4a8221f1d6685e5a400d8763e' 'ae0ffe354cb062fbef05ecde89fa4243') -sha1sums=('3772b0883725c0fc3a9fe189db2dc7ff3b2de89c' '83f9b378f1480dafeb970302597abaf3eb58a34b') +depends=('libxft' 'libxpm' 'libxtst' 'dbus-core') +source=(http://www.fcitx.org/download/${pkgname}-${pkgver}.tar.bz2) +md5sums=('b1da30c72374d7b3d70738493d44d300') +sha1sums=('ab3af3cdaba32ac9ff054b1964a483ca07b427dd') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../fcitx362-qt46.patch || return 1 ./configure --prefix=/usr || return 1 make || return 1 make DESTDIR="${pkgdir}" install || return 1 Deleted: fcitx362-qt46.patch =================================================================== --- fcitx362-qt46.patch 2010-02-15 16:55:32 UTC (rev 68967) +++ fcitx362-qt46.patch 2010-02-15 16:57:43 UTC (rev 68968) @@ -1,67 +0,0 @@ -diff -Naur fcitx-3.6.2-orig/src/main.c fcitx-3.6.2/src/main.c ---- fcitx-3.6.2-orig/src/main.c 2009-05-26 11:54:49.000000000 -0400 -+++ fcitx-3.6.2/src/main.c 2010-02-12 00:09:23.000000000 -0500 -@@ -66,7 +66,7 @@ - #endif - - extern Display *dpy; --extern Window inputWindow; -+extern Window mainWindow; - - extern Bool bIsUtf8; - -@@ -147,7 +148,7 @@ - CreateAboutWindow (); //�������ڴ��� - - //������ɫ������ѡ�ʴ��ڵ���ɫ��Ҳ���������ڡ�~/.fcitx/config����������Щ��ɫ��Ϣ -- InitGC (inputWindow); -+ InitGC (mainWindow); - - //�����������뵽���뷨�飬����ϵͳ��ʹ���������ַ� - SetIM (); -@@ -159,7 +160,7 @@ - } - - //��ʼ�����뷨 -- if (!InitXIM (inputWindow, imname)) -+ if (!InitXIM (imname)) - exit (4); - - //�Ժ�̨��ʽ���� -diff -Naur fcitx-3.6.2-orig/src/xim.c fcitx-3.6.2/src/xim.c ---- fcitx-3.6.2-orig/src/xim.c 2009-09-14 20:21:15.000000000 -0400 -+++ fcitx-3.6.2/src/xim.c 2010-02-12 00:12:45.000000000 -0500 -@@ -463,12 +463,20 @@ - free (pS2T); - } - --Bool InitXIM (Window im_window, char *imname) -+Bool InitXIM (char *imname) - { - XIMStyles *input_styles; - XIMTriggerKeys *on_keys; - XIMEncodings *encodings; - char *p; -+ Window im_window; -+ -+ im_window = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 0, 0, 1, 1, 1, 0, 0); -+ if (im_window == (Window)NULL) { -+ fprintf(stderr, "Can't Create imWindow\n"); -+ exit(1); -+ } -+ XSelectInput(dpy, im_window, ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask|VisibilityChangeMask); - - if ( !imname ) { - imname = getenv ("XMODIFIERS"); -diff -Naur fcitx-3.6.2-orig/src/xim.h fcitx-3.6.2/src/xim.h ---- fcitx-3.6.2-orig/src/xim.h 2009-08-11 05:33:51.000000000 -0400 -+++ fcitx-3.6.2/src/xim.h 2010-02-12 00:13:21.000000000 -0500 -@@ -66,7 +66,7 @@ - position pos; - } CONNECT_ID; - --Bool InitXIM (Window, char *); -+Bool InitXIM (char *); - void SendHZtoClient (IMForwardEventStruct * call_data, char *strHZ); - void EnterChineseMode (Bool bState); - void CreateConnectID (IMOpenStruct * call_data);