commit: d5901bd14f66b550782cfa755da29d2755369f70 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Sat Apr 2 07:33:21 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat May 14 02:32:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5901bd1
app-i18n/uim: remove wrong Wconversion substitution Closes: https://bugs.gentoo.org/836623 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/24859 Signed-off-by: Sam James <sam <AT> gentoo.org> ....9_pre20210103-remove-Wconversion-replace.patch | 13 ++ app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild | 247 +++++++++++++++++++++ 2 files changed, 260 insertions(+) diff --git a/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch b/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch new file mode 100644 index 000000000000..d90433b414bf --- /dev/null +++ b/app-i18n/uim/files/uim-1.8.9_pre20210103-remove-Wconversion-replace.patch @@ -0,0 +1,13 @@ +--- a/qt4/common.pro.in ++++ b/qt4/common.pro.in +@@ -20,10 +20,6 @@ + QMAKE_CXX = @CXX@ + QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@ + QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@ +-# Remove "-Wconversion" from CXXFLAGS to avoid lots of warnings +-# from Qt4 header files +-QMAKE_CXXFLAGS_DEBUG = $$replace(QMAKE_CXXFLAGS_DEBUG, "-Wconversion", "") +-QMAKE_CXXFLAGS_RELEASE = $$replace(QMAKE_CXXFLAGS_RELEASE, "-Wconversion", "") + QMAKE_LINK = @CXX@ + QMAKE_LFLAGS = @LDFLAGS@ + QMAKE_STRIP = diff --git a/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild new file mode 100644 index 000000000000..1b0b34a88f5b --- /dev/null +++ b/app-i18n/uim/uim-1.8.9_pre20210103-r1.ebuild @@ -0,0 +1,247 @@ +# Copyright 1999-2022 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 ~ppc ~ppc64 ~riscv ~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 + gnome-base/librsvg + 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 + "${FILESDIR}"/${P}-remove-Wconversion-replace.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 +}
