rpms/scim/FC-3 gtkimm-clear-preedit-on-reset-174143.patch, NONE, 1.1 rawcode-unicode-maxlength.patch, NONE, 1.1 scim-panjabi-punjabi.patch, NONE, 1.1 scim.pc-versioned-moduledir-179706.patch, NONE, 1.1 scim.spec, 1.18, 1.19 scim-gtk-langs-167090.patch, 1.1, NONE
Jens Petersen (petersen)
fedora-extras-commits at redhat.com
Fri Feb 24 02:57:59 UTC 2006
- Previous message (by thread): rpms/scim/FC-4 gtkimm-clear-preedit-on-reset-174143.patch, NONE, 1.1 rawcode-unicode-maxlength.patch, NONE, 1.1 scim-panjabi-punjabi.patch, NONE, 1.1 scim.pc-versioned-moduledir-179706.patch, NONE, 1.1
- Next message (by thread): rpms/scim/FC-3 .cvsignore,1.5,1.6 sources,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: petersen
Update of /cvs/extras/rpms/scim/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19132
Modified Files:
scim.spec
Added Files:
gtkimm-clear-preedit-on-reset-174143.patch
rawcode-unicode-maxlength.patch scim-panjabi-punjabi.patch
scim.pc-versioned-moduledir-179706.patch
Removed Files:
scim-gtk-langs-167090.patch
Log Message:
sync with FC-4 branch:
* Fri Feb 24 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-1%{?dist}
- update to 1.4.4 release
- sync with core devel package:
* Wed Feb 22 2006 Jens Petersen <petersen at redhat.com>
- fix Punjabi spelling with scim-panjabi-punjabi.patch (aalam)
* Thu Feb 9 2006 Jens Petersen <petersen at redhat.com>
- do not change scim_binary_version in scim.pc-versioned-moduledir-179706.patch
* Fri Feb 3 2006 Jens Petersen <petersen at redhat.com>
- add gtkimm-clear-preedit-on-reset-174143.patch to clear the preedit buffer
when IME turned off (Qian Shen, #174143)
- add rawcode-unicode-maxlength.patch to improve input of unicode codes
(James Su, #173102)
- add scim.pc-versioned-moduledir-179706.patch to include api version in
moduledir in scim.pc so that IMEs get installed in versioned dir by default
(Akira Tagoh, #179706)
* Fri Jan 13 2006 Jens Petersen <petersen at redhat.com>
- update to 1.4.4 bugfix release
- scim-gtk-langs-167090.patch no longer needed since 1.4.3
- move scim dl modules to scim-libs for multilib to work correctly
- define %%scim_api
gtkimm-clear-preedit-on-reset-174143.patch:
--- NEW FILE gtkimm-clear-preedit-on-reset-174143.patch ---
--- scim-1.4.4/extras/gtk2_immodule/gtkimcontextscim.cpp.orig 2005-12-06 10:11:27.732624776 +0800
+++ scim-1.4.4/extras/gtk2_immodule/gtkimcontextscim.cpp 2005-12-02 15:36:36.000000000 +0800
@@ -1256,8 +1256,10 @@
if (hotkey_action == SCIM_FRONTEND_HOTKEY_TRIGGER) {
if (!ic->impl->is_on)
turn_on_ic (ic);
- else
+ else {
+ ic->impl->si->reset();
turn_off_ic (ic);
+ }
ret = true;
} else if (hotkey_action == SCIM_FRONTEND_HOTKEY_ON) {
if (!ic->impl->is_on)
rawcode-unicode-maxlength.patch:
--- NEW FILE rawcode-unicode-maxlength.patch ---
Index: modules/IMEngine/scim_rawcode_imengine.cpp
===================================================================
RCS file: /cvsroot/scim/scim/modules/IMEngine/scim_rawcode_imengine.cpp,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- modules/IMEngine/scim_rawcode_imengine.cpp 12 Jan 2006 07:00:36 -0000 1.7.2.5
+++ modules/IMEngine/scim_rawcode_imengine.cpp 18 Jan 2006 05:44:52 -0000 1.7.2.6
@@ -23,7 +23,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA
*
- * $Id: scim_rawcode_imengine.cpp,v 1.7.2.5 2006/01/12 07:00:36 suzhe Exp $
+ * $Id: scim_rawcode_imengine.cpp,v 1.7.2.6 2006/01/18 05:44:52 suzhe Exp $
*
*/
@@ -430,9 +430,20 @@
}
if (m_unicode) {
- if (m_preedit_string.length () >= 3 && m_preedit_string.length () < 6 && create_lookup_table () > 0) {
+ size_t maxlen = 6;
+
+ if (m_preedit_string.length () > 0) {
+ if (m_preedit_string [0] == '0')
+ maxlen = 4;
+ else if (m_preedit_string [0] == '1')
+ maxlen = 6;
+ else
+ maxlen = 5;
+ }
+
+ if (m_preedit_string.length () >= 3 && m_preedit_string.length () < maxlen && create_lookup_table () > 0) {
update_lookup_table (m_lookup_table);
- } else if (m_preedit_string.length () == 6) {
+ } else if (m_preedit_string.length () == maxlen) {
WideString str;
ucs4_t code = get_unicode_value (m_preedit_string);
scim-panjabi-punjabi.patch:
--- NEW FILE scim-panjabi-punjabi.patch ---
Index: ChangeLog
===================================================================
RCS file: /cvsroot/scim/scim/ChangeLog,v
retrieving revision 1.67
diff -u -r1.67 ChangeLog
--- ChangeLog 28 Dec 2005 15:48:11 -0000 1.67
+++ ChangeLog 22 Feb 2006 02:50:49 -0000
@@ -1,3 +1,7 @@
+2006-02-22 Jens Petersen <petersen at redhat.com>
+
+ * src/scim_utility.cpp (__languages): Name of pa is Punjabi.
+
2005-12-28 14:29 James Su <suzhe at tsinghua.org.cn>
* THANKS (1.8):
Index: po/cs.po
===================================================================
RCS file: /cvsroot/scim/scim/po/cs.po,v
retrieving revision 1.19
diff -u -r1.19 cs.po
--- po/cs.po 16 Dec 2005 12:23:41 -0000 1.19
+++ po/cs.po 22 Feb 2006 02:50:49 -0000
@@ -274,7 +274,7 @@
msgstr "Orijština"
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
+msgid "Punjabi"
msgstr "Pandžábština"
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
Index: po/de.po
===================================================================
RCS file: /cvsroot/scim/scim/po/de.po,v
retrieving revision 1.40
diff -u -r1.40 de.po
--- po/de.po 18 Dec 2005 10:20:20 -0000 1.40
+++ po/de.po 22 Feb 2006 02:50:49 -0000
@@ -273,7 +273,7 @@
msgstr "Orija"
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
+msgid "Punjabi"
msgstr "Pandschabi"
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
Index: po/fr.po
===================================================================
RCS file: /cvsroot/scim/scim/po/fr.po,v
retrieving revision 1.32
diff -u -r1.32 fr.po
--- po/fr.po 16 Dec 2005 12:23:41 -0000 1.32
+++ po/fr.po 22 Feb 2006 02:50:49 -0000
@@ -271,8 +271,8 @@
msgstr "Oriya"
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
-msgstr "Panjabi"
+msgid "Punjabi"
+msgstr "Punjabi"
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
msgid "Polish"
Index: po/it.po
===================================================================
RCS file: /cvsroot/scim/scim/po/it.po,v
retrieving revision 1.22
diff -u -r1.22 it.po
--- po/it.po 16 Dec 2005 12:23:41 -0000 1.22
+++ po/it.po 22 Feb 2006 02:50:49 -0000
@@ -273,8 +273,8 @@
msgstr "Oriya"
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
-msgstr "Panjabi"
+msgid "Punjabi"
+msgstr "Punjabi"
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
msgid "Polish"
Index: po/ja.po
===================================================================
RCS file: /cvsroot/scim/scim/po/ja.po,v
retrieving revision 1.52
diff -u -r1.52 ja.po
--- po/ja.po 16 Dec 2005 12:23:41 -0000 1.52
+++ po/ja.po 22 Feb 2006 02:50:50 -0000
@@ -269,7 +269,7 @@
msgstr "オリヤー語"
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
+msgid "Punjabi"
msgstr "パンジャブ語"
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
Index: po/ko.po
===================================================================
RCS file: /cvsroot/scim/scim/po/ko.po,v
retrieving revision 1.42
diff -u -r1.42 ko.po
--- po/ko.po 18 Dec 2005 10:20:21 -0000 1.42
+++ po/ko.po 22 Feb 2006 02:50:50 -0000
@@ -271,7 +271,7 @@
msgstr "오리야어"
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
+msgid "Punjabi"
msgstr "펀ìžë¸Œì–´"
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
Index: po/pa.po
===================================================================
RCS file: /cvsroot/scim/scim/po/pa.po,v
retrieving revision 1.6
diff -u -r1.6 pa.po
--- po/pa.po 16 Dec 2005 12:23:41 -0000 1.6
+++ po/pa.po 22 Feb 2006 02:50:50 -0000
@@ -273,7 +273,7 @@
msgstr "ਓੜੀਆ"
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
+msgid "Punjabi"
msgstr "ਪੰਜਾਬੀ"
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
Index: po/scim.pot
===================================================================
RCS file: /cvsroot/scim/scim/po/scim.pot,v
retrieving revision 1.111
diff -u -r1.111 scim.pot
--- po/scim.pot 16 Dec 2005 12:23:41 -0000 1.111
+++ po/scim.pot 22 Feb 2006 02:50:50 -0000
@@ -270,7 +270,7 @@
msgstr ""
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
+msgid "Punjabi"
msgstr ""
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
Index: po/zh_CN.po
===================================================================
RCS file: /cvsroot/scim/scim/po/zh_CN.po,v
retrieving revision 1.157
diff -u -r1.157 zh_CN.po
--- po/zh_CN.po 16 Dec 2005 12:23:41 -0000 1.157
+++ po/zh_CN.po 22 Feb 2006 02:50:50 -0000
@@ -269,7 +269,7 @@
msgstr "奥里雅è¯"
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
+msgid "Punjabi"
msgstr "æ—é®æ™®è¯"
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
Index: po/zh_TW.po
===================================================================
RCS file: /cvsroot/scim/scim/po/zh_TW.po,v
retrieving revision 1.158
diff -u -r1.158 zh_TW.po
--- po/zh_TW.po 18 Dec 2005 10:20:21 -0000 1.158
+++ po/zh_TW.po 22 Feb 2006 02:50:50 -0000
@@ -267,7 +267,7 @@
msgstr "奧里雅語"
#: ../src/scim_utility.cpp:756
-msgid "Panjabi"
+msgid "Punjabi"
msgstr "æ—é®æ™®èªž"
#: ../src/scim_utility.cpp:757 ../src/scim_keyboard_layout_data.h:4613
Index: src/scim_utility.cpp
===================================================================
RCS file: /cvsroot/scim/scim/src/scim_utility.cpp,v
retrieving revision 1.49
diff -u -r1.49 scim_utility.cpp
--- src/scim_utility.cpp 16 Feb 2006 05:13:34 -0000 1.49
+++ src/scim_utility.cpp 22 Feb 2006 02:50:50 -0000
@@ -757,7 +757,7 @@
{ "nn_NO", NULL, N_("Norwegian (nynorsk)"), "Norsk (nynorsk)", NULL },
{ "no_NO", NULL, N_("Norwegian (bokmal)"), "Norsk (bokmål)", NULL },
{ "or_IN", NULL, N_("Oriya"), NULL, NULL },
- { "pa_IN", NULL, N_("Panjabi"), NULL, NULL },
+ { "pa_IN", NULL, N_("Punjabi"), NULL, NULL },
{ "pl_PL", NULL, N_("Polish"), "Polski", NULL },
{ "pt", "pt_PT", N_("Portuguese"), "Português", NULL },
{ "pt_BR", NULL, N_("Portuguese (Brazil)"), "Português do Brasil", NULL },
scim.pc-versioned-moduledir-179706.patch:
--- NEW FILE scim.pc-versioned-moduledir-179706.patch ---
diff -u scim-1.4.4/scim.pc.in~ scim-1.4.4/scim.pc.in
--- scim-1.4.4/scim.pc.in~ 2006-02-03 23:38:44.000000000 +0900
+++ scim-1.4.4/scim.pc.in 2006-02-03 23:38:44.000000000 +0900
@@ -8,7 +8,7 @@
scimdatadir=@datadir@/scim
icondir=@datadir@/scim/icons
-moduledir=@libdir@/scim-1.0
+moduledir=@libdir@/scim-1.0/@SCIM_BINARY_VERSION@
scim_binary_version=@SCIM_BINARY_VERSION@
Index: scim.spec
===================================================================
RCS file: /cvs/extras/rpms/scim/FC-3/scim.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scim.spec 2 Nov 2005 08:53:59 -0000 1.18
+++ scim.spec 24 Feb 2006 02:57:59 -0000 1.19
@@ -1,7 +1,9 @@
+%define scim_api 1.4.0
+
Name: scim
-Version: 1.4.2
+Version: 1.4.4
# must be less than the release number of scim in Core
-Release: 5%{?dist}
+Release: 1%{?dist}
Summary: Smart Common Input Method platform
License: LGPL
@@ -16,7 +18,10 @@
# for autoreconf
Buildrequires: gettext-devel
Patch1: scim-add-restart.patch
-Patch2: scim-gtk-langs-167090.patch
+Patch2: gtkimm-clear-preedit-on-reset-174143.patch
+Patch3: rawcode-unicode-maxlength.patch
+Patch4: scim.pc-versioned-moduledir-179706.patch
+Patch5: scim-panjabi-punjabi.patch
%description
SCIM is a user friendly and full featured input method user interface and
@@ -53,7 +58,10 @@
%prep
%setup -q
%patch1 -p1 -b .1-restart
-%patch2 -p1 -b .2-langs
+%patch2 -p1 -b .2-reset
+%patch3 -p0 -b .3-unicode
+%patch4 -p1 -b .4-moduledir
+%patch5 -p0 -b .5-panjabi
# patch1 touches configure.ac and src/Makefile.am
autoreconf
@@ -132,6 +140,7 @@
%{_sysconfdir}/X11/xinit/xinput.d
%{_bindir}/*
%{_libdir}/scim-1.0
+%exclude %{_libdir}/scim-1.0/%{scim_api}
%{_datadir}/scim
%{_datadir}/pixmaps/*
%{_datadir}/applications/fedora-scim-setup.desktop
@@ -151,9 +160,35 @@
%defattr(-,root,root,-)
%{_libdir}/libscim-*.so.*
%{_libdir}/gtk-2.0/immodules
+%{_libdir}/scim-1.0/%{scim_api}
%changelog
+* Fri Feb 24 2006 Jens Petersen <petersen at redhat.com> - 1.4.4-1%{?dist}
+- update to 1.4.4 release
+- sync with core devel package:
+
+* Wed Feb 22 2006 Jens Petersen <petersen at redhat.com>
+- fix Punjabi spelling with scim-panjabi-punjabi.patch (aalam)
+
+* Thu Feb 9 2006 Jens Petersen <petersen at redhat.com>
+- do not change scim_binary_version in scim.pc-versioned-moduledir-179706.patch
+
+* Fri Feb 3 2006 Jens Petersen <petersen at redhat.com>
+- add gtkimm-clear-preedit-on-reset-174143.patch to clear the preedit buffer
+ when IME turned off (Qian Shen, #174143)
+- add rawcode-unicode-maxlength.patch to improve input of unicode codes
+ (James Su, #173102)
+- add scim.pc-versioned-moduledir-179706.patch to include api version in
+ moduledir in scim.pc so that IMEs get installed in versioned dir by default
+ (Akira Tagoh, #179706)
+
+* Fri Jan 13 2006 Jens Petersen <petersen at redhat.com>
+- update to 1.4.4 bugfix release
+ - scim-gtk-langs-167090.patch no longer needed since 1.4.3
+- move scim dl modules to scim-libs for multilib to work correctly
+ - define %%scim_api
+
* Tue Nov 1 2005 Jens Petersen <petersen at redhat.com> - 1.4.2-5%{?dist}
- avoid errors in postun script when uninstalling
--- scim-gtk-langs-167090.patch DELETED ---
- Previous message (by thread): rpms/scim/FC-4 gtkimm-clear-preedit-on-reset-174143.patch, NONE, 1.1 rawcode-unicode-maxlength.patch, NONE, 1.1 scim-panjabi-punjabi.patch, NONE, 1.1 scim.pc-versioned-moduledir-179706.patch, NONE, 1.1
- Next message (by thread): rpms/scim/FC-3 .cvsignore,1.5,1.6 sources,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list