overlay

commit: 3d8f5c6bddb4c5aa50ce8833c185bdf483afa6cc
parent 2dcdfa1fbf9e1b969d4b3ec39af9db40095f5963
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Fri, 21 Jul 2023 08:43:04 +0200

app-i18n/fcitx-qt: Fix patches

Diffstat:
M
app-i18n/fcitx-qt/files/0001-CMake-Add-option-to-disable-X11-support.patch
8
++++----
M
app-i18n/fcitx-qt/files/0002-CMake-Add-option-to-disable-DBus-support.patch
16
++++++++--------

2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/app-i18n/fcitx-qt/files/0001-CMake-Add-option-to-disable-X11-support.patch b/app-i18n/fcitx-qt/files/0001-CMake-Add-option-to-disable-X11-support.patch
@@ -1,4 +1,4 @@
-From 24618aa9f95b6e029b97a0153e11ede846330fd9 Mon Sep 17 00:00:00 2001
+From cc3bdb96d4fb991b373068114143515ead5bc7d6 Mon Sep 17 00:00:00 2001
 From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
 Date: Wed, 21 Sep 2022 08:59:16 +0200
 Subject: [PATCH 1/2] CMake: Add option to disable X11 support
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] CMake: Add option to disable X11 support
  1 file changed, 15 insertions(+), 12 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9050810..83c96fd 100644
+index e526b58..144884d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -13,6 +13,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@@ -19,7 +19,7 @@ index 9050810..83c96fd 100644
  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)
-@@ -43,24 +44,26 @@ include(ECMSetupVersion)
+@@ -42,24 +43,26 @@ include(ECMSetupVersion)
  include(ECMGenerateHeaders)
  include(ECMUninstallTarget)
  
@@ -59,5 +59,5 @@ index 9050810..83c96fd 100644
  
  set(Fcitx5Qt6_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/Fcitx5Qt6)
 -- 
-2.35.1
+2.41.0
 
diff --git a/app-i18n/fcitx-qt/files/0002-CMake-Add-option-to-disable-DBus-support.patch b/app-i18n/fcitx-qt/files/0002-CMake-Add-option-to-disable-DBus-support.patch
@@ -1,4 +1,4 @@
-From 2912d6fa4bbd0bda774ed82e77e3ce48671533e7 Mon Sep 17 00:00:00 2001
+From 76db7740c646dfcc5738696c974ae385fd2ed773 Mon Sep 17 00:00:00 2001
 From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
 Date: Wed, 21 Sep 2022 08:59:30 +0200
 Subject: [PATCH 2/2] CMake: Add option to disable DBus support
@@ -9,7 +9,7 @@ Subject: [PATCH 2/2] CMake: Add option to disable DBus support
  2 files changed, 17 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 83c96fd..1c963cb 100644
+index 144884d..f0830ba 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -10,6 +10,7 @@ find_package(ECM 1.4.0 REQUIRED)
@@ -20,7 +20,7 @@ index 83c96fd..1c963cb 100644
  option(ENABLE_QT4 "Enable Qt 4" On)
  option(ENABLE_QT5 "Enable Qt 5" On)
  option(ENABLE_QT6 "Enable Qt 6" Off)
-@@ -76,19 +77,25 @@ if(ENABLE_QT4)
+@@ -75,19 +76,25 @@ if(ENABLE_QT4)
  endif()
  
  if(ENABLE_QT5)
@@ -34,8 +34,8 @@ index 83c96fd..1c963cb 100644
  endif()
  
  if(ENABLE_QT6)
--  find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus)
-+  find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core)
+-  find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus Widgets)
++  find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core Widgets)
    find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private)
 +  if (ENABLE_DBUS)
 +    find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED DBus)
@@ -50,7 +50,7 @@ index 83c96fd..1c963cb 100644
  
  enable_testing()
 diff --git a/qt5/CMakeLists.txt b/qt5/CMakeLists.txt
-index f9ada81..c54d0a1 100644
+index 9defa3d..f2c207b 100644
 --- a/qt5/CMakeLists.txt
 +++ b/qt5/CMakeLists.txt
 @@ -1,8 +1,12 @@
@@ -68,7 +68,7 @@ index f9ada81..c54d0a1 100644
 +  endif()
    add_subdirectory(widgetsaddons)
    add_subdirectory(quickphrase-editor)
- endif()
+   add_subdirectory(immodule-probing)
 -- 
-2.35.1
+2.41.0