From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/
Date: Sat, 23 Oct 2021 14:32:08 +0000 (UTC) [thread overview]
Message-ID: <1634999513.cf290e857cb6559bd64bc79b4efbfc4a5215e36e.hattya@gentoo> (raw)
commit: cf290e857cb6559bd64bc79b4efbfc4a5215e36e
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 14:31:17 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 14:31:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf290e85
app-i18n/uim: new snapshot
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
app-i18n/uim/Manifest | 2 +
app-i18n/uim/files/uim-kde.patch | 72 +++++++++
app-i18n/uim/uim-1.8.9_pre20210103.ebuild | 245 ++++++++++++++++++++++++++++++
3 files changed, 319 insertions(+)
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 593def9c836..67883695dc1 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1 +1,3 @@
+DIST sigscheme-0.9.1.tar.bz2 1140162 BLAKE2B a649ec1a5ff0899af14fa686ea7cf43140c226b1df68d4c9415c3b95c7f7ae32c539df820f0e9da7d7a809c88fa388e563549728c345017dfd62d418748be7e1 SHA512 b66b901e8a6bc6d9188112f78d3ba21a2a0776e1236aa9d2d83df27cf8111b8491f665062b493d14c2a9a1b4eb47ce2789b3ca7180225a085e94623329281e09
DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3
+DIST uim-1.8.9_pre20210103.tar.gz 4054622 BLAKE2B b50bafe9b0edbac1ab7e56afd5b654bdef793b606df3550ba7b8be467076005925bf2c5d221bbf3b3dbcdc5079bbb0e014ed29bef9b6a55c23384cb281411104 SHA512 39e046a8ee3bbc06ff0bab685e0ded8f63e9c474661ffecf7ed12e25cad3151498b2fecc7f14ca6f0c78974e55265df47d656a55bf158b41fe21a69071d02fe8
diff --git a/app-i18n/uim/files/uim-kde.patch b/app-i18n/uim/files/uim-kde.patch
new file mode 100644
index 00000000000..8a291650ae3
--- /dev/null
+++ b/app-i18n/uim/files/uim-kde.patch
@@ -0,0 +1,72 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1449,6 +1449,28 @@
+
+ AM_CONDITIONAL(KDE4_APPLET, test "x$enable_kde4_applet" = xyes)
+
++dnl ****************************
++dnl *** test for KDE5 applet ***
++dnl ****************************
++AC_ARG_ENABLE(kde5-applet,
++ AC_HELP_STRING([--disable-kde5-applet],
++ [do not build uim KDE Plasma 5 widget]),
++ [],
++ [enable_kde5_applet=yes])
++
++if test "x$enable_kde5_applet" != xno; then
++ if test "x$with_qt5" != xyes; then
++ enable_kde5_applet=no
++ fi
++fi
++
++if test "x$enable_kde5_applet" = xyes && test "x$CMAKE" = xno; then
++ AC_MSG_WARN([no CMake found])
++ enable_kde5_applet=no
++fi
++
++AM_CONDITIONAL(KDE5_APPLET, test "x$enable_kde5_applet" = xyes)
++
+ AC_ARG_ENABLE(pref,
+ AC_HELP_STRING([--disable-pref],
+ [do not build graphical utility to edit user settings]),
+@@ -1948,12 +1970,15 @@
+ qt5_immodule_option="DEFINES+=QT5_IMMODULE"
+ fi
+ set -e
+- # FIXME: move CMAKE_CXX_FLAGS into cmake_option
+- ${CMAKE} \
+- -B ${ac_abs_top_builddir}/qt5/applet.cmake \
+- -S ${ac_abs_top_srcdir}/qt5/applet \
+- -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
+- ${cmake_option}
++ # Generate a Makefile for KDE5 applet by cmake
++ if test "x$enable_kde5_applet" = xyes; then
++ # FIXME: move CMAKE_CXX_FLAGS into cmake_option
++ ${CMAKE} \
++ -B ${ac_abs_top_builddir}/qt5/applet.cmake \
++ -S ${ac_abs_top_srcdir}/qt5/applet \
++ -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \
++ ${cmake_option}
++ fi
+ ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \
+ ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro
+ ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \
+@@ -2007,6 +2032,7 @@
+ Qt5 immodule : ${with_qt5_immodule}
+ KDE3 Applet : ${enable_kde_applet}
+ KDE4 Applet : ${enable_kde4_applet}
++ KDE5 Applet : ${enable_kde5_applet}
+ FEP : ${enable_fep}
+ Emacs : ${enable_emacs}
+ XIM : ${use_xim}
+--- a/qt5/applet/Makefile.am
++++ b/qt5/applet/Makefile.am
+@@ -6,6 +6,8 @@
+ plasmoid
+
+ if QT5
++if KDE5_APPLET
+ all clean install uninstall:
+ $(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@
+ endif
++endif
diff --git a/app-i18n/uim/uim-1.8.9_pre20210103.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
new file mode 100644
index 00000000000..d96338d66ab
--- /dev/null
+++ b/app-i18n/uim/uim-1.8.9_pre20210103.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils vcs-snapshot
+
+EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5"
+SIG_PV="0.9.1"
+
+DESCRIPTION="A multilingual input method framework"
+HOMEPAGE="https://github.com/uim/uim"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+ https://github.com/${PN}/sigscheme/releases/download/${SIG_PV}/sigscheme-${SIG_PV}.tar.bz2"
+
+LICENSE="BSD GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+RESTRICT="test"
+REQUIRED_USE="gtk? ( X )
+ gtk2? ( X )
+ qt5? ( X )
+ xft? ( X )"
+
+CDEPEND="X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrender
+ x11-libs/libXt
+ )
+ anthy? ( app-i18n/anthy )
+ curl? ( net-misc/curl )
+ eb? ( dev-libs/eb )
+ emacs? ( >=app-editors/emacs-23.1:* )
+ expat? ( dev-libs/expat )
+ gtk? ( x11-libs/gtk+:3 )
+ gtk2? ( x11-libs/gtk+:2 )
+ kde? ( kde-frameworks/plasma:5 )
+ libedit? ( dev-libs/libedit )
+ libffi? ( dev-libs/libffi:= )
+ libnotify? ( x11-libs/libnotify )
+ m17n-lib? ( dev-libs/m17n-lib )
+ ncurses? ( sys-libs/ncurses:0= )
+ nls? ( virtual/libintl )
+ qt5? ( dev-qt/qtx11extras:5 )
+ skk? ( app-i18n/skk-jisyo )
+ sqlite? ( dev-db/sqlite:3 )
+ ssl? ( dev-libs/openssl:0= )"
+DEPEND="${CDEPEND}
+ X? ( x11-base/xorg-proto )"
+RDEPEND="${CDEPEND}
+ !dev-scheme/sigscheme
+ X? (
+ media-fonts/font-sony-misc
+ l10n_ja? (
+ || (
+ media-fonts/font-jis-misc
+ media-fonts/intlfonts
+ )
+ )
+ l10n_ko? (
+ || (
+ media-fonts/font-daewoo-misc
+ media-fonts/intlfonts
+ )
+ )
+ l10n_zh-CN? (
+ || (
+ media-fonts/font-isas-misc
+ media-fonts/intlfonts
+ )
+ )
+ l10n_zh-TW? ( media-fonts/intlfonts )
+ )"
+BDEPEND="dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ kde? ( dev-util/cmake )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-kde.patch
+ "${FILESDIR}"/${PN}-slibtool.patch
+ "${FILESDIR}"/${PN}-tinfo.patch
+ "${FILESDIR}"/${PN}-xkb.patch
+ "${FILESDIR}"/${PN}-zh-TW.patch
+)
+DOCS=( AUTHORS NEWS README RELNOTE doc )
+
+AT_NO_RECURSIVE="yes"
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+ vcs-snapshot_src_unpack
+ rmdir "${S}"/sigscheme || die
+ mv "${WORKDIR}"/sigscheme-${SIG_PV} "${S}"/sigscheme || die
+}
+
+src_prepare() {
+ default
+ sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
+ # fix build with >=dev-scheme/chicken-4, bug #656852
+ touch scm/json-parser-expanded.scm
+ # fix build with "-march=pentium4 -O2", bug #661806
+ use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ $(use_with X x)
+ $(use_with anthy anthy-utf8)
+ $(use_with curl)
+ $(use_with eb)
+ $(use_enable emacs)
+ $(use_with emacs lispdir "${SITELISP}")
+ $(use_with expat)
+ $(use_enable kde kde5-applet)
+ $(use_with libedit)
+ $(use_with libffi ffi)
+ $(use_with gtk gtk3)
+ $(use_with gtk2)
+ $(use_with m17n-lib m17nlib)
+ $(use_enable ncurses fep)
+ $(use_enable nls)
+ $(use_with qt5)
+ $(use_with qt5 qt5-immodule)
+ _QMAKE5=$(qt5_get_bindir)/qmake
+ $(use_with skk)
+ $(use_with sqlite sqlite3)
+ $(use_enable ssl openssl)
+ $(use_enable static-libs static)
+ $(use_with xft)
+ --without-anthy
+ --without-canna
+ --enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
+ --disable-gnome-applet
+ --disable-gnome3-applet
+ --disable-kde-applet
+ --disable-kde4-applet
+ --without-mana
+ --enable-maintainer-mode
+ --without-prime
+ --disable-qt4-qt3support
+ )
+
+ if (use gtk || use gtk2) && use anthy; then
+ myconf+=( --enable-dict )
+ else
+ myconf+=( --disable-dict )
+ fi
+
+ if use libnotify; then
+ myconf+=( --enable-notify=libnotify )
+ fi
+
+ if use gtk || use gtk2 || use qt5; then
+ myconf+=( --enable-pref )
+ else
+ myconf+=( --disable-pref )
+ fi
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ if use emacs; then
+ cd emacs || die
+ elisp-compile *.el || die
+ cd - >/dev/null || die
+ fi
+}
+
+src_install() {
+ # bug #222677
+ emake -j1 DESTDIR="${D}" install
+ rm -f doc/Makefile*
+ einstalldocs
+
+ find "${ED}"/usr/$(get_libdir)/${PN} -name '*.la' -delete || die
+ use static-libs || find "${ED}" -name '*.la' -delete || die
+
+ insinto /etc/X11/xinit/xinput.d
+ sed \
+ -e "s:@EPREFIX@:${EPREFIX}:g" \
+ "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+ doins "${T}"/${PN}.conf
+
+ if use X; then
+ docinto xim
+ dodoc xim/README*
+ fi
+
+ if use emacs; then
+ elisp-install ${PN}-el emacs/*.el{,c}
+ elisp-site-file-install "${FILESDIR}"/${SITEFILE} ${PN}-el
+ docinto emacs
+ dodoc emacs/README*
+ fi
+
+ if use ncurses; then
+ docinto fep
+ dodoc fep/README*
+ fi
+}
+
+pkg_postinst() {
+ elog "New input method switcher has been introduced. You need to set"
+ elog
+ elog "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+ elog "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
+ elog "% XMODIFIERS=@im=uim ; export XMODIFIERS"
+ elog
+ elog "If you would like to use uim-anthy as default input method, put"
+ elog "(define default-im-name 'anthy)"
+ elog "to your ~/.uim."
+ elog
+ elog "All input methods can be found by running uim-im-switcher-gtk, "
+ elog "uim-im-switcher-gtk3 or uim-im-switcher-qt5."
+
+ if use emacs; then
+ elisp-site-regen
+ elog
+ elog "uim is autoloaded with Emacs with a minimal set of features:"
+ elog "There is no keybinding defined to call it directly, so please"
+ elog "create one yourself and choose an input method."
+ elog "Integration with LEIM is not done with this ebuild, please have"
+ elog "a look at the documentation how to achieve this."
+ fi
+ use gtk && gnome2_query_immodules_gtk3
+ use gtk2 && gnome2_query_immodules_gtk2
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+ use gtk && gnome2_query_immodules_gtk3
+ use gtk2 && gnome2_query_immodules_gtk2
+}
next reply other threads:[~2021-10-23 14:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-23 14:32 Akinori Hattori [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-24 9:21 [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/, app-i18n/uim/files/ Sam James
2023-10-23 13:28 Akinori Hattori
2022-09-06 15:29 Akinori Hattori
2022-05-14 2:32 Sam James
2021-10-23 14:32 Akinori Hattori
2021-10-23 14:32 Akinori Hattori
2020-05-23 8:27 Andreas Sturmlechner
2018-05-28 14:56 Akinori Hattori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1634999513.cf290e857cb6559bd64bc79b4efbfc4a5215e36e.hattya@gentoo \
--to=hattya@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox