kde-apps/kpimtextedit: Fix IUSE speech

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

5 files changed, 110 insertions, 3 deletions

diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.2-speech-optional-1.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch
index d7fa7474a4b..d7fa7474a4b 100644
--- a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.2-speech-optional-1.patch
+++ b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch
diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.2-speech-optional-2.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch
index a078840af05..a078840af05 100644
--- a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.2-speech-optional-2.patch
+++ b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch
diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch
new file mode 100644
index 00000000000..617864cd7b0
--- /dev/null
+++ b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch
@@ -0,0 +1,100 @@
+From b248e11f0c6f4e389052e616e6dd262135a23f3c Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 14 Feb 2022 18:58:34 +0100
+Subject: [PATCH] Add info about texttospeech support
+
+---
+ CMakeLists.txt                    |  7 +++++--
+ kpimtextedit-texttospeech.h.cmake |  2 ++
+ src/CMakeLists.txt                | 11 ++++++-----
+ 3 files changed, 14 insertions(+), 8 deletions(-)
+ create mode 100644 kpimtextedit-texttospeech.h.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1c48c8..a00bdeb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,10 +82,13 @@ set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION
+     TYPE OPTIONAL
+ )
+ if(TARGET Qt5::TextToSpeech)
+-    set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE)
+-    add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
++    add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT)
++    set(KPIMTEXTEDIT_TEXT_TO_SPEECH TRUE)
+ endif()
+ 
++configure_file(kpimtextedit-texttospeech.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit-texttospeech.h )
++
++
+ if(BUILD_TESTING)
+     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test)
+     add_definitions(-DBUILD_TESTING)
+diff --git a/kpimtextedit-texttospeech.h.cmake b/kpimtextedit-texttospeech.h.cmake
+new file mode 100644
+index 0000000..c82af97
+--- /dev/null
++++ b/kpimtextedit-texttospeech.h.cmake
+@@ -0,0 +1,2 @@
++#cmakedefine01 KPIMTEXTEDIT_TEXT_TO_SPEECH 
++
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3e24a2f..4e02e5f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -53,7 +53,7 @@ target_sources(KF5PimTextEdit PRIVATE
+     composer-ng/richtextcomposeremailquotehighlighter.h
+     composer-ng/richtextcomposerwidget.h
+     )
+-if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+ target_sources(KF5PimTextEdit PRIVATE
+     texttospeech/texttospeech.cpp
+     texttospeech/texttospeechwidget.cpp
+@@ -168,7 +168,7 @@ target_link_libraries(KF5PimTextEdit
+     KF5::I18n
+     KF5::SyntaxHighlighting
+     )
+-if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+     target_link_libraries(KF5PimTextEdit
+         PRIVATE
+         Qt5::TextToSpeech
+@@ -245,7 +245,7 @@ ecm_generate_headers(KPimTextEdit_CamelCasetexteditor_commonwidget_HEADERS
+     )
+ 
+ 
+-if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+ ecm_generate_headers(KPimTextEdit_CamelCasetexttospeechs_HEADERS
+     HEADER_NAMES
+     TextToSpeech
+@@ -274,7 +274,7 @@ ecm_generate_headers(KPimTextEdit_Camelcasecomposerng_HEADERS
+ 
+ 
+ ########### install files ###############
+-if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+     install(FILES
+         ${KPimTextEdit_texttospeechs_HEADERS}
+         DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPIMTextEdit/kpimtextedit
+@@ -289,6 +289,7 @@ endif()
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit_export.h
++    ${CMAKE_CURRENT_BINARY_DIR}/../kpimtextedit-texttospeech.h
+     ${kpimtextedit_HEADERS}
+     ${KPimTextEdit_richtexteditor_HEADERS}
+     ${KPimTextEdit_texteditor_commonwidget_HEADERS}
+@@ -321,7 +322,7 @@ if (BUILD_TESTING)
+     add_subdirectory(texteditor/commonwidget/autotests)
+     add_subdirectory(texteditor/plaintexteditor/tests)
+     add_subdirectory(texteditor/richtexteditor/tests)
+-    if (HAVE_TEXT_TO_SPEECH_SUPPORT)
++    if (KPIMTEXTEDIT_TEXT_TO_SPEECH)
+         add_subdirectory(texttospeech/autotests)
+         add_subdirectory(texttospeech/tests)
+     endif()
+-- 
+GitLab
+
diff --git a/kde-apps/kpimtextedit/kpimtextedit-21.12.49.9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.12.49.9999.ebuild
index 512857fe1e3..8af46b3db2c 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-21.12.49.9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-21.12.49.9999.ebuild
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
 	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-21.12.2-speech-optional-{1,2}.patch )
+PATCHES=( "${FILESDIR}"/${PN}-21.12.3-speech-optional-{1,2,3}.patch )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
index 80cb9393c1a..983108b72b7 100644
--- a/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
+++ b/kde-apps/kpimtextedit/kpimtextedit-9999.ebuild
@@ -16,13 +16,12 @@ DESCRIPTION="Extended text editor for PIM applications"
 LICENSE="LGPL-2.1+"
 SLOT="5"
 KEYWORDS=""
-IUSE=""
+IUSE="speech"
 
 RESTRICT="test"
 
 RDEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
@@ -35,7 +34,15 @@ RDEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/sonnet-${KFMIN}:5
 	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
 "
 DEPEND="${RDEPEND}
 	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
 "
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+	)
+	ecm_src_configure
+}