Browse Source

uim-1.8.8-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12148 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
4bf36ee746
1 changed files with 99 additions and 21 deletions
  1. 99 21
      u/uim/uim-vl.spec

+ 99 - 21
u/uim/uim-vl.spec

@@ -3,18 +3,24 @@
 
 %global sigscheme_commit cfcb6dd2ae93fd7b22b5e3a1403e2f0197602c79
 %global sigscheme_shortcommit %(c=%{sigscheme_commit}; echo ${c:0:7})
+%global sigscheme_version 0.9.0
 
 %global libgcroots_commit 514c4fe1af59b39e2b4b68f0a3c55b8bf573b4dc
 %global libgcroots_shortcommit %(c=%{libgcroots_commit}; echo ${c:0:7})
+%global libgcroots_version 0.3.1
 
 # build emacsen uim bridge ("--without emacs" to disable)
 %bcond_without emacsen
-# build qt3 immodule ("--without qt3" to disable qt3)
-%bcond_without qt3
+# do not build gtk2 immodule ("--with qt3" to enable qt3)
+%bcond_with gtk2
+# do not build qt3 immodule ("--with qt3" to enable qt3)
+%bcond_with qt3
 # build qt4 immodule ("--without qt4" to disable qt4)
 %bcond_without qt4
-# build KDE applet ("--without kde" to disable kde)
-%bcond_without kde
+# build qt5 immodule ("--without qt5" to disable qt4)
+%bcond_without qt5
+# do not build KDE applet ("--with kde" to enable kde)
+%bcond_with kde
 # build mana support ("--without mana" to disable mana)
 %bcond_without mana
 
@@ -23,18 +29,30 @@
 # do not build Canna module ("--with canna" to enable canna)
 %bcond_with canna
 
-%define qt3_ver 3.3.8
-%define qt4_ver 4.8.6
 
+%if %{with qt3}
 # Qt3 version detection
+%define qt3_ver 3.3.8
 %define _qt3_version %(pkg-config --modversion --silence-errors qt-mt 2>/dev/null || echo %{qt3_ver})
 %define _qt3_prefix  %{_libdir}/qt-%{_qt3_version}
 %define _qt3_plugindir %{_qt3_prefix}/plugins
+%endif
 
+%if %{with qt4}
 # Qt4 version detection
+%define qt4_ver 4.8.6
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
+%endif
+
+%if %{with qt5}
+# Qt5 version detection
+%define qt5_ver 5.6.3
+%define _qt5_version %(pkg-config --modversion --silence-errors Qt5 2>/dev/null || echo %{qt4_ver})
+%define _qt5_prefix %(pkg-config --variable prefix --silence-errors Qt5 2>/dev/null || echo %{_libdir}/qt4)
+%define _qt5_plugindir %(pkg-config --variable plugindir --silence-errors Qt5 2>/dev/null || echo %{_qt4_prefix}/plugins)
+%endif
 
 #define extraver beta
 
@@ -43,7 +61,7 @@ Summary: Uim an input method library
 Summary(ja): 入力メソッドライブラリ
 Version: 1.8.8
 #Release: 6.git%{shortcommit}%{?_dist_release}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 # pinyin-big5.scm and elatin-rules.scm are licensed under GPL
 License: BSD, LGPLv2 and GPL
@@ -62,24 +80,18 @@ Source2: uim-el-remove.sh
 Source3: uim-update-installed-modules.sh.in
 Source4: vine-default-uim-el.el
 Source5: uim-el-init.el
-Source6: https://github.com/uim/sigscheme/archive/cfcb6dd2ae93fd7b22b5e3a1403e2f0197602c79/sigscheme-cfcb6dd.tar.gz
-Source7: https://github.com/uim/libgcroots/archive/%{libgcroots_commit}/libgcroots-%{libgcroots_shortcommit}.tar.gz
+Source6: https://github.com/uim/sigscheme/releases/download/%{sigscheme_version}/sigscheme-%{sigscheme_version}.tar.bz2
+#Source7: https://github.com/uim/libgcroots/archive/%{libgcroots_commit}/libgcroots-%{libgcroots_shortcommit}.tar.gz
+Source7: https://github.com/uim/libgcroots/releases/download/%{libgcroots_version}/libgcroots-%{libgcroots_version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libXft-devel libX11-devel libXext-devel 
 BuildRequires: libXrender-devel libXau-devel libXdmcp-devel libXt-devel
-BuildRequires: gtk2-devel 
 BuildRequires: gtk3-devel
 BuildRequires: ncurses-devel
 BuildRequires: anthy-devel m17n-lib-devel eb-devel
 BuildRequires: libedit-devel libffi-devel expat-devel curl-devel
 BuildRequires: gettext-devel desktop-file-utils
-%if %{with qt3}
-BuildRequires: qt-devel
-%endif
-%if %{with qt4}
-BuildRequires: qt4-devel
-%endif
 %if %{with gnome}
 BuildRequires: gnome-panel-devel
 BuildRequires: libgnomeui-devel
@@ -124,11 +136,13 @@ uim-xim is a XIM bridge of libuim.
 uim-xim は libuim を利用した XIM サーバです。
 XIM 経由で入力を行う場合に必要です。
 
+%if %{with gtk2}
 %package gtk
 Summary: GTK helper for uim
 Summary(ja): uim の GTK ヘルパー
 License: BSD and LGPLv2
 Group: User Interface/Desktops
+BuildRequires: gtk2-devel
 Requires: %{name} = %{version}-%{release}
 Requires: gtk2
 Requires(post): gtk2 >= 2.10.0
@@ -142,6 +156,7 @@ input pad, candidate window, and preference tool using GTK.
 %description -l ja gtk
 このパッケージには、GTK を使ったツールバーやシステムトレイ、入力パッド、
 候補ウィンドウ、設定ツールなどが含まれています。
+%endif
 
 %package gtk3
 Summary: GTK3 helper for uim
@@ -169,6 +184,7 @@ Summary: Qt3 support for Uim
 Summary(ja): uim の Qt3 サポート
 Group: User Interface/Desktops
 License: BSD and LGPLv2
+BuildRequires: qt-devel
 Requires: %{name}-xim = %{version}-%{release}
 Requires: qt >= %{_qt3_version}
 
@@ -193,6 +209,7 @@ Summary: Qt4 support for Uim
 Summary(ja): Uim の Qt4 サポート
 License: BSD and LGPLv2
 Group: User Interface/Desktops
+BuildRequires: qt4-devel
 Requires: %{name}-xim = %{version}-%{release}
 Requires: qt4 >= %{_qt4_version}
 Obsoletes: %{name}-qt-common < %{version}-%{release}
@@ -206,6 +223,25 @@ and preference tool using Qt4.
 が含まれています。
 %endif
 
+%if %{with qt5}
+%package qt5
+Summary: Qt5 support for Uim
+Summary(ja): Uim の Qt5 サポート
+License: BSD and LGPLv2
+Group: User Interface/Desktops
+BuildRequires: qt5-qtbase-devel qt5-qtx11extras-devel qt5-rpm-macros
+Requires: %{name}-xim = %{version}-%{release}
+Obsoletes: %{name}-qt-common < %{version}-%{release}
+
+%description qt5
+This package contains some applications like toolbar, candidate window,
+and preference tool using Qt5.
+
+%description -l ja qt5
+このパッケージには、Qt5 を使ったツールバーや候補ウィンドウ、設定ツールなど
+が含まれています。
+%endif
+
 %if %{with gnome}
 %package applet
 Summary: GNOME panel applet for Uim
@@ -404,20 +440,25 @@ export QTDIR=%{_qt3_prefix}
 %configure --with-x --with-xft \
 	--with-anthy --with-anthy-utf8 \
 	--without-scim --without-prime \
-	--with-gtk2 \
-        --with-gtk3 \
+	--with-gtk3 \
 	--with-m17nlib \
-        --with-curl \
-        --with-expat \
+	--with-curl \
+	--with-expat \
 	--with-ffi \
 	--with-eb --with-eb-conf=%{_sysconfdir}/eb.conf \
 	--disable-static \
-        --enable-maintainer-mode \
+	--enable-maintainer-mode \
+	--enable-default-toolkit=gtk3 \
 %if %{with gnome}
 	--enable-gnome3-applet \
 %else
 	--disable-gnome-applet \
 %endif
+%if %{with gtk2}
+	--with-gtk2 \
+%else
+	--without-gtk2 \
+%endif
 %if %{with qt3}
 	--with-qt \
 	--with-qt-immodule \
@@ -432,6 +473,13 @@ export QTDIR=%{_qt3_prefix}
 	--without-qt4 \
 	--without-qt4-immodule \
 %endif
+%if %{with qt5}
+	--with-qt5 \
+	--with-qt5-immodule \
+%else
+	--without-qt5 \
+	--without-qt5-immodule \
+%endif
 %if %{with kde}
 	--disable-kde-applet \
 	--enable-kde4-applet \
@@ -506,6 +554,10 @@ make install DESTDIR=%{buildroot}
 %__rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/uim-chardict-qt4.mo
 %endif
 
+%if %{without qt5}
+%__rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/uim-chardict-qt5.mo
+%endif
+
 %if %{with emacsen}
 %__mkdir_p %{buildroot}%{emacsen_pkgdir}/install
 %__mkdir_p %{buildroot}%{emacsen_pkgdir}/remove
@@ -538,6 +590,9 @@ cp -p sigscheme/doc/*.txt installed-doc/sigscheme
 PREFERED_ENGINE=anthy 
 EOF
 
+perl -pi -e 's/uim-pref-gtk$/uim-pref-gtk3/' %{buildroot}%{_datadir}/applications/uim.desktop
+
+
 %clean
 [ "%{buildroot}" != "/" ] && %__rm -rf %{buildroot}
 
@@ -545,6 +600,7 @@ EOF
 
 %postun -p /sbin/ldconfig
 
+%if %{with gtk2}
 %post gtk
 %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules ||:
 
@@ -552,6 +608,7 @@ EOF
 if [ $1 = 0 ] ; then
 	%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules ||:
 fi
+%endif
 
 %post gtk3
 %{_bindir}/gtk-query-immodules-3.0 --update-cache || : > /dev/null 2>&1
@@ -670,6 +727,7 @@ fi
 %{_bindir}/uim-xim
 %{_mandir}/man1/uim-xim.1*
 
+%if %{with gtk2}
 %files gtk
 %defattr(-,root,root)
 %{_bindir}/uim-im-switcher-gtk
@@ -682,6 +740,7 @@ fi
 %{_libexecdir}/uim-candwin-tbl-gtk
 %{_libdir}/gtk-2.0/*/immodules/*.so
 %{_datadir}/applications/uim.desktop
+%endif
 
 %files gtk3
 %defattr(-,root,root)
@@ -694,6 +753,7 @@ fi
 %{_libexecdir}/uim-candwin-horizontal-gtk3
 %{_libexecdir}/uim-candwin-tbl-gtk3
 %{_libdir}/gtk-3.0/*/immodules/*.so
+%{_datadir}/applications/uim.desktop
 
 %if %{with qt3}
 %files qt
@@ -725,6 +785,21 @@ fi
 %{_qt4_plugindir}/inputmethods/*.so
 %endif
 
+%if %{with qt5}
+%files qt5
+%defattr(-,root,root)
+# BSD and LGPLv2+
+%{_bindir}/uim-chardict-qt5
+# BSD
+%{_bindir}/uim-im-switcher-qt5
+# BSD and LGPLv2+
+%{_bindir}/uim-pref-qt5
+# BSD
+%{_bindir}/uim-toolbar-qt5
+%{_libexecdir}/uim-candwin-qt5
+%{_qt5_plugindir}/platforminputcontexts/*.so
+%endif
+
 %if %{with gnome}
 %files applet
 %defattr(-,root,root)
@@ -807,6 +882,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Sep 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.8-2
+- disabled gtk2, qt3 and kde.
+
 * Sat May 19 2018 IWAI, Masaharu <iwaim.sub@gmail.com> 1.8.8-1
 - update to 1.8.8
 - add Packager