* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/files/, app-i18n/fcitx-qt5/
@ 2016-04-28 21:07 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2016-04-28 21:07 UTC (permalink / raw
To: gentoo-commits
commit: d683c745dca8a45ff4ce45a809a38b65cc66c388
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Apr 28 20:19:42 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 21:06:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d683c745
app-i18n/fcitx-qt5: Delete old versions.
app-i18n/fcitx-qt5/Manifest | 2 --
app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild | 25 ----------------------
app-i18n/fcitx-qt5/fcitx-qt5-1.0.4.ebuild | 23 --------------------
.../files/fcitx-qt5-qt-5.5-compatibility-fix.patch | 23 --------------------
4 files changed, 73 deletions(-)
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index c7fa740..00fbb27 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,3 +1 @@
-DIST fcitx-qt5-1.0.2.tar.xz 53324 SHA256 b8073f07d9384878c616f6d2cea44fc739a3b5731b95b10b3133e0914d49f66d SHA512 f7075d5334e29fd00c54563182c9cc4027011503aa14d577aa2fb75eb8558c385d91c939f1f21e51850c9c64fc5c396aad5b32fdcc8ddd99c46ec74bd577255d WHIRLPOOL 35ae384cf13fdfdb86c34b7dbefbbe780a2c20ac220868824e25a0ba4368581c19d45cbc9447e1c2dd3236b0758ee9e4311dab1f348a524ca2d002d0b43c760c
-DIST fcitx-qt5-1.0.4.tar.xz 53552 SHA256 b42a428008d9bf3a5d9140d63c9a475386480d598bb9ce3b78fad43879a50d1c SHA512 f5a2d3ed30bbbb8da3687dc12dd5be3038242ba40e6bef48483931aacfd9f200db9d24d0df03cb93058eedb3941ef6ecb92d874040eb60742f60a44beda77868 WHIRLPOOL c1dcf45eed09625721c175b1b09724f1f9934cb8cb3413df811009815d4231d2758c54a7b346cb29910c0ce156eb9906136d471359566eb288438cc1f5466710
DIST fcitx-qt5-1.0.5.tar.xz 53584 SHA256 8cef90024ca84c3f607943b91f6bfe63fd077507bbe100e5a1936464095841de SHA512 f4da9ede8918cef7aa0dbacea534ab81024e3c6d812bedd287c4c4c9a8b9ca994d4708489c602967f3504ce057ec6e118674503f5d796883f1890e8ecc11c501 WHIRLPOOL 764190a5f523fc40ca5f937704d5bc1a7018232284f50b9b1b6a36b5dd41dfbebda5db337bdc49b08e601e94f51935f2a70d96dddbd4091744ec8c89a77f26b0
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild
deleted file mode 100644
index 0af11f2..0000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Qt5 input module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- kde-frameworks/extra-cmake-modules"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-qt-5.5-compatibility-fix.patch" )
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.4.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.4.ebuild
deleted file mode 100644
index f066264..0000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Qt5 input module for Fcitx"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/fcitx-4.2.8
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- kde-frameworks/extra-cmake-modules"
-DEPEND="${RDEPEND}"
diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-qt-5.5-compatibility-fix.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-qt-5.5-compatibility-fix.patch
deleted file mode 100644
index 4bdd058..0000000
--- a/app-i18n/fcitx-qt5/files/fcitx-qt5-qt-5.5-compatibility-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 78c482b3fdfe558da74657893a3bcd1ece6d7758 Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Thu, 2 Jul 2015 20:02:17 -0700
-Subject: [PATCH] [qt5] fixes #6
-
-use macro instead of string literal and fix compatibility issue with qt5.5
----
- platforminputcontext/main.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/platforminputcontext/main.h b/platforminputcontext/main.h
-index 1492d72..9938da1 100644
---- a/platforminputcontext/main.h
-+++ b/platforminputcontext/main.h
-@@ -29,7 +29,7 @@ class QFcitxPlatformInputContextPlugin : public QPlatformInputContextPlugin
- {
- Q_OBJECT
- public:
-- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "fcitx.json")
-+ Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "fcitx.json")
- QStringList keys() const;
- QFcitxPlatformInputContext *create(const QString& system, const QStringList& paramList);
- };
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/files/, app-i18n/fcitx-qt5/
@ 2020-11-16 19:51 Mike Gilbert
0 siblings, 0 replies; 3+ messages in thread
From: Mike Gilbert @ 2020-11-16 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 9252387f1bd980a247dfb0cc4ecb61eb101f0879
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Nov 13 02:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 19:51:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9252387f
app-i18n/fcitx-qt5: Fix potential recursion.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild | 4 ++++
....2.5-QFcitxPlatformInputContext_recursion.patch | 27 ++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
index 610eb112d60..729c6f77088 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
@@ -41,4 +41,8 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5"
+PATCHES=(
+ "${FILESDIR}/${P}-QFcitxPlatformInputContext_recursion.patch"
+)
+
DOCS=()
diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
new file mode 100644
index 00000000000..f3e31991b53
--- /dev/null
+++ b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
@@ -0,0 +1,27 @@
+https://github.com/fcitx/fcitx-qt5/commit/6f2033c497fe0da1fd197bc3be35695b11eafd93
+
+--- /platforminputcontext/qfcitxplatforminputcontext.cpp
++++ /platforminputcontext/qfcitxplatforminputcontext.cpp
+@@ -291,8 +291,21 @@
+ return;
+ }
+ if (proxy) {
+- cursorRectChanged();
+ proxy->focusIn();
++ // We need to delegate this otherwise it may cause self-recursion in
++ // certain application like libreoffice.
++ auto window = m_lastWindow;
++ QMetaObject::invokeMethod(
++ this,
++ [this, window]() {
++ if (window != m_lastWindow) {
++ return;
++ }
++ if (auto *proxy = validICByWindow(window.data())) {
++ cursorRectChanged();
++ }
++ },
++ Qt::QueuedConnection);
+ }
+ }
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/files/, app-i18n/fcitx-qt5/
@ 2024-12-20 20:26 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-12-20 20:26 UTC (permalink / raw
To: gentoo-commits
commit: f1dff2162c845de9603964af452a3fb941ec3729
Author: Yongxiang Liang <tanekliang <AT> gmail <DOT> com>
AuthorDate: Mon Dec 9 14:20:32 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 20:26:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1dff216
app-i18n/fcitx-qt5: treeclean
Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-i18n/fcitx-qt5/Manifest | 1 -
app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild | 48 ----------------------
app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild | 44 --------------------
....2.5-QFcitxPlatformInputContext_recursion.patch | 27 ------------
app-i18n/fcitx-qt5/metadata.xml | 11 -----
5 files changed, 131 deletions(-)
diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
deleted file mode 100644
index ee9dd6e8effc..000000000000
--- a/app-i18n/fcitx-qt5/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fcitx-qt5-1.2.5.tar.xz 98604 BLAKE2B 07f3d62c3c47e5ce0805a087cc4819dec44d8038cc428a3f9b39d640e409372eeaf0f8326a00be8b4af1ef6ec21870dd5ebdabfe39a2cf92ab9cec8c32be059f SHA512 238ebd02e4b07a1bffcbf2d1534492589bce206c3bce0197e075e8cd3f1b16a2867b5e9beb3bc2a0a5e9391acbf20c07d4d5a35f1550b4e71ee663712a8d56c6
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
deleted file mode 100644
index 4dc0c8089588..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-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="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE=""
-
-BDEPEND=">=app-i18n/fcitx-4.2.9:4
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtwidgets:5
- kde-frameworks/extra-cmake-modules:0
- virtual/pkgconfig"
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5
- virtual/libintl
- x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5"
-
-PATCHES=(
- "${FILESDIR}/${P}-QFcitxPlatformInputContext_recursion.patch"
-)
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
deleted file mode 100644
index 827553c28d48..000000000000
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit cmake
-
-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="BSD GPL-2+ GPL-3+ LGPL-2+"
-SLOT="4"
-KEYWORDS=""
-IUSE=""
-
-BDEPEND=">=app-i18n/fcitx-4.2.9:4
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtwidgets:5
- kde-frameworks/extra-cmake-modules:0
- virtual/pkgconfig"
-# Private headers of dev-qt/qtgui:5 used.
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5
- virtual/libintl
- x11-libs/libxkbcommon"
-DEPEND="${RDEPEND}
- dev-qt/qtconcurrent:5"
-
-DOCS=()
diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
deleted file mode 100644
index 385abd8495ad..000000000000
--- a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/fcitx/fcitx-qt5/commit/6f2033c497fe0da1fd197bc3be35695b11eafd93
-
---- a/platforminputcontext/qfcitxplatforminputcontext.cpp
-+++ b/platforminputcontext/qfcitxplatforminputcontext.cpp
-@@ -291,8 +291,21 @@
- return;
- }
- if (proxy) {
-- cursorRectChanged();
- proxy->focusIn();
-+ // We need to delegate this otherwise it may cause self-recursion in
-+ // certain application like libreoffice.
-+ auto window = m_lastWindow;
-+ QMetaObject::invokeMethod(
-+ this,
-+ [this, window]() {
-+ if (window != m_lastWindow) {
-+ return;
-+ }
-+ if (auto *proxy = validICByWindow(window.data())) {
-+ cursorRectChanged();
-+ }
-+ },
-+ Qt::QueuedConnection);
- }
- }
-
diff --git a/app-i18n/fcitx-qt5/metadata.xml b/app-i18n/fcitx-qt5/metadata.xml
deleted file mode 100644
index 57993d881873..000000000000
--- a/app-i18n/fcitx-qt5/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
- </maintainer>
- <upstream>
- <remote-id type="github">fcitx/fcitx-qt5</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-20 20:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-20 20:26 [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/files/, app-i18n/fcitx-qt5/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-11-16 19:51 Mike Gilbert
2016-04-28 21:07 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox