rpm/uim
SHA256
1
0
Fork 0
forked from pool/uim
Code Pull Requests Activity

Accepting request 87723 from home:tiwai:branches:M17N

Browse Source 
- Add missing obsoletes/provides for uim-qt3 in baselibs.conf
- Fix crash and a registration issue in Firefox (bnc#723899)

OBS-URL: https://build.opensuse.org/request/show/87723
OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=28
This commit is contained in:
Takashi Iwai
2011-10-13 14:24:44 +00:00
committed by Git OBS Bridge
parent e9e5dacc43
commit e84240e0c2
4 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
baselibs.conf
View File

@@ -23,7 +23,9 @@ uim-gtk3
postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache"
postun "%endif"
supplements "packageand(uim:gtk3-<targettype>)"
uim-qt
uim-qt3
supplements "packageand(uim:qt3-<targettype>)"
obsoletes "uim-qt-<targettype>"
provides "uim-qt-<targettype> = <version>"
uim-qt4
supplements "packageand(uim:libqt4-<targettype>)"

38
uim-fix-crash-in-firefox.diff Normal file
View File

@@ -0,0 +1,38 @@
---
gtk/compose.c | 1 +
gtk/uim-cand-win-gtk.c | 2 +-
gtk/uim-cand-win-tbl-gtk.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
--- a/gtk/compose.c
+++ b/gtk/compose.c
@@ -767,6 +767,7 @@
im_uim_release_compose_tree()
{
FreeComposeTree(g_tree);
+ g_tree = NULL;
}
static int
--- a/gtk/uim-cand-win-gtk.c
+++ b/gtk/uim-cand-win-gtk.c
@@ -107,7 +107,7 @@
GType
uim_cand_win_gtk_register_type(GTypeModule *module)
{
- if (!cand_win_type)
+ //if (!cand_win_type)
cand_win_type = g_type_module_register_type(module,
GTK_TYPE_WINDOW,
"UIMCandWinGtk",
--- a/gtk/uim-cand-win-tbl-gtk.c
+++ b/gtk/uim-cand-win-tbl-gtk.c
@@ -136,7 +136,7 @@
GType
uim_cand_win_tbl_gtk_register_type(GTypeModule *module)
{
- if (!cand_win_tbl_type)
+ //if (!cand_win_tbl_type)
cand_win_tbl_type = g_type_module_register_type(module,
UIM_TYPE_CAND_WIN_GTK,
"UIMCandWinTblGtk",

6
uim.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Oct 13 15:43:14 CEST 2011 - tiwai@suse.de
- Add missing obsoletes/provides for uim-qt3 in baselibs.conf
- Fix crash and a registration issue in Firefox (bnc#723899)
-------------------------------------------------------------------
Wed Oct 12 12:28:44 UTC 2011 - anixx@opensuse.org

10
uim.spec
View File

@@ -61,6 +61,7 @@ Source3: etc-x11-xim.d-uim
Source4: baselibs.conf
Patch10: uim-sigscheme-build-fixes.diff
Patch11: fix-libs.patch
Patch12: uim-fix-crash-in-firefox.diff
PreReq: %{_bindir}/touch
Provides: locale(xorg-x11:ja)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -141,10 +142,10 @@ Provides: locale(libqt4:ja)
Qt4 input module plugin for uim
%package kde3
Summary: KDE3 Applet for Uim
Group: User Interface/Desktops
Requires: uim = %{version}-%{release}
Requires: uim-qt3
Summary: KDE3 Applet for Uim
Group: User Interface/Desktops
Requires: uim = %{version}-%{release}
Requires: uim-qt3
%description kde3
Uim is a multilingual input method library. Uim aims to
@@ -155,6 +156,7 @@ languages.
%setup0 -q
%patch10 -p1
%patch11 -p1
%patch12 -p1
cp emacs/README README.emacs
iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs