gentoo resync : 25.11.2020

6 files changed, 138 insertions, 6 deletions

diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
index 75c9878d4e7e..7b8ec17fdc29 100644
--- a/app-i18n/fcitx-qt5/Manifest
+++ b/app-i18n/fcitx-qt5/Manifest
@@ -1,4 +1,9 @@
+AUX fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch 859 BLAKE2B 6dc1a1d4b942600ec953cb18134a9e5fd9a812af8eb1629f942edd0e2a927596eba3ca276be1228d09a2ac14fbb4735d299473e915a90644fb869d979a10283d SHA512 39657019234402ee385667dcb8071209502d4b8e471bdff7fa13980afe2a358891d78447fb95d0f2c14a5aaccdb878d4cc8b9e95a85bb9c22cbdea475523c3a4
 DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af SHA512 e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3
-EBUILD fcitx-qt5-1.2.3.ebuild 879 BLAKE2B be5dfb274f73fe3f86483cf143ba870e02e734c747b44fa41f2b0e42a92d78c4060c0425f8e623a2daa2781a2a29a837e73ae7dd40c527dcf6c4a5f22a04ee8b SHA512 eca74e334561ce2e0e0ddd3dd1e57bcbc3c65c843b80ca397030dfd8b53e1288a2b1efcdfb4e0b470adc12143395d37c59a544c04561a45e7107e2cdd97a09a0
-EBUILD fcitx-qt5-4.9999.ebuild 854 BLAKE2B 27fc34f2e3babda0d894e53873dca4523e22da121d31413fb415492630aa280397c29f482b6ba9ff498ac1a59495f0750a483d085a3667e6dbd5b3f029e7c427 SHA512 4db0ccaa5a3d7500c969c456c59944464b2607fe3482ecaf733d520d76a9a9da0388161ab690387aa628ce9eb453477332b3efa4f6a6d61435d0b51d060e2b3b
+DIST fcitx-qt5-1.2.4.tar.xz 107620 BLAKE2B 3577555192d2eda9e48fbd31149100f0d21fd1b0b7d162d14cef89818f86d5e32e2bb835f4f47acf150cfd0b0fc506031454e4ffe1315424314fc7512d391f8f SHA512 c9ceaaedeb26ac4c7fa1e0bf34096725afc14642b795d9c624f4fc7fbf56c04acad12d8d3ffb60c164281b6373554c0524e56209a2d1d123fbf348d15dcc282a
+DIST fcitx-qt5-1.2.5.tar.xz 98604 BLAKE2B 07f3d62c3c47e5ce0805a087cc4819dec44d8038cc428a3f9b39d640e409372eeaf0f8326a00be8b4af1ef6ec21870dd5ebdabfe39a2cf92ab9cec8c32be059f SHA512 238ebd02e4b07a1bffcbf2d1534492589bce206c3bce0197e075e8cd3f1b16a2867b5e9beb3bc2a0a5e9391acbf20c07d4d5a35f1550b4e71ee663712a8d56c6
+EBUILD fcitx-qt5-1.2.3.ebuild 953 BLAKE2B f73f95dc706619866904fc03cacad15b13faf7a5e28045d2e6e5b72dfe1fa04d979406dbddf02bc62499466b7ad804462f806b4bf0dfc76df045fabce29cd0c8 SHA512 eac8c0ad2a284f54f6487ac203fd29f1fc63b2ff6c8e193cccd9ce92ad182eafe68e8aa39c2686dd26fac4ced569933b32ea3dd286560f3764d623891e5e0edd
+EBUILD fcitx-qt5-1.2.4.ebuild 957 BLAKE2B a126752b8b2e5233f31eb1387a2537b6e87a9fd4d2c10896c756447e36263b067dd7e2628c7f3dba93a5ace3bb4471069c0876fc6025e79591badc190fb8a4c4 SHA512 d3f8568e472b53e2eb7d918ffde3f280f4437074c6e184776f4c240191a37b5f2fcb67d42a03750374a517de7aa8280cbb92525696e7006b06c3d163f5156344
+EBUILD fcitx-qt5-1.2.5.ebuild 1033 BLAKE2B 262026c136df7c9e2fee0d422394611574cc3494a9429db5a8933d089839597e99ea336b5bc2deadd5fb32517ad13795d628d91b0987f7297f18b01442c83690 SHA512 a31fba7bee9f1381e70aeb0db5aeea1d7e238fbe66a0e881f4b86cd0e44ad4e57b8a156f1b544e0030654383b749a549c03315e46b6ab9058c0318252ad1ef25
+EBUILD fcitx-qt5-4.9999.ebuild 928 BLAKE2B 5967c2e2b9ea9fc3accf378978ad1c5d29d452502c8614ad70feae710fc72266f1974850871bd96ce522ce6b27c4240afd805a461528a165a969ba1c9af5cb4e SHA512 25a3395f1309f09aaace89cfe2e38c7693108b8b72891994d73f15a847c8a9e5c38a0a686890e50ecd0a98a8580d6a1c7d99deb149e6ea8e4c4289b1a1fd572e
 MISC metadata.xml 448 BLAKE2B 5ce33f3716f2b2d13353f7393c8c406d4025e03c7c6856cf6aae6d3337b566c70fa1bd90be5c8f6e34b940c55dad1803639101b8266b9b91d405611742698f12 SHA512 37fc515507954a58b16c0fc81ddfe1b24ac21db88b7cd858ef14167526ec48ddfaa144ac5653bf9c5fffdc148ecbeb82ae57b807822c8f85a5cf90d3c81bd6a4
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
index 0517f4e0d2dc..1699cf4ea4aa 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,11 @@ SLOT="4"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE=""
 
-BDEPEND="kde-frameworks/extra-cmake-modules:5
+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:5
 	virtual/pkgconfig"
 # Private headers of dev-qt/qtgui:5 used.
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild
new file mode 100644
index 000000000000..610eb112d602
--- /dev/null
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild
@@ -0,0 +1,44 @@
+# 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="~amd64 ~hppa ~ppc ~ppc64 ~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:5
+	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/fcitx-qt5-1.2.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
new file mode 100644
index 000000000000..729c6f77088a
--- /dev/null
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild
@@ -0,0 +1,48 @@
+# 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="~amd64 ~hppa ~ppc ~ppc64 ~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:5
+	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
index 9c1255da7ca4..25daf4bb5236 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,11 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="kde-frameworks/extra-cmake-modules:5
+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:5
 	virtual/pkgconfig"
 # Private headers of dev-qt/qtgui:5 used.
 RDEPEND=">=app-i18n/fcitx-4.2.9:4
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 000000000000..f3e31991b53d
--- /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);
+     }
+ }
+