pool/uim
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 126872 from M17N

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/126872
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uim?expand=0&rev=38
This commit is contained in:
Stephan Kulow 2012-07-02 10:54:43 +00:00 committed by Git OBS Bridge
commit a5a5e93962
7 changed files with 112 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fix-for-sles-qhash-incomplete-type.patch Normal file
View File

@ -0,0 +1,11 @@
diff -urN uim-1.8.1.orig/qt4/immodule/quiminputcontext.h uim-1.8.1/qt4/immodule/quiminputcontext.h
--- uim-1.8.1.orig/qt4/immodule/quiminputcontext.h 2012-07-02 12:16:36.306241316 +0800
+++ uim-1.8.1/qt4/immodule/quiminputcontext.h 2012-07-02 14:59:57.244712724 +0800
@@ -36,6 +36,7 @@
#define UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
#include <QtGui/QInputContext>
+#include <QHash>
#ifdef Q_WS_X11
#define UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK 1

3
uim-1.7.3.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d2909d2d624a92677935461ce03413f33b7e5af6e19796410406628e59bd561c
size 6380469

3
uim-1.8.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18c9a29e11f543b560bcf5d678f1d915cd73c1fef99725188b2d910f1c3ff8eb
size 6478153

59
uim-fix-crash-in-firefox.diff
View File

@ -1,12 +1,31 @@
---
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 @@
diff -urN uim-1.8.1.orig/gtk2/candwin/gtk.c uim-1.8.1/gtk2/candwin/gtk.c
--- uim-1.8.1.orig/gtk2/candwin/gtk.c 2012-07-02 12:16:36.478239165 +0800
+++ uim-1.8.1/gtk2/candwin/gtk.c 2012-07-02 12:23:32.987032088 +0800
@@ -186,7 +186,7 @@
GType
candidate_window_get_type(void)
{
- if (!candidate_window_type)
+ //if (!candidate_window_type)
candidate_window_type = g_type_register_static(GTK_TYPE_WINDOW,
"UIMCandWinGtk", &object_info, (GTypeFlags)0);
return candidate_window_type;
diff -urN uim-1.8.1.orig/gtk2/candwin/tbl-gtk.c uim-1.8.1/gtk2/candwin/tbl-gtk.c
--- uim-1.8.1.orig/gtk2/candwin/tbl-gtk.c 2012-07-02 12:16:36.478239165 +0800
+++ uim-1.8.1/gtk2/candwin/tbl-gtk.c 2012-07-02 12:24:03.652648716 +0800
@@ -223,7 +223,7 @@
GType
candidate_window_get_type(void)
{
- if (!candidate_window_type)
+ //if (!candidate_window_type)
candidate_window_type = g_type_register_static(GTK_TYPE_WINDOW,
"UIMCandWinTblGtk", &object_info, (GTypeFlags)0);
return candidate_window_type;
diff -urN uim-1.8.1.orig/gtk2/immodule/compose.c uim-1.8.1/gtk2/immodule/compose.c
--- uim-1.8.1.orig/gtk2/immodule/compose.c 2012-07-02 12:16:36.476239191 +0800
+++ uim-1.8.1/gtk2/immodule/compose.c 2012-07-02 12:21:29.620574380 +0800
@@ -770,6 +770,7 @@
im_uim_release_compose_tree()
{
FreeComposeTree(g_tree);
@ -14,25 +33,3 @@
}
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",

33
uim-sigscheme-build-fixes.diff
View File

@ -1,21 +1,6 @@
---
sigscheme/Makefile.am | 2 ++
sigscheme/libgcroots/Makefile.am | 2 ++
2 files changed, 4 insertions(+)
--- a/sigscheme/Makefile.am
+++ b/sigscheme/Makefile.am
@@ -4,6 +4,8 @@
endif
SUBDIRS += include src lib test test-c bench
+ACLOCAL_AMFLAGS = -I m4
+
# To make 'make distclean' workable on --with-libgcroots=tiny-subdir,
# libgcroots must be eliminated from $DIST_SUBDIRS.
DIST_SUBDIRS = $(SUBDIRS)
--- a/sigscheme/libgcroots/Makefile.am
+++ b/sigscheme/libgcroots/Makefile.am
diff -urN uim-1.8.1.orig/sigscheme/libgcroots/Makefile.am uim-1.8.1/sigscheme/libgcroots/Makefile.am
--- uim-1.8.1.orig/sigscheme/libgcroots/Makefile.am 2012-07-02 12:16:36.432239740 +0800
+++ uim-1.8.1/sigscheme/libgcroots/Makefile.am 2012-07-02 12:18:27.177855230 +0800
@@ -19,6 +19,8 @@
include libtool-version.mk
@ -25,3 +10,15 @@
# $(distdir) does work as a part of $(RELEASE_URL) when configured as a
# subpackage.
DIST_NAME = $(PACKAGE)-$(VERSION)
diff -urN uim-1.8.1.orig/sigscheme/Makefile.am uim-1.8.1/sigscheme/Makefile.am
--- uim-1.8.1.orig/sigscheme/Makefile.am 2012-07-02 12:16:36.408240040 +0800
+++ uim-1.8.1/sigscheme/Makefile.am 2012-07-02 12:17:58.557213036 +0800
@@ -4,6 +4,8 @@
endif
SUBDIRS += include src lib test test-c bench
+ACLOCAL_AMFLAGS = -I m4
+
# To make 'make distclean' workable on --with-libgcroots=tiny-subdir,
# libgcroots must be eliminated from $DIST_SUBDIRS.
DIST_SUBDIRS = $(SUBDIRS)

17
uim.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Jul 2 04:07:57 UTC 2012 - i@marguerite.su
- update version 1.8.1
* New IM uim-google-cgiapi-jp
* New IM uim-baidu-olime-jp
* Delay showing candidate window
* Horizontal candidate window
* Japanese Romaji-Kana composing rule in uim-pref
* Many new features in uim-tutcode
-------------------------------------------------------------------
Tue Jun 5 16:17:18 UTC 2012 - i@marguerite.su
- fix sles builds.
* %make_install to %makeinstall
-------------------------------------------------------------------
Tue Feb 28 13:46:10 CET 2012 - tiwai@suse.de

83
uim.spec
View File

@ -16,41 +16,12 @@
#
%define build_gtk3 (%{suse_version} >= 1140)
%define is_gnome3 (%{suse_version} > 1140)
%define build_gtk3 (0%{?suse_version} >= 1140)
%define is_gnome3 (0%{?suse_version} > 1140)
Name: uim
BuildRequires: anthy-devel
BuildRequires: canna-devel
BuildRequires: emacs-x11
BuildRequires: emacs-x11
BuildRequires: gcc-c++
BuildRequires: intltool
BuildRequires: libedit-devel
BuildRequires: libexpat-devel
BuildRequires: libqt4-devel
BuildRequires: libtool
BuildRequires: m17n-lib-devel
BuildRequires: ncurses-devel
BuildRequires: perl-XML-Parser
BuildRequires: pkg-config
%if %suse_version > 1130
BuildRequires: pkgconfig(gtk+-2.0)
%else
BuildRequires: gtk2-devel
%endif
%if %build_gtk3
BuildRequires: pkgconfig(gtk+-3.0)
%endif
BuildRequires: fdupes
BuildRequires: gnome-panel-devel
BuildRequires: kdebase3-devel
BuildRequires: qt3-devel
BuildRequires: update-desktop-files
BuildRequires: xemacs
Version: 1.7.3
Version: 1.8.1
Release: 0
# xorg-x11-libXdmcp-devel libgnomeprintui-devel
Summary: A multilingual input method library
License: GPL-2.0+
Group: System/I18n/Japanese
@ -62,9 +33,33 @@ Source3: etc-x11-xim.d-uim
Source4: baselibs.conf
Patch10: uim-sigscheme-build-fixes.diff
Patch12: uim-fix-crash-in-firefox.diff
PreReq: %{_bindir}/touch
Patch13: fix-for-sles-qhash-incomplete-type.patch
BuildRequires: anthy-devel
BuildRequires: canna-devel
BuildRequires: emacs-x11
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gnome-panel-devel
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: kdebase3-devel
BuildRequires: libedit-devel
BuildRequires: libexpat-devel
BuildRequires: libqt4-devel
BuildRequires: libtool
BuildRequires: m17n-lib-devel
BuildRequires: ncurses-devel
BuildRequires: perl-XML-Parser
BuildRequires: pkg-config
BuildRequires: qt3-devel
BuildRequires: update-desktop-files
BuildRequires: xemacs
%if %build_gtk3
BuildRequires: pkgconfig(gtk+-3.0)
%endif
Provides: locale(xorg-x11:ja)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): %{_bindir}/touch
%description
Uim is a multilingual input method library. Uim's project goal is to
@ -81,7 +76,7 @@ Requires: glibc-devel
Include Files and Libraries mandatory for Development.
%package gtk2
Summary: GTK+2.0 IM module for uim
Summary: GTK2 IM Module for UIM
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Provides: locale(gtk2:ja)
@ -93,7 +88,7 @@ GTK+2.0 IM module for uim
%if %{build_gtk3}
%package gtk3
Summary: GTK+3.0 IM module for uim
Summary: GTK3 IM Module for UIM
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Provides: locale(gtk3:ja)
@ -107,8 +102,8 @@ GTK+3.0 IM module for uim
Summary: GNOME applet for uim
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Obsoletes: uim-applet
Provides: uim-applet
Obsoletes: uim-applet < %{version}
Provides: uim-applet = %{version}
Provides: locale(gnome-libs:ja)
%description applet-gnome
@ -138,7 +133,7 @@ Qt4 input module plugin for uim
%package kde3
Summary: KDE3 Applet for Uim
Group: User Interface/Desktops
Requires: uim = %{version}-%{release}
Requires: uim = %{version}
Requires: uim-qt3
%description kde3
@ -150,13 +145,14 @@ languages.
%setup0 -q
%patch10 -p1
%patch12 -p1
%patch13 -p1
cp emacs/README README.emacs
iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
%build
autoreconf -f -i
intltoolize --force
cp po/Makefile.in.in qt/chardict/po
cp po/Makefile.in.in qt3/chardict/po
cp po/Makefile.in.in qt4/chardict/po
%configure --disable-static --with-pic \
--libexecdir=%{_prefix}/lib/uim \
@ -171,7 +167,7 @@ cp po/Makefile.in.in qt4/chardict/po
make %{?_smp_mflags}
%install
%make_install
%makeinstall
rm -f %{buildroot}%{_includedir}/gcroots.h
rm -f %{buildroot}%{_libdir}/pkgconfig/gcroots.pc
# this file is generated by "uim-module-manager".
@ -226,9 +222,6 @@ find %{buildroot} -name "*.scm" \
find %{buildroot} -type f -name "*.la" -delete -print
rm -f doc/Makefile*
%clean
rm -rf %{buildroot}
%post
/sbin/ldconfig
# register uim modules to uim. This will change the files:
@ -257,7 +250,7 @@ uim-module-manager --register \
%files -f uim.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog INSTALL* NEWS* README*
%doc AUTHORS COPYING ChangeLog NEWS* README*
%doc doc
%dir %{_sysconfdir}/X11/xim.d/
%{_sysconfdir}/X11/xim.d/*
@ -338,7 +331,7 @@ uim-module-manager --register \
%files kde3
%defattr (-, root, root, -)
%doc AUTHORS COPYING ChangeLog* NEWS README
/opt/kde3/%_lib/kde3/uim_panelapplet.so
/opt/kde3/%{_lib}/kde3/uim_panelapplet.so
/opt/kde3/share/apps/kicker/applets/uimapplet.desktop
%changelog