gentoo auto-resync : 14:01:2024 - 01:14:49

2 files changed, 0 insertions, 159 deletions

diff --git a/app-i18n/fcitx-qt/Manifest b/app-i18n/fcitx-qt/Manifest
index 8060327ca06c..4ab9e295aa75 100644
--- a/app-i18n/fcitx-qt/Manifest
+++ b/app-i18n/fcitx-qt/Manifest
@@ -1,4 +1,3 @@
-AUX fcitx-qt-5.1.3-make-qwayland-workaround-optional.patch 6573 BLAKE2B 86d44e52b496d5d2ec737282e769069851f328005f0f596de063737312055d83cc400026bc7d7829ea502e3ccf8713e84ff46d6bd6505f9f4fc281dec7997657 SHA512 71eaf7f6ad98a5cbcf9fc3c624b00abba2c42d7551138c24e5f2d032a262567421585b88c443ff14b6d59430205d0a12ae0ff18dc13e0ac47645c25263066984
 DIST fcitx-qt-5.1.4.tar.xz 92880 BLAKE2B b165740e173fe21e8953b5605713c0250265e4906c25a56c5320f2560d261a9b8d4111f0960287b08fa7ac18c917d0da737fb1022bba7f76ca2e2e00d2d4f060 SHA512 942999327415e3d4195c18c2fb02e12a313e3a2cf1dd1e32d0e6a7a98b625bcc1b3a7278934bb583a029dee43a271dba9bac75face42729249557f60e1146adf
 EBUILD fcitx-qt-5.1.4.ebuild 1339 BLAKE2B 24276b221a1b7276c48de5843348f8b46408cc3082a690b97fad3dfb29af9650ff2ef15ec0b12ff89682ad0892b1b8e39ed080f2510e974603fa399bb31ac144 SHA512 8fbb2cf27a59479ad5db7618d63ca09ef3fff2b279b7dbb6e425c56d60a7548dd0275d89d4bdb5e899e78a383dceb914978f50ddd6efc3b856cdae8ebb5887d8
 MISC metadata.xml 746 BLAKE2B e08a44b85b899bb04c0683bea836d0c79cdba1b82e0e6a2ecd85e32f258bd8b2e305cc9a95465b34fb73707c718e1e27a2835d8b3afb98c9aa184a7efc0f55da SHA512 81b171a9e601eba0ee1df96f7662f3486a30236a9faed67c274446f75d998529eb37233c928307db3875349afec1db704e25149d67ff45055bd7d0bd09047c45
diff --git a/app-i18n/fcitx-qt/files/fcitx-qt-5.1.3-make-qwayland-workaround-optional.patch b/app-i18n/fcitx-qt/files/fcitx-qt-5.1.3-make-qwayland-workaround-optional.patch
deleted file mode 100644
index 0ef5fc8652a7..000000000000
--- a/app-i18n/fcitx-qt/files/fcitx-qt-5.1.3-make-qwayland-workaround-optional.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-Backport of https://github.com/fcitx/fcitx5-qt/commit/af535e7e106f69e7dc6dc28db3653601d1e6156a
-
-Backport upstream commit af535e7e making QtWayland optional.
-All QtWayland-related code is guarded behind `isWayland` checks anyways.
-This benefits users of pure X11 setups.
-
-Author: Lucio Sauer <watermanpaint@posteo.net>
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,7 @@ option(ENABLE_QT6 "Enable Qt 6" Off)
- option(BUILD_ONLY_PLUGIN "Build only plugin" Off)
- option(BUILD_STATIC_PLUGIN "Build plugin as static" Off)
- option(WITH_FCITX_PLUGIN_NAME "Enable plugin name with fcitx" On)
-+option(ENABLE_QT6_WAYLAND_WORKAROUND "Enable Qt6 Wayland workaround" On)
- 
- if (BUILD_ONLY_PLUGIN)
-   set(LIBRARY_TYPE OBJECT)
---- a/qt5/platforminputcontext/fcitxcandidatewindow.cpp
-+++ b/qt5/platforminputcontext/fcitxcandidatewindow.cpp
-@@ -21,7 +21,7 @@
- #include <QtMath>
- #include <utility>
- 
--#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-+#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
- #include <QtWaylandClient/private/qwayland-xdg-shell.h>
- #include <QtWaylandClient/private/qwaylanddisplay_p.h>
- #include <QtWaylandClient/private/qwaylandintegration_p.h>
-@@ -34,7 +34,7 @@ namespace fcitx {
- 
- namespace {
- 
--#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-+#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
- class XdgWmBase : public QtWayland::xdg_wm_base {
- public:
-     using xdg_wm_base::xdg_wm_base;
-@@ -120,7 +120,7 @@ FcitxCandidateWindow::FcitxCandidateWindow(QWindow *window,
-         // Not using Qt::BypassWindowManagerHint ensures wayland handle
-         // fractional scale.
-         setFlags(Qt::ToolTip | commonFlags);
--#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-+#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-         if (auto instance = QtWaylandClient::QWaylandIntegration::instance()) {
-             for (QtWaylandClient::QWaylandDisplay::RegistryGlobal global :
-                  instance->display()->globals()) {
-@@ -132,7 +132,6 @@ FcitxCandidateWindow::FcitxCandidateWindow(QWindow *window,
-                 }
-             }
-         }
--#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-         setProperty("_q_waylandPopupAnchor",
-                     QVariant::fromValue(Qt::BottomEdge | Qt::LeftEdge));
-         setProperty("_q_waylandPopupGravity",
-@@ -142,7 +141,6 @@ FcitxCandidateWindow::FcitxCandidateWindow(QWindow *window,
-             static_cast<unsigned int>(
-                 QtWayland::xdg_positioner::constraint_adjustment_slide_x |
-                 QtWayland::xdg_positioner::constraint_adjustment_flip_y));
--#endif
- #endif
-     } else {
-         // Qt::Popup ensures X11 doesn't apply tooltip animation under kwin.
-@@ -484,7 +482,7 @@ void FcitxCandidateWindow::updateClientSideUI(
-     QRect cursorRect = context_->cursorRectangleWrapper();
-     QRect screenGeometry;
- 
--#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-+#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-     if (isWayland_) {
-         auto waylandWindow =
-             static_cast<QtWaylandClient::QWaylandWindow *>(window->handle());
-@@ -520,12 +518,10 @@ void FcitxCandidateWindow::updateClientSideUI(
-         }
-         bool wasVisible = isVisible();
-         bool cursorRectChanged = false;
--#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-         if (property("_q_waylandPopupAnchorRect") != cursorRect) {
-             cursorRectChanged = true;
-             setProperty("_q_waylandPopupAnchorRect", cursorRect);
-         }
--#endif
-         // This try to ensure xdg_popup is available.
-         show();
-         xdg_popup *xdgPopup = static_cast<xdg_popup *>(
-@@ -553,7 +549,6 @@ void FcitxCandidateWindow::updateClientSideUI(
-             positioner->destroy();
-             return;
-         }
--#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-         // Check if we need remap.
-         // If it was invisible, nothing need to be done.
-         // If cursor rect changed, the window must be remapped.
-@@ -570,7 +565,6 @@ void FcitxCandidateWindow::updateClientSideUI(
-             show();
-         }
-         return;
--#endif
-     }
- #endif
-     // Try to apply the screen edge detection over the window, because if we
---- a/qt5/platforminputcontext/fcitxcandidatewindow.h
-+++ b/qt5/platforminputcontext/fcitxcandidatewindow.h
-@@ -19,7 +19,7 @@
- #include <qscopedpointer.h>
- #include <vector>
- 
--#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-+#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
- #include <QtWaylandClient/private/qwayland-xdg-shell.h>
- #endif
- 
-@@ -93,7 +93,7 @@ public Q_SLOTS:
-     std::vector<QRect> candidateRegions_;
-     QPointer<QWindow> parent_;
- 
--#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-+#if defined(FCITX_ENABLE_QT6_WAYLAND_WORKAROUND) && QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
-     QScopedPointer<QtWayland::xdg_wm_base> xdgWmBase_;
- #endif
- };
---- a/qt6/CMakeLists.txt
-+++ b/qt6/CMakeLists.txt
-@@ -1,8 +1,10 @@
- 
- find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus Widgets)
- find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private)
--find_package(Qt6WaylandClient ${REQUIRED_QT6_VERSION} REQUIRED Private)
--find_package(Qt6WaylandGlobalPrivate ${REQUIRED_QT6_VERSION} REQUIRED)
-+if (ENABLE_QT6_WAYLAND_WORKAROUND)
-+  find_package(Qt6WaylandClient ${REQUIRED_QT6_VERSION} REQUIRED Private)
-+  find_package(Qt6WaylandGlobalPrivate ${REQUIRED_QT6_VERSION} REQUIRED)
-+endif()
- 
- add_subdirectory(dbusaddons)
- add_subdirectory(platforminputcontext)
---- a/qt6/platforminputcontext/CMakeLists.txt
-+++ b/qt6/platforminputcontext/CMakeLists.txt
-@@ -49,11 +49,16 @@ target_link_libraries(fcitx5platforminputcontextplugin-qt6
-                           XCB::XCB
-                           Fcitx5Qt6::DBusAddons
-                           XKBCommon::XKBCommon
--                          Qt6::WaylandGlobalPrivate
--                          Qt6::WaylandClient
--                          Qt6::WaylandClientPrivate
-                          )
- 
-+if (ENABLE_QT6_WAYLAND_WORKAROUND)
-+    target_compile_definitions(fcitx5platforminputcontextplugin-qt6 PRIVATE "-DFCITX_ENABLE_QT6_WAYLAND_WORKAROUND")
-+    target_link_libraries(fcitx5platforminputcontextplugin-qt6
-+        Qt6::WaylandGlobalPrivate
-+        Qt6::WaylandClient
-+        Qt6::WaylandClientPrivate)
-+endif()
-+
- get_target_property(_QT6_QMAKE_EXECUTABLE Qt6::qmake LOCATION)
- execute_process(
-     COMMAND ${_QT6_QMAKE_EXECUTABLE} -query "QT_INSTALL_PLUGINS"