rpms/tgif/F-7 tgif-4.1.44-xim-bad-focus.patch, NONE, 1.1 tgif.spec, 1.1, 1.2
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Wed Jul 11 12:55:24 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/tgif/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8105/F-7
Modified Files:
tgif.spec
Added Files:
tgif-4.1.44-xim-bad-focus.patch
Log Message:
* Wed Jul 11 2007 MATSUURA Takanori <t.matsuu at gmail.com> - 4.1.45-4
- based on tgif-4.1.44-0vl6.src.rpm from VineSeed main
- use scalable bitmap font
tgif-4.1.44-xim-bad-focus.patch:
--- NEW FILE tgif-4.1.44-xim-bad-focus.patch ---
--- tgif-QPL-4.1.44/convxim.c.orig 2005-01-15 09:26:19.000000000 +0900
+++ tgif-QPL-4.1.44/convxim.c 2007-04-06 23:50:33.000000000 +0900
@@ -69,6 +69,10 @@
static Bool _XIMErrorFlag = False;
static Bool overthespot = False;
+static Bool modscim = False;
+static int pre_x = 0;
+static int pre_y = 0;
+
#ifndef _NO_XIMP
static MYIOErrHandler *_XipSetIOErrorHandler(new_handler)
MYIOErrHandler *new_handler;
@@ -214,6 +218,14 @@
Msg(buf);
}
+ for (i = 0; i <= (int)strlen(modifiers) - 4 ; i++) {
+ if (strncmp((char *)&modifiers[i], "SCIM", 4) == 0 ||
+ strncmp((char *)&modifiers[i], "scim", 4) == 0) {
+ modscim = True;
+ break;
+ }
+ }
+
if(im == NULL) {
im = XOpenIM(mainDisplay, NULL, NULL, NULL);
if(im == NULL) {
@@ -419,6 +431,9 @@
}
if (im == NULL || ic == NULL || !overthespot) return;
+ if (x == pre_x && y == pre_y) return;
+ pre_x = x; pre_y = y;
+
if (XIMfs) XFreeFontSet(dpy, XIMfs);
GetCurFontInfoStr(szAttemptedFontName, sizeof(szAttemptedFontName));
XIMfs=XCreateFontSet(dpy, szAttemptedFontName,
@@ -442,7 +457,9 @@
NULL);
XFree(preedit_attr);
XFree(status_attr);
- XSetICFocus(ic);
+ if (!modscim) {
+ XSetICFocus(ic);
+ }
}
void XIMCleanUp()
Index: tgif.spec
===================================================================
RCS file: /cvs/extras/rpms/tgif/F-7/tgif.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tgif.spec 9 Jul 2007 18:08:19 -0000 1.1
+++ tgif.spec 11 Jul 2007 12:54:52 -0000 1.2
@@ -2,8 +2,8 @@
Name: tgif
Version: 4.1.45
-Release: 3%{?dist}
-Summary: 2-D drawling tool
+Release: 4%{?dist}
+Summary: 2-D drawing tool
Group: Applications/Multimedia
License: QPL
@@ -19,6 +19,7 @@
Patch3: tgif-4.1.35-overthespot_fix.patch
# http://tyche.pu-toyama.ac.jp/~a-urasim/tgif/
Patch10: tgif-textcursor-a-urasim.patch
+Patch20: tgif-4.1.44-xim-bad-focus.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires: ImageMagick
@@ -41,6 +42,7 @@
%patch1 -p1 -b .fontcheck
%patch3 -p1 -b .overthespot
%patch10 -p0 -b textcursor
+%patch20 -p1 -b .xim-bad-focus
%{__cp} -pf %{SOURCE2} po/ja/ja.po
pushd po/ja
@@ -49,8 +51,16 @@
ja.po
popd
+# use scalable bitmap font
+for i in C ja ; do
+ %{__sed} -e s,alias\-mincho,misc\-mincho,g \
+ -e s,alias\-gothic,jis\-fixed,g \
+ -i tgif-%{Xresource_ja_ver}/${i}/Tgif.ad
+done
+
%build
%{__cp} -pf Tgif.tmpl-linux Tgif.tmpl
+%{__sed} -i.mode -e 's|0664|0644|' Tgif.tmpl
xmkmf
%{__sed} -i.mode -e 's|0444|0644|' Makefile
@@ -150,8 +160,12 @@
%{_datadir}/applications/*-%{name}.desktop
%changelog
+* Wed Jul 11 2007 MATSUURA Takanori <t.matsuu at gmail.com> - 4.1.45-4
+- based on tgif-4.1.44-0vl6.src.rpm from VineSeed main
+- use scalable bitmap font
+
* Mon Jul 9 2007 TASAKA Mamoru <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-3
-- Clean up BuildRequies
+- Clean up BuildRequires
* Thu Jul 5 2007 TASAKA Mamoru <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-2
- Explicitly set LANG=ja_JP.eucJP on ja_JP locale
@@ -160,6 +174,9 @@
* Thu Jul 5 2007 TASAKA Mamoru <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.1.45-1
- Clean up for Fedora
+* Sat Apr 07 2007 MATSUBAYASHI Kohji <shaolin at vinelinux.org> 4.1.44-0vl6
+- add Patch20 to fix problems with {scim,uim}-anthy (<BTS:512>)
+
* Thu Jan 4 2007 MATSUURA Takanori <t.matsuu at gmail.com> - 4.1.45-0vl5.1
- based on tgif-4.1.44-0vl5.src.rpm from VineSeed main
- update to 4.1.45
More information about the scm-commits
mailing list