diff --git a/fix-for-sles-qhash-incomplete-type.patch b/fix-for-sles-qhash-incomplete-type.patch deleted file mode 100644 index 5beede6..0000000 --- a/fix-for-sles-qhash-incomplete-type.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 -+#include - - #ifdef Q_WS_X11 - #define UIM_QT_USE_JAPANESE_KANA_KEYBOARD_HACK 1 diff --git a/libgcroots-aarch64.patch b/libgcroots-aarch64.patch deleted file mode 100644 index 9fdc8f5..0000000 --- a/libgcroots-aarch64.patch +++ /dev/null @@ -1,69 +0,0 @@ -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" diff --git a/uim-1.8.6.tar.bz2 b/uim-1.8.6.tar.bz2 deleted file mode 100644 index fa3e168..0000000 --- a/uim-1.8.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b1ea803c73f3478917166f04f67cce6e45ad7ea5ab6df99b948c17eb1cb235f -size 6500739 diff --git a/uim-1.8.8.tar.gz b/uim-1.8.8.tar.gz new file mode 100644 index 0000000..8a08ea8 --- /dev/null +++ b/uim-1.8.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46b93463de27b76b3d039d38d1d97b68ac9adda629694aeff88d9c4b184d5604 +size 7827966 diff --git a/uim.changes b/uim.changes index 75f84d8..65cbca4 100644 --- a/uim.changes +++ b/uim.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Fri May 18 16:20:38 UTC 2018 - jengelh@inai.de + +- Remove future goals from description. +- Fix copypasted subpackage package summary. +- Drop useless --with-pic, no static libs are built. + +------------------------------------------------------------------- +Thu May 10 08:29:10 UTC 2018 - aloisio@gmx.com + +- Update to version 1.8.8 + Fixes: + * Fix a build error with --with-libgcroots=installed + + [GitHub #130][Reported by HIGUCHI Daisuke] + * uim-qt5 + + Fix a build error + [GitHub #129][Reported by HIGUCHI Daisuke] + version 1.8.7 + Fixes: + * uim-skk + + Fix a socket clean bug + [GitHub#32][Reported by HIGUCHI Daisuke] + + Fix wrong close call + [GitHub#55][Patch by zephyrus00jp] + * uim-qt4 + + Add a missing include + [GitHub#38][Patch by Raphael Kubo da Costa] + * uim.el + + Fix a bug that other minor mode key bindings are ignored + on Emacs 24 + [GitHub#51][Reported by Araeos] + + Fix a bug that Shift+Arrow doesn't work + [GitHub#116][Reported by Vladimir Panteleev] + * uim-gtk3 + + Fix a bug that the candidate windows isn't shown + [GitHub#76][Patch by Konosuke Watanab] + Enhancements: + * all + + Add "Keywords" to .desktop + [GitHub#57][Patch by HIGUCHI Daisuke] + * uim-gtk + + Improve GTK+ 3 support + [GitHub#35][Patch by e-kato] + + Support libpanel-applet 3.14 or later + [GitHub#48][Patch by Dmitry Shachnev] + + Support Wayland backend + [GitHub#71][Reported by Thibaut Girka] + * uim-fep + + Use UTF-8 for comment encoding + [GitHub#46][Patch by Felix Janda] + * uim-qt5 + + Make workable + * uim-social-ime + + Remove because the service was disruption + * uim.el + + Support autoload + [GitHub#121][Patch by Arun Isaac] + +- Added qt5 subpackage + +- Dropped applet-gnome subpackage (no longer supported on current + targets) + +- Dropped fix-for-sles-qhash-incomplete-type.patch (no longer + necessary) + +- Dropped libgcroots-aarch64.patch (merged upstream) + +- Spec cleanup + ------------------------------------------------------------------- Sun Sep 28 06:34:10 UTC 2014 - ftake@geeko.jp diff --git a/uim.spec b/uim.spec index 1ecdf78..3a4f0fd 100644 --- a/uim.spec +++ b/uim.spec @@ -1,7 +1,7 @@ # # spec file for package uim # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,72 +16,53 @@ # -%define build_gtk3 (0%{?suse_version} >= 1140) -%define is_gnome3 (0%{?suse_version} > 1140) -%define build_applet (0%{?suse_version} < 1310) - Name: uim -Version: 1.8.6 +Version: 1.8.8 Release: 0 Summary: A multilingual input method framework -License: BSD-3-Clause and LGPL-2.1+ and (BSD-3-Clause or LGPL-2.0) +License: BSD-3-Clause AND LGPL-2.1-or-later AND (BSD-3-Clause OR LGPL-2.0-only) Group: System/I18n/Japanese -Url: http://code.google.com/p/uim -Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 +Url: https://github.com/uim/uim +Source0: https://github.com/uim/uim/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: suse-start-uim.el Source2: xemacs-auto-autoloads.el Source3: etc-x11-xim.d-uim Source4: baselibs.conf 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 BuildRequires: fdupes BuildRequires: gcc-c++ -%if %{build_applet} -BuildRequires: gnome-panel-devel -%endif -BuildRequires: gtk2-devel BuildRequires: intltool -BuildRequires: libedit-devel -BuildRequires: libexpat-devel BuildRequires: libqt4-devel +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtbase-private-headers-devel BuildRequires: m17n-lib-devel BuildRequires: ncurses-devel BuildRequires: perl-XML-Parser -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: xemacs -%if %build_gtk3 +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(anthy) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) -%endif -Recommends: %{name}-gtk2 = %{version} -%if %build_gtk3 +BuildRequires: pkgconfig(libedit) Recommends: %{name}-gtk3 = %{version} -%endif -Recommends: %{name}-qt4 = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-qt5 = %{version} Requires(pre): %{_bindir}/touch -%if ! (%{build_applet}) -# If we can't build the applet, we need to ensure we can cleanly 'upgrade' Obsoleting the applet. -Obsoletes: %{name}-applet-gnome <= %{version} -%endif %description -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. +Uim is a multilingual input method framework. %package devel -Summary: Include Files and Libraries mandatory for Development +Summary: Development files for the UIM input method framework Group: Development/Libraries/C and C++ Requires: %{name} = %{version} %description devel -Include Files and Libraries mandatory for Development. +Include Files and Libraries mandatory for Development with uim. %package gtk2 Summary: GTK2 IM Module for UIM @@ -90,9 +71,7 @@ Requires: %{name} = %{version} %gtk2_immodule_requires %description gtk2 -GTK+2.0 IM module for uim - -%if %{build_gtk3} +Contains GTK+2.0 IM module for uim %package gtk3 Summary: GTK3 IM Module for UIM @@ -101,20 +80,7 @@ Requires: %{name} = %{version} %gtk3_immodule_requires %description gtk3 -GTK+3.0 IM module for uim -%endif - -%if %{build_applet} -%package applet-gnome -Summary: GNOME applet for uim -Group: System/I18n/Japanese -Requires: %{name} = %{version} -Obsoletes: uim-applet < %{version} -Provides: uim-applet = %{version} - -%description applet-gnome -GNOME applet for uim -%endif +Contains GTK+3.0 IM module for uim %package qt4 Summary: Qt4 input module plugin for uim @@ -122,36 +88,37 @@ Group: System/I18n/Japanese Requires: %{name} = %{version} %description qt4 -Qt4 input module plugin for uim +Contains Qt4 input module plugin for uim + +%package qt5 +Summary: Qt5 input module plugin for uim +Group: System/I18n/Japanese +Requires: %{name} = %{version} + +%description qt5 +Contains Qt5 input module plugin for uim %prep -%setup0 -q +%setup -q %patch2 -p1 -%patch3 -p1 -%patch4 -p1 cp emacs/README README.emacs iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs -# hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860) -%if %suse_version < 1310 -sed -i \ - -e's@\(gtk-query-immodules-2.0-64\) --update-cache@\1 > %{_sysconfdir}/gtk-2.0/gtk64.immodules@g' \ - -e's@\(gtk-query-immodules-2.0\) --update-cache@\1 > %{_sysconfdir}/gtk-2.0/gtk.immodules@g' \ - $RPM_SOURCE_DIR/baselibs.conf -%endif %build -%configure --disable-static --with-pic \ +%configure --disable-static \ --libexecdir=%{_prefix}/lib/uim \ --with-canna\ --with-anthy-utf8 \ --with-qt4 \ --with-qt4-immodule \ + --with-qt5 \ + --with-qt5-immodule \ --enable-kde-applet make %{?_smp_mflags} %install -%makeinstall +%make_install rm -f %{buildroot}%{_includedir}/gcroots.h rm -f %{buildroot}%{_libdir}/pkgconfig/gcroots.pc # this file is generated by "uim-module-manager". @@ -191,26 +158,20 @@ do perl -pi -e "s|(;;; from file )%{buildroot}(%{_datadir}/emacs/site-lisp/.*)|\1BUILD_ROOT_REPLACEMENT\2|" $i done %find_lang uim -%if 0%{?suse_version} > 1100 touch uim-chardict-qt.lang -%else -%find_lang uim-chardict-qt -%endif %suse_update_desktop_file uim System SystemSetup find %{buildroot} -name "*.scm" \ | grep -E -v "installed-modules.scm|loader.scm" \ | sort | uniq | perl -p -e "s|%{buildroot}||" >> uim.lang -%if 0%{?suse_version} > 1020 %fdupes %{buildroot}%{_prefix}/share -%endif find %{buildroot} -type f -name "*.la" -delete -print rm -f doc/Makefile* %post /sbin/ldconfig # register uim modules to uim. This will change the files: -# %{_datadir}/uim/installed-modules.scm -# %{_datadir}/uim/loader.scm +# %%{_datadir}/uim/installed-modules.scm +# %%{_datadir}/uim/loader.scm uim-module-manager --register \ ajax-ime anthy anthy-utf8 byeoru canna elatin hangul ipa-x-sampa \ latin m17nlib pyload skk tcode trycode tutcode viqr @@ -223,18 +184,14 @@ uim-module-manager --register \ %postun gtk2 %gtk2_immodule_postun -%if %{build_gtk3} - %post gtk3 %gtk3_immodule_post %postun gtk3 %gtk3_immodule_postun -%endif %files -f uim.lang -%defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS* README* +%doc AUTHORS COPYING NEWS* README* %doc doc %dir %{_sysconfdir}/X11/xim.d/ %{_sysconfdir}/X11/xim.d/* @@ -266,46 +223,31 @@ uim-module-manager --register \ %{_datadir}/xemacs/site-packages %files devel -%defattr(-, root, root) %{_libdir}/*.so %{_includedir}/uim/ %{_libdir}/pkgconfig/uim.pc %files gtk2 -%defattr(-, root, root) %{_bindir}/uim-*-gtk %{_bindir}/uim-*-gtk-* %{_bindir}/uim-input-pad-ja %{_prefix}/lib/uim/uim-*-gtk %{_libdir}/gtk-2*/*/immodules/*.so -%if %{build_gtk3} - %files gtk3 -%defattr(-, root, root) %{_bindir}/uim-*-gtk3 %{_bindir}/uim-*-gtk3-* %{_prefix}/lib/uim/uim-*-gtk3 %{_libdir}/gtk-3*/*/immodules/*.so -%endif - -%if %{build_applet} -%files applet-gnome -%defattr(-, root, root) -%if %{is_gnome3} -%{_prefix}/lib/uim/uim-toolbar-applet-gnome3 -%{_datadir}/gnome-panel/*/applets -%{_datadir}/dbus-1/services/* -%else -%{_prefix}/lib/uim/uim-toolbar-applet -%{_libdir}/bonobo/servers/* -%endif -%endif %files qt4 -f uim-chardict-qt.lang -%defattr(-, root, root) %{_bindir}/uim-*-qt4 %{_prefix}/lib/uim/uim-*-qt4 %{_libdir}/qt4/plugins/inputmethods/*.so +%files qt5 -f uim-chardict-qt.lang +%{_bindir}/uim-*-qt5 +%{_prefix}/lib/uim/uim-*-qt5 +%{_libdir}/qt5/plugins/platforminputcontexts/*.so + %changelog