summaryrefslogtreecommitdiff
path: root/app-i18n/fcitx
diff options
context:
space:
mode:
Diffstat (limited to 'app-i18n/fcitx')
-rw-r--r--app-i18n/fcitx/Manifest24
-rw-r--r--app-i18n/fcitx/fcitx-4.2.9.1.ebuild153
-rw-r--r--app-i18n/fcitx/fcitx-4.2.9.2.ebuild147
-rw-r--r--app-i18n/fcitx/fcitx-4.2.9.3.ebuild147
-rw-r--r--app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch95
-rw-r--r--app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch145
-rw-r--r--app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch60
-rw-r--r--app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch13
8 files changed, 7 insertions, 777 deletions
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index edf52caa270b..4d6817250d18 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,20 +1,10 @@
-AUX fcitx-4.2.9.1-qt-4_ucs4.patch 4061 BLAKE2B 5a026b2870720157deee4718b7e97c3fb21726a730dd076d3ef64ee561589f2cc046299af4c3bad91c6d5611498f407e8ca5ae314e9384aaceac6bd3dfd2fd32 SHA512 525b54c6836e2a3e6e8d5d3868d7dd07c69593e87eb5ecb22a20213b7b016fb5911acb6212f62f2ad0f0e98b463f5849dc0427e9f693b35d28a9b435d679acb0
-AUX fcitx-4.2.9.1-tray_icon.patch 5813 BLAKE2B 6c4d842cbcd3c162f554e9bc904319464b4289537a7fa667572f71614e534afd8dd3dfc19bf5fa611a41122784fd5be85f6221cf31cf9d2b5b40c99d07782b4c SHA512 7ecdeea867f29e95c8518d10357d9358babe81b70a4aae648205a9bd72b0e01dc9befc8d11c514998a2b1396a7f56ff368aec7dfc652ff4c3f9a7c53a6b00913
-AUX fcitx-4.2.9.2-scripts.patch 1353 BLAKE2B ded9aa0b184441981063a14e7e45ded9c30255c04cba55903abebfdfe42601f7527b5353ee663dcf64160ff3b9fb9b107f481987c4c1a66292788d068c3ddb8f SHA512 6d33e43cdb4fbe4968b490550526fb4839c045b08710bc1e31961905bbfb94edb76ddfba1579a7223f080556c05c48ffd9dcd967586ef8f99baff9c86ce18265
-AUX fcitx-4.2.9.3-restart.patch 407 BLAKE2B f0a1dd8c10ebe972d96a4b336406aadff8e7070d692a4b4286d5638a32e43d2cd41d19b8dc2b1244fcd1a60850ceb87bd3aee86ae5540090a3727aef12bf6a4d SHA512 000c0adfb99cb8b6fe8d9d3c6958324fa03ba168576dd3abaa0d9dec0983eca7c92a851d4c94df95593ed7c6dc46384c973af9579bac939aecf9b631f8210c39
-DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
-DIST fcitx-4.2.9.2_dict.tar.xz 8735848 SHA256 2cdd7c138163f717aacca8eabb18a4a823c808a408e4b0770f5be2e3e892de20 SHA512 9228fc4629479e2c518e0d0a7dbe604f6e56e864b41927d120e1f0b7a277ff53ff1b393870480bc1660662751a31885ddc1ddf43133a11edc2e96cbc7701daee WHIRLPOOL 8f19cd9f34a3957ff42e94ca7a5e28db5feecf658e9ca2535430fe6dd7a269ba9833e9273e8fd87d00a426027aebd97741c3fe909d9a0b0577ae6f64a8f4ba75
-DIST fcitx-4.2.9.3_dict.tar.xz 8737864 SHA256 543cc301f274367429880cb80c53349ed44435e7c64d757cca9b0d1844e2a91e SHA512 813b55c4b13e9d36bdaed6e4d072a841aa7f067f937b46d1fdbc03e8176b76ce83b056e24e2c0fe944f1347c5fe6a8d9bfdd6b0b2ed054e3017f3926fa36bcdd WHIRLPOOL b54c52025a48350c37712a64048ae2cec4e891c75607ded8ce35940252d2c242430e6ff0e64c86e1319b89b57b388c05760728a861cd58af0c99edd634f20c97
-DIST fcitx-4.2.9.4_dict.tar.xz 8731804 SHA256 e4f9069ac82afd72cdaf9d317377113ce361a9f086b930c12026127a3543953a SHA512 2e8ead59a154a857dfc011af83715dbe1225cbccf1e2c6ced1d9aaf92a7881f89fbe806da3c66ed1805cf27994c91a2d463c455be726b7d4b73c07bfde83972b WHIRLPOOL 113c13ea4eff8de68096ea7bfc1a92c62f5c78395436b5885761863c689a2613d0f5bde8a19ea5b1cc45d032fba4b2a6d2790d31e1d46cf9890d8b33df2049e5
-DIST fcitx-4.2.9.5_dict.tar.xz 8736972 SHA256 be398ac4433f6f4599d2728e20615e4f4602a5f67e9c29df4a3d4c1126d376ca SHA512 5e2ec5405b01fe85b1659b1db3e15389b0d7e096808db598d0865381bcb8f6de960e8e16d4432c95c586cfc3359d17d4f7bad0cff2fe0146fe00b9fb80491168 WHIRLPOOL 0aa6eed3f76d77b4fafef9440e6b1b740c932e3a0a2809706126992d2a39e439b677df1c79d77ed147924a9784c0ced31593d3a1e1c7e2064bcfd08007ecc6de
-DIST fcitx-data-en_dict-20121020.tar.gz 630491 SHA256 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 WHIRLPOOL 858b51723035e24756c0ece15ee28f9d25dbc86ca447c50e070f085e47b864f26201a100d3d968bcecf5711e76f99c7908eeabe7bc6d5b3b17d6cf2c53c3204b
-DIST fcitx-data-pinyin.tar.gz 1608886 SHA256 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 WHIRLPOOL c5584213cab5b3729c159759909819bef42d4dba899e58df331aa12b47f5544545d9ba3f8ac7291835cb80c5e180a3a8b31360e9b9e43e4f38387b0eeee74b46
-DIST fcitx-data-py_stroke-20121124.tar.gz 445601 SHA256 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3 WHIRLPOOL 3b09c21b8f948538b10218bd52ed12235f8d8a1986db7c09a35de5454c89305d5ada27177c8501b6bf72324aa1824a384822a7fbb440d63ce081265b1fa34c65
-DIST fcitx-data-py_table-20121124.tar.gz 186822 SHA256 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486 WHIRLPOOL 43564e50722325215d250287276556fc6e8ccebd4da905fa579668658ff8e41f43a14e027f431489a9edf65691f00f6e95778acb91aed731da13b351ddf518cb
-DIST fcitx-data-table.tar.gz 4144686 SHA256 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7 SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9 WHIRLPOOL 465997dc17e88fb3130abb60e0c73564fbdb50a10de1587f5efaac4859a001b7b4aea1f0f4f6efe01ada5e8751351b7b6106a130f46d550e5dd0081dfaa780e5
-EBUILD fcitx-4.2.9.1.ebuild 4535 BLAKE2B e0069150e8f5ebe84c77ba70e4b40c37feea4fa2283775f25f71ab595923ff7f9b90cafbb848f73f47ed6fce0e3393f83278a33ac7435ec8b95f219d98ec70a2 SHA512 f24e8557008491e9c5da042e61669abea677f5f4f167baa1dd22b9efdb6782d42fcbae1424cc9a0e6d4ec0c96c7f81032567820d3a73af322237dd8b4ebe41a3
-EBUILD fcitx-4.2.9.2.ebuild 4309 BLAKE2B 2ceeb90172d39bf76428ee05067511a7093fe790a6cf70d9fbeaaa09bfd988d9d39484ca8b3d8cf5230a832138ba65584dc90be631220be1d3d85d267a4f5fdf SHA512 c4877c23eeec499de4f159c9d3f0b4698681634f9fdda8605e557ab86dafd249599182e5aa2ff42cd3d4c50bd7a81b6a8b3852c512fba92ea29062ee0355ef47
-EBUILD fcitx-4.2.9.3.ebuild 4324 BLAKE2B 09a760e14e987e263a2eb300b123a066f1d58f4bdb2c0cf593f06a9e1ff9f41ec51ebbbbccee6f0d1b8ca38d6a898618636cdf6680a8b81cc942e1d6a441d9f5 SHA512 d49943f1b2cc89559a626d0527d076ae64134402b3084535aae64e56994ff51f03ed95907efaa75553a2d2491283bf1c76c96784b57eee46fc93faafd33c1bdf
+DIST fcitx-4.2.9.4_dict.tar.xz 8731804 BLAKE2B 8363d7908cb68b9da3c71c2bea237dbad20740e4f9b07a1b5625c5228aab09e1c5c86134fce681dcaaaaf2cdc570b7701a23ca6e1c01d09117133fd07f4d8b7a SHA512 2e8ead59a154a857dfc011af83715dbe1225cbccf1e2c6ced1d9aaf92a7881f89fbe806da3c66ed1805cf27994c91a2d463c455be726b7d4b73c07bfde83972b
+DIST fcitx-4.2.9.5_dict.tar.xz 8736972 BLAKE2B 01255554aa0caf5e4f638121febcf0951549d5752884dd436c90042587048598724b91d4839ff2470e8b9ee119f0abb40650c45fd8253ae1bd74608812c84a1d SHA512 5e2ec5405b01fe85b1659b1db3e15389b0d7e096808db598d0865381bcb8f6de960e8e16d4432c95c586cfc3359d17d4f7bad0cff2fe0146fe00b9fb80491168
+DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
+DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
+DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
+DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
+DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
EBUILD fcitx-4.2.9.4.ebuild 4382 BLAKE2B a2429c0d0ba22c4786732b5646d3f28e067e096629da8d8134a772c6f5ee563a12cb87ab59cb64477cc79ca7fe6168f3763d3649fbae80e8736d2f1876e4ee61 SHA512 efb5fdd20620cf0d4553b61283473e809f170fc8978cefc874c0d59362d6aa5d6668f141ad7647b4f62c5deac394e26824ac6e24cb6fef0a62cc979763150e45
EBUILD fcitx-4.2.9.5.ebuild 4495 BLAKE2B 2b75146a349196898593bd57b67feddc1df30806ec1177479120ac920a9f04d7fadeb14fec5ab43d575ec91acb2130c84eada97d610a63e2ffb936709b86d1d9 SHA512 5d6021aae6f8c080d210b8f917e3ad7b1703d5be76ddd476ae26e7a34c743b6d6bdea6389bf6bacf1362ad2dbdda0162c69447f7f556709f9da293acd1f49a0c
EBUILD fcitx-4.9999.ebuild 4466 BLAKE2B 3ba3dc13aa9af2b61f2e9f43d9ebb9e9a0face3d33c12028655ddcdd6edc532da77a570a622369924519872c8cb7e73d00f30f958ed83632eb65d63dc38046dc SHA512 4c31137c4aed49da1373eb419d936f78566ec5b955f740304e93f3afb4d35fa219e3d04437e38b4a40937e38c5b83b37964012b2adeffdff03413c9ad29f23de
diff --git a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild b/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
deleted file mode 100644
index b003a374c8ac..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/fcitx/fcitx"
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
- https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
- https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
- https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
- https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
-else
- SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
-
-RDEPEND="dev-libs/glib:2
- sys-apps/dbus
- virtual/libiconv
- virtual/libintl
- x11-libs/libxkbcommon
- X? (
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrender
- xml? (
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- )
- )
- cairo? (
- x11-libs/cairo[X]
- x11-libs/libXext
- pango? ( x11-libs/pango )
- !pango? ( media-libs/fontconfig )
- )
- enchant? ( <app-text/enchant-2 )
- gtk2? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- introspection? ( dev-libs/gobject-introspection )
- lua? ( dev-lang/lua:= )
- nls? ( sys-devel/gettext )
- opencc? ( app-i18n/opencc:= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- )
- xml? (
- app-text/iso-codes
- dev-libs/libxml2
- )"
-DEPEND="${RDEPEND}
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig"
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-PATCHES=(
- "${FILESDIR}/${P}-tray_icon.patch"
- "${FILESDIR}/${P}-qt-4_ucs4.patch"
-)
-
-src_prepare() {
- if [[ "${PV}" == "9999" ]]; then
- ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
- fi
-
- # https://github.com/fcitx/fcitx/issues/250
- sed \
- -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
- -e "/find_package(XkbFile REQUIRED)/s/^/ /" \
- -e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \
- -i CMakeLists.txt
-
- # https://github.com/fcitx/fcitx/issues/342
- while IFS='' read -d $'\0' -r f ; do
- sed 's:^#!/bin/sh$:#!/usr/bin/env bash:' -i "${f}" || die
- done < <(find "${S}" -name '*.sh' -type f -print0)
-
- cmake-utils_src_prepare
- xdg_environment_reset
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DSYSCONFDIR="${EPREFIX}/etc"
- -DENABLE_CAIRO=$(usex cairo)
- -DENABLE_DEBUG=$(usex debug)
- -DENABLE_ENCHANT=$(usex enchant)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GIR=$(usex introspection)
- -DENABLE_GTK2_IM_MODULE=$(usex gtk2)
- -DENABLE_GTK3_IM_MODULE=$(usex gtk3)
- -DENABLE_LIBXML2=$(usex xml)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_OPENCC=$(usex opencc)
- -DENABLE_PANGO=$(usex pango)
- -DENABLE_QT=$(usex qt4)
- -DENABLE_QT_GUI=$(usex qt4)
- -DENABLE_QT_IM_MODULE=$(usex qt4)
- -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
- -DENABLE_STATIC=$(usex static-libs)
- -DENABLE_TABLE=$(usex table)
- -DENABLE_TEST=$(usex test)
- -DENABLE_X11=$(usex X)
- -DENABLE_XDGAUTOSTART=$(usex autostart)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- rm -r "${ED}usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/fcitx-4.2.9.2.ebuild b/app-i18n/fcitx/fcitx-4.2.9.2.ebuild
deleted file mode 100644
index f525853d6f66..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.2.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/fcitx/fcitx"
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
- https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
- https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
- https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
- https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
-else
- SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="GPL-2+ LGPL-2+ MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
-
-RDEPEND="dev-libs/glib:2
- sys-apps/dbus
- virtual/libiconv
- virtual/libintl
- x11-libs/libxkbcommon
- X? (
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrender
- xml? (
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- )
- )
- cairo? (
- x11-libs/cairo[X]
- x11-libs/libXext
- pango? ( x11-libs/pango )
- !pango? ( media-libs/fontconfig )
- )
- enchant? ( app-text/enchant:0= )
- gtk2? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- introspection? ( dev-libs/gobject-introspection )
- lua? ( dev-lang/lua:= )
- nls? ( sys-devel/gettext )
- opencc? ( app-i18n/opencc:= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- )
- xml? (
- app-text/iso-codes
- dev-libs/libxml2
- )"
-DEPEND="${RDEPEND}
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-scripts.patch"
-)
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-src_prepare() {
- if [[ "${PV}" == "9999" ]]; then
- ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
- fi
-
- # https://github.com/fcitx/fcitx/issues/250
- sed \
- -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
- -e "/find_package(XkbFile REQUIRED)/s/^/ /" \
- -e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \
- -i CMakeLists.txt
-
- cmake-utils_src_prepare
- xdg_environment_reset
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DSYSCONFDIR="${EPREFIX}/etc"
- -DENABLE_CAIRO=$(usex cairo)
- -DENABLE_DEBUG=$(usex debug)
- -DENABLE_ENCHANT=$(usex enchant)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GIR=$(usex introspection)
- -DENABLE_GTK2_IM_MODULE=$(usex gtk2)
- -DENABLE_GTK3_IM_MODULE=$(usex gtk3)
- -DENABLE_LIBXML2=$(usex xml)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_OPENCC=$(usex opencc)
- -DENABLE_PANGO=$(usex pango)
- -DENABLE_QT=$(usex qt4)
- -DENABLE_QT_GUI=$(usex qt4)
- -DENABLE_QT_IM_MODULE=$(usex qt4)
- -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
- -DENABLE_STATIC=$(usex static-libs)
- -DENABLE_TABLE=$(usex table)
- -DENABLE_TEST=$(usex test)
- -DENABLE_X11=$(usex X)
- -DENABLE_XDGAUTOSTART=$(usex autostart)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- rm -r "${ED}usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/fcitx-4.2.9.3.ebuild b/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
deleted file mode 100644
index a6b5e59f5762..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/fcitx/fcitx"
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
- https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
- https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
- https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
- https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
-else
- SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
-fi
-
-LICENSE="GPL-2+ LGPL-2+ MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
-REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
-
-RDEPEND="dev-libs/glib:2
- sys-apps/dbus
- virtual/libiconv
- virtual/libintl
- x11-libs/libxkbcommon
- X? (
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrender
- xml? (
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- )
- )
- cairo? (
- x11-libs/cairo[X]
- x11-libs/libXext
- pango? ( x11-libs/pango )
- !pango? ( media-libs/fontconfig )
- )
- enchant? ( app-text/enchant:0= )
- gtk2? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- introspection? ( dev-libs/gobject-introspection )
- lua? ( dev-lang/lua:= )
- nls? ( sys-devel/gettext )
- opencc? ( app-i18n/opencc:= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- )
- xml? (
- app-text/iso-codes
- dev-libs/libxml2
- )"
-DEPEND="${RDEPEND}
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-restart.patch"
-)
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-src_prepare() {
- if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
- fi
-
- # https://github.com/fcitx/fcitx/issues/250
- sed \
- -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \
- -e "/find_package(XkbFile REQUIRED)/s/^/ /" \
- -e "/find_package(XkbFile REQUIRED)/a\\ endif(ENABLE_X11)" \
- -i CMakeLists.txt
-
- cmake-utils_src_prepare
- xdg_environment_reset
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DSYSCONFDIR="${EPREFIX}/etc"
- -DENABLE_CAIRO=$(usex cairo)
- -DENABLE_DEBUG=$(usex debug)
- -DENABLE_ENCHANT=$(usex enchant)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GIR=$(usex introspection)
- -DENABLE_GTK2_IM_MODULE=$(usex gtk2)
- -DENABLE_GTK3_IM_MODULE=$(usex gtk3)
- -DENABLE_LIBXML2=$(usex xml)
- -DENABLE_LUA=$(usex lua)
- -DENABLE_OPENCC=$(usex opencc)
- -DENABLE_PANGO=$(usex pango)
- -DENABLE_QT=$(usex qt4)
- -DENABLE_QT_GUI=$(usex qt4)
- -DENABLE_QT_IM_MODULE=$(usex qt4)
- -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
- -DENABLE_STATIC=$(usex static-libs)
- -DENABLE_TABLE=$(usex table)
- -DENABLE_TEST=$(usex test)
- -DENABLE_X11=$(usex X)
- -DENABLE_XDGAUTOSTART=$(usex autostart)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- rm -r "${ED}usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch
deleted file mode 100644
index e417a0615716..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.9.1-qt-4_ucs4.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-https://github.com/fcitx/fcitx/commit/14faccfbb0d87e06c25d182ae842808d18be3dc7
-https://github.com/fcitx/fcitx/commit/216a09e3ec056f272eebfbe82809b803d86012cb
-
---- /src/frontend/qt/qfcitxinputcontext.cpp
-+++ /src/frontend/qt/qfcitxinputcontext.cpp
-@@ -232,6 +232,20 @@
- anchor = var2.toInt();
- else
- anchor = cursor;
-+
-+ // adjust it to real character size
-+ // QTBUG-25536;
-+ QVector<uint> tempUCS4 = text.leftRef(cursor).toUcs4();
-+ while (!tempUCS4.empty() && tempUCS4.last() == 0) {
-+ tempUCS4.pop_back();
-+ }
-+ cursor = tempUCS4.size();
-+ tempUCS4 = text.leftRef(anchor).toUcs4();
-+ while (!tempUCS4.empty() && tempUCS4.last() == 0) {
-+ tempUCS4.pop_back();
-+ }
-+ anchor = tempUCS4.size();
-+
- if (data->surroundingText != text) {
- data->surroundingText = text;
- proxy->SetSurroundingText(text, cursor, anchor);
-@@ -581,6 +595,7 @@
- delete data->proxy;
- }
- data->proxy = new FcitxQtInputContextProxy(m_connection->serviceName(), path, *m_connection->connection(), this);
-+ data->proxy->setProperty("icData", qVariantFromValue(static_cast<void*>(data)));
- connect(data->proxy, SIGNAL(CommitString(QString)), this, SLOT(commitString(QString)));
- connect(data->proxy, SIGNAL(ForwardKey(uint, uint, int)), this, SLOT(forwardKey(uint, uint, int)));
- connect(data->proxy, SIGNAL(UpdateFormattedPreedit(FcitxQtFormattedPreeditList,int)), this, SLOT(updateFormattedPreedit(FcitxQtFormattedPreeditList,int)));
-@@ -680,11 +695,57 @@
- sendEvent(event);
- }
-
--void QFcitxInputContext::deleteSurroundingText(int offset, uint nchar)
-+void QFcitxInputContext::deleteSurroundingText(int offset, uint _nchar)
- {
- QInputMethodEvent event;
-- event.setCommitString("", offset, nchar);
-- sendEvent(event);
-+
-+ FcitxQtInputContextProxy *proxy = qobject_cast<FcitxQtInputContextProxy*>(sender());
-+ if (!proxy) {
-+ return;
-+ }
-+
-+ FcitxQtICData *data = static_cast<FcitxQtICData*>(proxy->property("icData").value<void *>());
-+ QVector<uint> ucsText = data->surroundingText.toUcs4();
-+
-+ // QTBUG-25536
-+ while (!ucsText.empty() && ucsText.last() == 0) {
-+ ucsText.pop_back();
-+ }
-+
-+ int cursor = data->surroundingCursor;
-+ // make nchar signed so we are safer
-+ int nchar = _nchar;
-+ // Qt's reconvert semantics is different from gtk's. It doesn't count the current
-+ // selection. Discard selection from nchar.
-+ if (data->surroundingAnchor < data->surroundingCursor) {
-+ nchar -= data->surroundingCursor - data->surroundingAnchor;
-+ offset += data->surroundingCursor - data->surroundingAnchor;
-+ cursor = data->surroundingAnchor;
-+ } else if (data->surroundingAnchor > data->surroundingCursor) {
-+ nchar -= data->surroundingAnchor - data->surroundingCursor;
-+ cursor = data->surroundingCursor;
-+ }
-+
-+ // validates
-+ if (nchar >= 0 && cursor + offset >= 0 && cursor + offset + nchar < ucsText.size()) {
-+ // order matters
-+ QVector<uint> replacedChars = ucsText.mid(cursor + offset, nchar);
-+ nchar = QString::fromUcs4(replacedChars.data(), replacedChars.size()).size();
-+
-+ int start, len;
-+ if (offset >= 0) {
-+ start = cursor;
-+ len = offset;
-+ } else {
-+ start = cursor;
-+ len = -offset;
-+ }
-+
-+ QVector<uint> prefixedChars = ucsText.mid(start, len);
-+ offset = QString::fromUcs4(prefixedChars.data(), prefixedChars.size()).size() * (offset >= 0 ? 1 : -1);
-+ event.setCommitString("", offset, nchar);
-+ sendEvent(event);
-+ }
- }
-
- void QFcitxInputContext::forwardKey(uint keyval, uint state, int type)
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch b/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch
deleted file mode 100644
index 7bfbc6e9ade0..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.9.1-tray_icon.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-https://github.com/fcitx/fcitx/issues/241
-https://github.com/fcitx/fcitx/commit/c737618fffa84bfe5a6caf55cee9b9288a791bbf
-https://github.com/fcitx/fcitx/commit/353683e29be4ef26409b9a05e0cb647a5180fa8c
-https://github.com/fcitx/fcitx/commit/fe2732db27a1c2e183400ceeb3283559e10a4ca8
-https://github.com/fcitx/fcitx/commit/440c431d29876a8e4871159d289bc9a573f9a41b
-
---- /src/module/notificationitem/notificationitem.c
-+++ /src/module/notificationitem/notificationitem.c
-@@ -565,8 +565,17 @@
-
- boolean FcitxNotificationItemEnable(FcitxNotificationItem* notificationitem, FcitxNotificationItemAvailableCallback callback, void* data)
- {
-- if (!callback || notificationitem->callback)
-+ if (!callback)
- return false;
-+
-+ if (notificationitem->callback == callback) {
-+ return true;
-+ }
-+
-+ if (notificationitem->callback) {
-+ return false;
-+ }
-+
- if (notificationitem->serviceName) {
- FcitxLog(ERROR, "This should not happen, please report bug.");
- return false;
---- /src/ui/classic/TrayWindow.c
-+++ /src/ui/classic/TrayWindow.c
-@@ -48,7 +48,7 @@
- Display *dpy = classicui->dpy;
- int iScreen = classicui->iScreen;
- char strWindowName[] = "Fcitx Tray Window";
-- if (!classicui->bUseTrayIcon || classicui->isSuspend)
-+ if (!classicui->bUseTrayIcon || classicui->isSuspend || classicui->notificationItemAvailable)
- return;
-
- if (trayWindow->window == None && trayWindow->dockWindow != None) {
-@@ -61,12 +61,12 @@
- wsa.colormap = colormap;
- wsa.background_pixel = 0;
- wsa.border_pixel = 0;
-- trayWindow->window = XCreateWindow(dpy, p, -1, -1, 1, 1,
-+ trayWindow->window = XCreateWindow(dpy, p, -1, -1, 22, 22,
- 0, vi->depth, InputOutput, vi->visual,
- CWBackPixmap | CWBackPixel | CWBorderPixel | CWColormap, &wsa);
- } else {
- trayWindow->window = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy),
-- -1, -1, 1, 1, 0,
-+ -1, -1, 22, 22, 0,
- BlackPixel(dpy, DefaultScreen(dpy)),
- WhitePixel(dpy, DefaultScreen(dpy)));
- XSetWindowBackgroundPixmap(dpy, trayWindow->window, ParentRelative);
-@@ -74,6 +74,7 @@
- if (trayWindow->window == (Window) NULL)
- return;
-
-+ trayWindow->size = 22;
- XSizeHints size_hints;
- size_hints.flags = PWinGravity | PBaseSize;
- size_hints.base_width = trayWindow->size;
-@@ -161,7 +162,7 @@
- png_surface = image->image;
-
- c = cairo_create(trayWindow->cs);
-- cairo_set_source_rgba(c, 0, 0, 0, 0);
-+ cairo_set_source_rgba(c, 1, 1, 1, 0);
- cairo_set_operator(c, CAIRO_OPERATOR_SOURCE);
- cairo_paint(c);
-
-@@ -226,8 +227,6 @@
- if (event->xclient.message_type == trayWindow->atoms[ATOM_MANAGER]
- && event->xclient.data.l[1] == trayWindow->atoms[ATOM_SELECTION]
- && trayWindow->dockWindow == None) {
-- if (classicui->notificationItemAvailable)
-- return true;
- trayWindow->dockWindow = event->xclient.data.l[2];
- TrayWindowRelease(trayWindow);
- TrayWindowInit(trayWindow);
-@@ -245,6 +244,7 @@
- int size = event->xconfigure.height;
- if (size != trayWindow->size) {
- trayWindow->size = size;
-+ XResizeWindow(dpy, trayWindow->window, size, size);
- XSizeHints size_hints;
- size_hints.flags = PWinGravity | PBaseSize;
- size_hints.base_width = trayWindow->size;
-@@ -286,6 +286,14 @@
- return true;
- }
- break;
-+ case PropertyNotify:
-+ if (event->xproperty.atom == trayWindow->atoms[ATOM_VISUAL] &&
-+ event->xproperty.window == trayWindow->dockWindow) {
-+ TrayWindowRelease(trayWindow);
-+ TrayWindowInit(trayWindow);
-+ return true;
-+ }
-+ break;
- }
- return false;
- }
---- /src/ui/classic/classicui.c
-+++ /src/ui/classic/classicui.c
-@@ -168,7 +168,7 @@
- void ClassicUIDelayedInitTray(void* arg) {
- FcitxClassicUI* classicui = (FcitxClassicUI*) arg;
- // FcitxLog(INFO, "yeah we delayed!");
-- if (!classicui->bUseTrayIcon)
-+ if (!classicui->bUseTrayIcon || classicui->isSuspend)
- return;
- /*
- * if this return false, something wrong happened and callback
-@@ -187,7 +187,7 @@
- {
- FcitxClassicUI* classicui = (FcitxClassicUI*) arg;
- classicui->trayTimeout = 0;
-- if (!classicui->bUseTrayIcon)
-+ if (!classicui->bUseTrayIcon || classicui->isSuspend)
- return;
-
- if (!classicui->trayWindow->bTrayMapped) {
---- /src/ui/classic/tray.c
-+++ /src/ui/classic/tray.c
-@@ -106,8 +106,9 @@
-
- XWindowAttributes attr;
- XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &attr);
-- if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) {
-- XSelectInput(dpy, DefaultRootWindow(dpy), attr.your_event_mask | StructureNotifyMask); // for MANAGER selection
-+ int neededMask = StructureNotifyMask;
-+ if ((attr.your_event_mask & neededMask) != neededMask) {
-+ XSelectInput(dpy, DefaultRootWindow(dpy), attr.your_event_mask | neededMask); // for MANAGER selection
- }
- return True;
- }
-@@ -123,7 +124,7 @@
- Display* dpy = tray->owner->dpy;
-
- if (tray->dockWindow != None) {
-- XSelectInput(dpy, tray->dockWindow, StructureNotifyMask);
-+ XSelectInput(dpy, tray->dockWindow, PropertyChangeMask | StructureNotifyMask);
- TraySendOpcode(tray, SYSTEM_TRAY_REQUEST_DOCK, tray->window, 0, 0);
- tray->bTrayMapped = True;
- return 1;
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch b/app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch
deleted file mode 100644
index a3399767e7b0..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.9.2-scripts.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://github.com/fcitx/fcitx/issues/342
-https://github.com/fcitx/fcitx/commit/de4bd3d535736afe061d9ac63fcc897e3ab3237e
-
---- /cmake/fcitx-cmake-helper.sh
-+++ /cmake/fcitx-cmake-helper.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/bin/env bash
- # Copyright (C) 2012~2013 by Yichao Yu
- # yyc1992@gmail.com
- #
---- /cmake/fcitx-merge-config.sh
-+++ /cmake/fcitx-merge-config.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env bash
- # Copyright (C) 2012~2012 by Yichao Yu
- # yyc1992@gmail.com
- #
---- /data/icon/data/gen.sh
-+++ /data/icon/data/gen.sh
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/env bash
-
- a="$(find scabable/status/ -type f -name \*.svg)"
- echo $a
---- /data/script/fcitx-configtool.sh
-+++ /data/script/fcitx-configtool.sh
-@@ -28,7 +28,7 @@
- }
- fi
-
--if type gettext > /dev/null 2>&1; then
-+if which gettext > /dev/null 2>&1; then
- _() {
- gettext "$@"
- }
---- /src/lib/fcitx-utils/gen-hotkey.sh
-+++ /src/lib/fcitx-utils/gen-hotkey.sh
-@@ -1,7 +1,6 @@
- #!/bin/sh
-
--function download_file()
--{
-+download_file() {
- if [ "x$3" != "xf" ]; then
- if [ -f $1 ]; then
- return
---- /src/ui/classic/fcitx-skin-installer.sh
-+++ /src/ui/classic/fcitx-skin-installer.sh
-@@ -25,7 +25,7 @@
- }
- fi
-
--if type gettext > /dev/null 2>&1; then
-+if which gettext > /dev/null 2>&1; then
- _() {
- gettext "$@"
- }
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch b/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch
deleted file mode 100644
index b71bdac9461a..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://github.com/fcitx/fcitx/issues/362
-https://github.com/fcitx/fcitx/commit/82202f6b81361263693f07ae17c55c8ce048b220
-
---- /src/lib/fcitx/instance.c
-+++ /src/lib/fcitx/instance.c
-@@ -365,6 +365,7 @@
- setjmp(FcitxRecover);
-
- if (instance->destroy || instance->restart) {
-+ FcitxInstanceEnd(instance);
- FcitxInstanceRealEnd(instance);
- break;
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 22:30:50 +0000