diff options
author | 2017-11-28 18:02:02 +0100 | |
---|---|---|
committer | 2017-11-28 13:36:27 -0500 | |
commit | 6635ba1924005ba2e0bb614a537d84e8fa74a51b (patch) | |
tree | 12a323fdb11b7f6cb546fe47f888a4cc80537550 /app-i18n/fcitx-qt5 | |
parent | net-print/cups: Use correct perms patch. (diff) | |
download | gentoo-6635ba1924005ba2e0bb614a537d84e8fa74a51b.tar.gz gentoo-6635ba1924005ba2e0bb614a537d84e8fa74a51b.tar.bz2 gentoo-6635ba1924005ba2e0bb614a537d84e8fa74a51b.zip |
app-i18n/*fcitx*: Delete old versions.
Diffstat (limited to 'app-i18n/fcitx-qt5')
-rw-r--r-- | app-i18n/fcitx-qt5/Manifest | 7 | ||||
-rw-r--r-- | app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild | 43 | ||||
-rw-r--r-- | app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild | 39 | ||||
-rw-r--r-- | app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild | 39 | ||||
-rw-r--r-- | app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch | 86 |
5 files changed, 2 insertions, 212 deletions
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest index d7adbc6f354f..9147671973e8 100644 --- a/app-i18n/fcitx-qt5/Manifest +++ b/app-i18n/fcitx-qt5/Manifest @@ -1,5 +1,2 @@ -DIST fcitx-qt5-1.0.5.tar.xz 53584 SHA256 8cef90024ca84c3f607943b91f6bfe63fd077507bbe100e5a1936464095841de SHA512 f4da9ede8918cef7aa0dbacea534ab81024e3c6d812bedd287c4c4c9a8b9ca994d4708489c602967f3504ce057ec6e118674503f5d796883f1890e8ecc11c501 WHIRLPOOL 764190a5f523fc40ca5f937704d5bc1a7018232284f50b9b1b6a36b5dd41dfbebda5db337bdc49b08e601e94f51935f2a70d96dddbd4091744ec8c89a77f26b0 -DIST fcitx-qt5-1.0.6.tar.xz 53892 SHA256 a2aea7b49a9508e68d087ac5c9f3d1d1d414318e1aca14fed92a2f8a7e8848c8 SHA512 ea816a3bc324b838d77d7ee67a05853f7f07cbc3c0c1e0a3809fe72084f7e0db8e98623499299712b8b496922e46acb06cf3a1cbd3ff2ef1de92ca5a74d540da WHIRLPOOL aae4029ad2bd5120cd7910fa0a2644dca346acbf47da22d54d7fd3bdb70fab9bdbcf40207e8870f1bebee48de07d9c4a39d44ef04a56eb8472e31087cf6326d3 -DIST fcitx-qt5-1.1.0.tar.xz 55944 SHA256 9be3205e9bb730a23f28bf742d8c41a5035fcd8d91b51aaef875d888c12c0c65 SHA512 1f11c13162483957f0ff29dc8d05e8c781bfcc6f60d938037b94ae825be9c1bc47f594540a2d1d3ffa7185abcc9fd734522a64e36813d3116ec394b52f98135c WHIRLPOOL bbac0393b3e697d48b8bde3acec54a1f8d3daade53c31b8775418067c450c3960820c6ce2e2ec1583d1aa2263a7f7f13cf08d7b32deb1c1a851fc892e367f4e2 -DIST fcitx-qt5-1.1.1.tar.xz 56352 SHA256 4b062869dae011747ff257e6976debd1d69fb13e6121318ce725c0c240291b02 SHA512 ea7faa953561527fd0f6224a06ab97ab84a9e36a06d44f9807e38e6d8e537ab2c7126c4cda2d4718473ace1245709ce6175ac9431b6f0527a63b2d6e92feb18c WHIRLPOOL 385566104e215309dae5742ee4ed360b4b5a23b282fe64a4e50ac13a710478998262f2022320ceda2c4f423406292e7ded48dd2adec7e7b532d5e4bb8b524776 -DIST fcitx-qt5-1.2.0.tar.xz 134224 SHA256 59e9ff57d04bf82d117d5df9c330b63e2086386976052aac79364575ddfa7dea SHA512 38d49d626e4aaee80f44ddeb627b07e45430c6eb1c1c37f2a5fb0c73d5dae6da5ed276366c40c3b6e8609543af95396091e240b5a88b684f399752b3eceee915 WHIRLPOOL 10877bafe4ce31bb276e1a24f73b81dd87e9611341790b84ae881bcb6cddf30f01236422a64c0ca09b922f8e13ee86a99f703ef0ae16084f3a6ae49ab52e4a33 +DIST fcitx-qt5-1.1.1.tar.xz 56352 BLAKE2B 1fea4484f79fa9f9bcd52ac59b4e64cb9947a2cdc46e3df3c3729ef37d136c4fcf787d7a8abd946e5a0d02f909c0a94b6d19b98a93cf9dc2ec49d172a5f19550 SHA512 ea7faa953561527fd0f6224a06ab97ab84a9e36a06d44f9807e38e6d8e537ab2c7126c4cda2d4718473ace1245709ce6175ac9431b6f0527a63b2d6e92feb18c +DIST fcitx-qt5-1.2.0.tar.xz 134224 BLAKE2B 8358ec0b1cf95534f15536dd9529d4f7da47e6c08c050cc93503db958348ce4d940eb1903be8f161fec8adeca58c03838f021e36ecf39908361cddee40d806d4 SHA512 38d49d626e4aaee80f44ddeb627b07e45430c6eb1c1c37f2a5fb0c73d5dae6da5ed276366c40c3b6e8609543af95396091e240b5a88b684f399752b3eceee915 diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild deleted file mode 100644 index 4c3c996c6d6f..000000000000 --- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5" -fi - -DESCRIPTION="Fcitx input method module for Qt 5" -HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" -fi - -LICENSE="GPL-2+" -SLOT="4" -KEYWORDS="amd64 ~hppa ~ppc64 x86" -IUSE="" - -# Private headers of dev-qt/qtgui:5 used. -RDEPEND=">=app-i18n/fcitx-4.2.8 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - virtual/libintl - x11-libs/libxkbcommon" -DEPEND="${RDEPEND} - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-ucs4.patch" -) - -DOCS=() diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild deleted file mode 100644 index 7e1852577c1f..000000000000 --- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.6.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5" -fi - -DESCRIPTION="Fcitx input method module for Qt 5" -HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" -fi - -LICENSE="GPL-2+" -SLOT="4" -KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" -IUSE="" - -# Private headers of dev-qt/qtgui:5 used. -RDEPEND=">=app-i18n/fcitx-4.2.8 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - virtual/libintl - x11-libs/libxkbcommon" -DEPEND="${RDEPEND} - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig" - -DOCS=() diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild deleted file mode 100644 index 8668783c73fe..000000000000 --- a/app-i18n/fcitx-qt5/fcitx-qt5-1.1.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/fcitx/fcitx-qt5" -fi - -DESCRIPTION="Fcitx input method module for Qt 5" -HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" -fi - -LICENSE="GPL-2+" -SLOT="4" -KEYWORDS="amd64 ~hppa ~ppc64 x86" -IUSE="" - -# Private headers of dev-qt/qtgui:5 used. -RDEPEND=">=app-i18n/fcitx-4.2.8 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - virtual/libintl - x11-libs/libxkbcommon" -DEPEND="${RDEPEND} - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig" - -DOCS=() diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch deleted file mode 100644 index 28cf78efc9c1..000000000000 --- a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.0.5-ucs4.patch +++ /dev/null @@ -1,86 +0,0 @@ -https://github.com/fcitx/fcitx-qt5/commit/31ecc9f2f9c8eb77082044944bbb6740d35ae7c3 -https://github.com/fcitx/fcitx-qt5/commit/8fc110e6125d85d3c50112bc20a6ed36395b2b21 - ---- /platforminputcontext/qfcitxplatforminputcontext.cpp -+++ /platforminputcontext/qfcitxplatforminputcontext.cpp -@@ -254,6 +254,12 @@ - anchor = var2.toInt(); - else - anchor = cursor; -+ -+ // adjust it to real character size -+ QVector<uint> tempUCS4 = text.leftRef(cursor).toUcs4(); -+ cursor = tempUCS4.size(); -+ tempUCS4 = text.leftRef(anchor).toUcs4(); -+ anchor = tempUCS4.size(); - if (data.surroundingText != text) { - data.surroundingText = text; - proxy->SetSurroundingText(text, cursor, anchor); -@@ -388,6 +394,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))); -@@ -480,15 +487,56 @@ - update(Qt::ImCursorRectangle); - } - --void QFcitxPlatformInputContext::deleteSurroundingText(int offset, uint nchar) -+void QFcitxPlatformInputContext::deleteSurroundingText(int offset, uint _nchar) - { - QObject *input = qApp->focusObject(); - if (!input) - return; - - QInputMethodEvent event; -- event.setCommitString("", offset, nchar); -- QCoreApplication::sendEvent(input, &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(); -+ -+ 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); -+ QCoreApplication::sendEvent(input, &event); -+ } - } - - void QFcitxPlatformInputContext::forwardKey(uint keyval, uint state, int type) |