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

Accepting request 184117 from M17N

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/184117
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uim?expand=0&rev=40
This commit is contained in:
Stephan Kulow 2013-07-24 13:31:03 +00:00 committed by Git OBS Bridge
commit 57de79ba78
7 changed files with 128 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
baselibs.conf
View File

@ -1,4 +1,7 @@
uim
recommends "uim-gtk2-<targettype> = <version>"
recommends "uim-gtk3-<targettype> = <version>"
recommends "uim-qt4-<targettype> = <version>"
uim-gtk2
post "%if "%_lib" == "lib64""
post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
@ -10,6 +13,7 @@ uim-gtk2
postun "%else"
postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
postun "%endif"
requires "uim-<targettype> = <version>"
supplements "packageand(uim:gtk2-<targettype>)"
uim-gtk3
post "%if "%_lib" == "lib64""
@ -22,10 +26,8 @@ uim-gtk3
postun "%else"
postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache"
postun "%endif"
requires "uim-<targettype> = <version>"
supplements "packageand(uim:gtk3-<targettype>)"
uim-qt3
supplements "packageand(uim:qt3-<targettype>)"
obsoletes "uim-qt-<targettype>"
provides "uim-qt-<targettype> = <version>"
uim-qt4
requires "uim-<targettype> = <version>"
supplements "packageand(uim:libqt4-<targettype>)"

69
libgcroots-aarch64.patch Normal file
View File

@ -0,0 +1,69 @@
Index: uim-1.8.1/sigscheme/libgcroots/include/private/gcconfig.h
===================================================================
--- uim-1.8.1.orig/sigscheme/libgcroots/include/private/gcconfig.h
+++ uim-1.8.1/sigscheme/libgcroots/include/private/gcconfig.h
@@ -62,6 +62,13 @@
# endif
/* Determine the machine type: */
+# if defined(__aarch64__)
+# define AARCH64
+# if !defined(LINUX)
+# define NOSYS
+# define mach_type_known
+# endif
+# endif
# if defined(__arm__) || defined(__thumb__)
# define ARM32
# if !defined(LINUX) && !defined(NETBSD)
@@ -231,6 +238,10 @@
# define IA64
# define mach_type_known
# endif
+# if defined(LINUX) && defined(__aarch64__)
+# define AARCH64
+# define mach_type_known
+# endif
# if defined(LINUX) && defined(__arm__)
# define ARM32
# define mach_type_known
@@ -504,6 +515,7 @@
/* running Amdahl UTS4 */
/* S390 ==> 390-like machine */
/* running LINUX */
+ /* AARCH64 ==> ARM AArch64 */
/* ARM32 ==> Intel StrongARM */
/* IA64 ==> Intel IPF */
/* (e.g. Itanium) */
@@ -1724,6 +1736,31 @@
# endif
# endif
+# ifdef AARCH64
+# define CPP_WORDSZ 64
+# define MACH_TYPE "AARCH64"
+# define ALIGNMENT 8
+# ifndef HBLKSIZE
+# define HBLKSIZE 4096
+# endif
+# ifdef LINUX
+# define OS_TYPE "LINUX"
+# define LINUX_STACKBOTTOM
+# define DYNAMIC_LOADING
+ extern int __data_start[];
+# define DATASTART ((ptr_t)__data_start)
+ extern char _end[];
+# define DATAEND ((ptr_t)(&_end))
+# endif
+# ifdef NOSYS
+ /* __data_start is usually defined in the target linker script. */
+ extern int __data_start[];
+# define DATASTART ((ptr_t)__data_start)
+ extern void *__stack_base__;
+# define STACKBOTTOM ((ptr_t)__stack_base__)
+# endif
+# endif
+
# ifdef ARM32
# define CPP_WORDSZ 32
# define MACH_TYPE "ARM32"

3
uim-1.8.1.tar.bz2
View File

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

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

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

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

@ -1,24 +0,0 @@
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
+ACLOCAL_AMFLAGS = -I m4
+
# $(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)

28
uim.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Tue Jul 16 15:36:23 UTC 2013 - coolo@suse.com
- remove qt3 support, long dead
-------------------------------------------------------------------
Tue May 7 15:27:55 UTC 2013 - schwab@suse.de
- libgcroots-aarch64.patch: Add support for aarch64 in libgcroots
- Don't regenerate configure
-------------------------------------------------------------------
Tue Apr 30 14:27:38 UTC 2013 - cfarrell@suse.com
- license update: BSD-3-Clause and LGPL-2.1+ and (BSD-3-Clause or LGPL-2.0)
More detail on license choices. Compatible with Fedora spec file
declaration
-------------------------------------------------------------------
Sat Apr 27 08:39:51 UTC 2013 - i@marguerite.su
- update version 1.8.5
* uim-gtk2/3
** Avoid an infinite recursion when no preedit is started (by tagoh)
* uim-tutcode
** Fix behavior of postfix katakana conversion
- specfile clean
-------------------------------------------------------------------
Mon Jul 2 04:07:57 UTC 2012 - i@marguerite.su

83
uim.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package uim
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,20 +20,20 @@
%define is_gnome3 (0%{?suse_version} > 1140)
Name: uim
Version: 1.8.1
Version: 1.8.5
Release: 0
Summary: A multilingual input method library
License: GPL-2.0+
Summary: A multilingual input method framework
License: BSD-3-Clause and LGPL-2.1+ and (BSD-3-Clause or LGPL-2.0)
Group: System/I18n/Japanese
Url: http://uim.freedesktop.org/wiki/
Source0: http://uim.googlecode.com/files/uim-%{version}.tar.bz2
Url: http://code.google.com/p/uim
Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2
Source1: suse-start-uim.el
Source2: xemacs-auto-autoloads.el
Source3: etc-x11-xim.d-uim
Source4: baselibs.conf
Patch10: uim-sigscheme-build-fixes.diff
Patch12: uim-fix-crash-in-firefox.diff
Patch13: fix-for-sles-qhash-incomplete-type.patch
Patch2: uim-fix-crash-in-firefox.diff
Patch3: fix-for-sles-qhash-incomplete-type.patch
Patch4: libgcroots-aarch64.patch
BuildRequires: anthy-devel
BuildRequires: canna-devel
BuildRequires: emacs-x11
@ -42,35 +42,37 @@ 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)
Recommends: %{name}-gtk2 = %{version}
%if %build_gtk3
Recommends: %{name}-gtk3 = %{version}
%endif
Recommends: %{name}-qt4 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): %{_bindir}/touch
%description
Uim is a multilingual input method library. Uim's project goal is to
provide secure and useful input method for all languages. Currently, it
can input to applications which support gtk+'s immodule or XIM.
Uim is a multilingual input method framework. Uim's goal is to
provide simple, easily extensible and high code-quality input
method development platform, and useful input method environment
for users of desktop and embedded platforms.
%package devel
Summary: Include Files and Libraries mandatory for Development
Group: System/I18n/Japanese
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: glibc-devel
%description devel
Include Files and Libraries mandatory for Development.
@ -109,57 +111,28 @@ Provides: locale(gnome-libs:ja)
%description applet-gnome
GNOME applet for uim
%package qt3
Summary: Qt3 input module plugin for uim
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Provides: uim-qt = %{version}
Provides: locale(qt3:ja)
Obsoletes: uim-qt
%description qt3
Qt3 input module plugin for uim
%package qt4
Summary: Qt4 input module plugin for uim
Group: System/I18n/Japanese
Requires: %{name} = %{version}
Requires: uim-qt = %{version}
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}
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
%patch12 -p1
%patch13 -p1
%patch2 -p1
%patch3 -p1
%patch4 -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 qt3/chardict/po
cp po/Makefile.in.in qt4/chardict/po
%configure --disable-static --with-pic \
--libexecdir=%{_prefix}/lib/uim \
--with-canna\
--with-anthy-utf8 \
--with-qt\
--with-qt-immodule \
--with-qt4 \
--with-qt4-immodule \
--enable-kde-applet
@ -316,22 +289,10 @@ uim-module-manager --register \
%{_libdir}/bonobo/servers/*
%endif
%files qt3 -f uim-chardict-qt.lang
%defattr(-, root, root)
%{_bindir}/uim-*-qt
%{_prefix}/lib/uim/uim-*-qt
%{_prefix}/lib/qt3/plugins/inputmethods/*.so
%files qt4 -f uim-chardict-qt.lang
%defattr(-, root, root)
%{_bindir}/uim-*-qt4
%{_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