From 6758fcdfc5b4febda12137c5b90ffb697b68abf4a0acf0f9d742b60051562cb0 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 5 Sep 2011 15:56:34 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/uim revision 31.0 OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=6256a9b58d866036a4e032c30a3ac801 --- uim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 095c2d1..fc9f607 100644 --- a/uim.spec +++ b/uim.spec @@ -49,7 +49,7 @@ BuildRequires: xemacs BuildRequires: fdupes %endif Version: 1.7.1 -Release: 18 +Release: 20 # xorg-x11-libXdmcp-devel libgnomeprintui-devel License: GPLv2+ Summary: A multilingual input method library From e9e5dacc432a2c9b91b9313a15e8e829fafa4cf36c577f088578d1281a84a97c Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Wed, 12 Oct 2011 22:57:21 +0000 Subject: [PATCH 2/3] Accepting request 87514 from home:Ansus:branches:M17N - enable kde3 applet - rename uim-qt to uim-qt3 - remove obsolete version check OBS-URL: https://build.opensuse.org/request/show/87514 OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=27 --- uim.changes | 7 +++++++ uim.spec | 32 ++++++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/uim.changes b/uim.changes index aab8e96..17b215b 100644 --- a/uim.changes +++ b/uim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 12 12:28:44 UTC 2011 - anixx@opensuse.org + +- enable kde3 applet +- rename uim-qt to uim-qt3 +- remove obsolete version check + ------------------------------------------------------------------- Mon Sep 5 10:49:11 UTC 2011 - coolo@suse.com diff --git a/uim.spec b/uim.spec index fc9f607..037ce32 100644 --- a/uim.spec +++ b/uim.spec @@ -43,11 +43,10 @@ BuildRequires: pkgconfig(gtk+-3.0) %endif BuildRequires: gnome-panel-devel BuildRequires: qt3-devel +BuildRequires: kdebase3-devel BuildRequires: update-desktop-files BuildRequires: xemacs -%if 0%{?suse_version} > 1020 BuildRequires: fdupes -%endif Version: 1.7.1 Release: 20 # xorg-x11-libXdmcp-devel libgnomeprintui-devel @@ -118,14 +117,16 @@ Provides: locale(gnome-libs:ja) %description applet-gnome GNOME applet for uim -%package qt +%package qt3 License: GPLv2+ Summary: Qt3 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} Provides: locale(qt3:ja) +Provides: uim-qt = %{version} +Obsoletes: uim-qt -%description qt +%description qt3 Qt3 input module plugin for uim %package qt4 @@ -139,6 +140,17 @@ Provides: locale(libqt4:ja) %description qt4 Qt4 input module plugin for uim +%package kde3 +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 +provide secure and useful input methods for all +languages. + %prep %setup0 -q %patch10 -p1 @@ -158,7 +170,9 @@ cp po/Makefile.in.in qt4/chardict/po --with-qt\ --with-qt-immodule \ --with-qt4 \ - --with-qt4-immodule + --with-qt4-immodule \ + --enable-kde-applet + make %{?_smp_mflags} %install @@ -314,7 +328,7 @@ uim-module-manager --register \ %{_libdir}/bonobo/servers/* %endif -%files qt -f uim-chardict-qt.lang +%files qt3 -f uim-chardict-qt.lang %defattr(-, root, root) %{_bindir}/uim-*-qt %{_prefix}/lib/uim/uim-*-qt @@ -326,4 +340,10 @@ uim-module-manager --register \ %{_prefix}/lib/uim/uim-*-qt4 %{_libdir}/qt4/plugins/inputmethods/*.so +%files kde3 +%defattr (-, root, root, -) +%doc AUTHORS COPYING ChangeLog* NEWS README +/opt/kde3/%_lib/kde3/uim_panelapplet.so +/opt/kde3/share/apps/kicker/applets/uimapplet.desktop + %changelog From e84240e0c24e6cd06f1f5122cb7b1cc4dba445ec4df526c6bc4296414d5827fa Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 13 Oct 2011 14:24:44 +0000 Subject: [PATCH 3/3] Accepting request 87723 from home:tiwai:branches:M17N - 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 --- baselibs.conf | 4 +++- uim-fix-crash-in-firefox.diff | 38 +++++++++++++++++++++++++++++++++++ uim.changes | 6 ++++++ uim.spec | 10 +++++---- 4 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 uim-fix-crash-in-firefox.diff diff --git a/baselibs.conf b/baselibs.conf index 685d0d1..2afcfec 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -23,7 +23,9 @@ uim-gtk3 postun "%{_bindir}/gtk-query-immodules-3.0 --update-cache" postun "%endif" supplements "packageand(uim:gtk3-)" -uim-qt +uim-qt3 supplements "packageand(uim:qt3-)" + obsoletes "uim-qt-" + provides "uim-qt- = " uim-qt4 supplements "packageand(uim:libqt4-)" diff --git a/uim-fix-crash-in-firefox.diff b/uim-fix-crash-in-firefox.diff new file mode 100644 index 0000000..0659a62 --- /dev/null +++ b/uim-fix-crash-in-firefox.diff @@ -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", diff --git a/uim.changes b/uim.changes index 17b215b..5365376 100644 --- a/uim.changes +++ b/uim.changes @@ -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 diff --git a/uim.spec b/uim.spec index 037ce32..e6e47e8 100644 --- a/uim.spec +++ b/uim.spec @@ -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