From 22899eb46c1c332d9a8a995c0be0b965fb1bcfc3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Jul 2022 14:56:29 +0100 Subject: gentoo auto-resync : 25:07:2022 - 14:56:29 --- kde-apps/kpimtextedit/Manifest | 5 - .../kpimtextedit-21.12.3-speech-optional-1.patch | 289 --------------------- .../kpimtextedit-21.12.3-speech-optional-2.patch | 25 -- .../kpimtextedit-21.12.3-speech-optional-3.patch | 100 ------- kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild | 50 ---- 5 files changed, 469 deletions(-) delete mode 100644 kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch delete mode 100644 kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch delete mode 100644 kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch delete mode 100644 kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild (limited to 'kde-apps/kpimtextedit') diff --git a/kde-apps/kpimtextedit/Manifest b/kde-apps/kpimtextedit/Manifest index 2fee4c0faf73..84df401ac044 100644 --- a/kde-apps/kpimtextedit/Manifest +++ b/kde-apps/kpimtextedit/Manifest @@ -1,8 +1,3 @@ -AUX kpimtextedit-21.12.3-speech-optional-1.patch 10518 BLAKE2B d9f7eac9018034573d7454b85a1a942f99999b2a59f628cf969895b576986e4b7dc3ab6a07aa824fd6ee042dc45f474fcf2a96ae77be4a7b21ce5416d7fd31a5 SHA512 57e97ba8c66d5aa7be34cf43ba2129fc804b39504d65853482e58141844650f427b68d17930b83d6d53fe49542b9d9e48de89be198869f0674882cede4c6e5e4 -AUX kpimtextedit-21.12.3-speech-optional-2.patch 688 BLAKE2B 1a210bc6d38ac9078bd69df4cf576d6a8727aa008e026e6ec1033089bd55444fdceec33a565c7c8060470018dce8dc26497d462d85312b2f8b411c60fe6fe893 SHA512 f3c6842cef52af589dd03d64393bd12dc38a8e042aae14b1d1ae4645821522a9937d3131264563c77e3385de7b63ab9d316f58c04a3a325989a71901a76ce599 -AUX kpimtextedit-21.12.3-speech-optional-3.patch 3446 BLAKE2B 1d14e6f4815a3d806f131ebf90e245f087921890ae8410016cdb0f885eb8dc629008234a3fe4a1d60a73dbe25d5fd2ed5b64f406e12774ff15473effb75f89e6 SHA512 cdf481e4e816b35679dc2dae7fad0068b8eae3a7efd26747589b172281c9610dc01a17c9982bcf474efbe7745c12fe131f6003ac90e9ecbb1d2ff718051d4181 -DIST kpimtextedit-21.12.3.tar.xz 211716 BLAKE2B 44a936e68752daeb2d7b4fe56c41ec6577eb112d695b048e5c9f7eb6e80037af795a381e14061ac8312babb33245eb0ec09cfecef20a36877e8118cf98f3f1e6 SHA512 85614f77c59d533ee9c947f61e7c78b9846e8f3df03f7331f86549c8ba06a9627f70dcf4743810c2fbae57615b79bd889db975c0fb69e8bcce05d17b44eda0fb DIST kpimtextedit-22.04.3.tar.xz 216340 BLAKE2B e14a85620484101643170bf142e627e9870f834627bf55e972f706b15add49e8ad921ce99435abacf75ff061690408e7a8c9fcdacc9502fcfba457790fba475d SHA512 31cb7ea6d73496951442c004f81322feb694dd713a83f1d525f3b666ba86bc837088b4e8a8cce02e404869e759773e4536ddd5914c6f7d3fc966336adc68d3cb -EBUILD kpimtextedit-21.12.3.ebuild 1213 BLAKE2B a4f0f6106328a56ce9f5cea80eb3b52f88eee6e687ad8c47bbc7ae1b0ae34688008b25f728258d855e1afe3bf6048a01f636902f38130358533ae2b52f8b3a69 SHA512 89410b04458da0f29b04e4e155b1e7c83a16b6bd1b82a8be908a329dc34eedc696b0273cbd8122ff29710dc20d69b145d2fab3fec4a85600d915fd2b798fc059 EBUILD kpimtextedit-22.04.3.ebuild 1147 BLAKE2B c8eb0baf2c31b99423326a3929dc7168bb4148bd03f75906f0ccf7f0c7530814879b459a70fc363d66ce2dfcbcd630cb8bc8038b2f2dcfa490d47cb820a6dd7c SHA512 b29f3b2816186e1b5df12d4286612cbc25f5088b10cedd2757c7fcfd7b1f60876fadfa15d9e2fc47cdec96640957491decca0dda96b31548a6cbfc05ffd202db MISC metadata.xml 468 BLAKE2B 7d0732951e5cb3f8fa895bcd7646ad46f2834c8a67324cd12aecd43de9d525cce139bb78704e32f9d43f3c3e9dc8b6d785182306e846387ea872965561bfcff8 SHA512 0d1f7883fa05a190c019d5ab1d0d6fd54e73ccd0b9f09c790f7c818636c5961331aa17058d0fe5ac0bd8f90736fc7148cd2b40c4cc772039e875057a60d501b4 diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch deleted file mode 100644 index d7fa7474a4bf..000000000000 --- a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-1.patch +++ /dev/null @@ -1,289 +0,0 @@ -From 53f187315f51e7d53a03c4ed464812b388465c10 Mon Sep 17 00:00:00 2001 -From: Laurent Montel -Date: Mon, 27 Dec 2021 07:53:16 +0100 -Subject: [PATCH] Add support for building without texttospeech as for the - moment we don't - -have it in qt6 ---- - CMakeLists.txt | 10 +++++- - src/CMakeLists.txt | 34 ++++++++++++++----- - .../plaintexteditor/plaintexteditor.cpp | 4 +++ - .../plaintexteditor/plaintexteditorwidget.cpp | 10 ++++-- - .../richtexteditor/richtexteditor.cpp | 5 ++- - .../richtexteditor/richtexteditorwidget.cpp | 9 ++++- - 6 files changed, 59 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae59804..d1a0181 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -76,7 +76,15 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055A00) - - --find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS TextToSpeech) -+find_package(Qt5TextToSpeech ${QT_REQUIRED_VERSION} CONFIG) -+set_package_properties(Qt5TextToSpeech PROPERTIES DESCRIPTION -+ "Add support for texttospeed" -+ TYPE OPTIONAL -+) -+if(TARGET Qt5::TextToSpeech) -+ set(HAVE_TEXT_TO_SPEECH_SUPPORT TRUE) -+ add_definitions(-DHAVE_TEXT_TO_SPEECH_SUPPORT) -+endif() - - if(BUILD_TESTING) - find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Test) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2720e0a..98e2854 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) - target_sources(KF5PimTextEdit PRIVATE - texttospeech/texttospeech.cpp - texttospeech/texttospeechwidget.cpp -@@ -76,6 +76,7 @@ target_sources(KF5PimTextEdit PRIVATE - texttospeech/texttospeechlanguagecombobox.h - texttospeech/texttospeechactions.h - ) -+endif() - - target_sources(KF5PimTextEdit PRIVATE - grantleebuilder/plaintextmarkupbuilder.cpp -@@ -168,7 +169,12 @@ target_link_libraries(KF5PimTextEdit - KF5::SyntaxHighlighting - Qt::TextToSpeech - ) -- -+if (HAVE_TEXT_TO_SPEECH_SUPPORT) -+ target_link_libraries(KF5PimTextEdit -+ PRIVATE -+ Qt::TextToSpeech -+ ) -+endif() - set_target_properties(KF5PimTextEdit PROPERTIES - VERSION ${KPIMTEXTEDIT_VERSION} - SOVERSION ${KPIMTEXTEDIT_SOVERSION} -@@ -240,7 +246,7 @@ ecm_generate_headers(KPimTextEdit_CamelCasetexteditor_commonwidget_HEADERS - ) - - -- -+if (HAVE_TEXT_TO_SPEECH_SUPPORT) - ecm_generate_headers(KPimTextEdit_CamelCasetexttospeechs_HEADERS - HEADER_NAMES - TextToSpeech -@@ -252,7 +258,7 @@ ecm_generate_headers(KPimTextEdit_CamelCasetexttospeechs_HEADERS - PREFIX KPIMTextEdit - RELATIVE texttospeech - ) -- -+endif() - ecm_generate_headers(KPimTextEdit_Camelcasecomposerng_HEADERS - HEADER_NAMES - RichTextComposer -@@ -269,11 +275,22 @@ ecm_generate_headers(KPimTextEdit_Camelcasecomposerng_HEADERS - - - ########### install files ############### -+if (HAVE_TEXT_TO_SPEECH_SUPPORT) -+ install(FILES -+ ${KPimTextEdit_texttospeechs_HEADERS} -+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPIMTextEdit/kpimtextedit -+ COMPONENT Devel -+ ) -+ install(FILES -+ ${KPimTextEdit_CamelCasetexttospeechs_HEADERS} -+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPIMTextEdit/KPIMTextEdit/ -+ COMPONENT Devel -+ ) -+endif() - - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/kpimtextedit_export.h - ${kpimtextedit_HEADERS} -- ${KPimTextEdit_texttospeechs_HEADERS} - ${KPimTextEdit_richtexteditor_HEADERS} - ${KPimTextEdit_texteditor_commonwidget_HEADERS} - ${KPimTextEdit_plaintexteditor_HEADERS} -@@ -288,7 +305,6 @@ install(FILES - ${KPimTextEdit_CamelCase_HEADERS} - ${KPimTextEdit_CamelCasetextrichtexteditor_HEADERS} - ${KPimTextEdit_CamelCaseplaintexteditor_HEADERS} -- ${KPimTextEdit_CamelCasetexttospeechs_HEADERS} - ${KPimTextEdit_CamelCasetexteditor_commonwidget_HEADERS} - ${KPimTextEdit_Camelcasecomposerng_HEADERS} - ${KPimTextEdit_CamelCaseemoticon_HEADERS} -@@ -306,8 +322,10 @@ if (BUILD_TESTING) - add_subdirectory(texteditor/commonwidget/autotests) - add_subdirectory(texteditor/plaintexteditor/tests) - add_subdirectory(texteditor/richtexteditor/tests) -- add_subdirectory(texttospeech/autotests) -- add_subdirectory(texttospeech/tests) -+ if (HAVE_TEXT_TO_SPEECH_SUPPORT) -+ add_subdirectory(texttospeech/autotests) -+ add_subdirectory(texttospeech/tests) -+ endif() - add_subdirectory(composer-ng/autotests) - add_subdirectory(composer-ng/tests) - add_subdirectory(grantleebuilder/autotests) -diff --git a/src/texteditor/plaintexteditor/plaintexteditor.cpp b/src/texteditor/plaintexteditor/plaintexteditor.cpp -index cfa0741..4559568 100644 ---- a/src/texteditor/plaintexteditor/plaintexteditor.cpp -+++ b/src/texteditor/plaintexteditor/plaintexteditor.cpp -@@ -18,7 +18,9 @@ - #include - #include - -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - #include "texttospeech/texttospeech.h" -+#endif - #include - #include - -@@ -181,6 +183,7 @@ void PlainTextEditor::contextMenuEvent(QContextMenuEvent *event) - } - } - if (d->supportFeatures & TextToSpeech) { -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - if (KPIMTextEdit::TextToSpeech::self()->isReady()) { - if (!emptyDocument) { - QAction *speakAction = popup->addAction(i18n("Speak Text")); -@@ -188,6 +191,7 @@ void PlainTextEditor::contextMenuEvent(QContextMenuEvent *event) - connect(speakAction, &QAction::triggered, this, &PlainTextEditor::slotSpeakText); - } - } -+#endif - } - if (webShortcutSupport() && textCursor().hasSelection()) { - popup->addSeparator(); -diff --git a/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp b/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp -index 3251ea3..77a9b45 100644 ---- a/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp -+++ b/src/texteditor/plaintexteditor/plaintexteditorwidget.cpp -@@ -8,8 +8,9 @@ - #include "plaintexteditfindbar.h" - #include "plaintexteditor.h" - #include "slidecontainer.h" -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - #include "texttospeech/texttospeechwidget.h" -- -+#endif - #include - #include - -@@ -21,7 +22,9 @@ public: - - KPIMTextEdit::PlainTextEditFindBar *mFindBar = nullptr; - PlainTextEditor *mEditor = nullptr; -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget = nullptr; -+#endif - KPIMTextEdit::SlideContainer *mSliderContainer = nullptr; - }; - -@@ -75,16 +78,19 @@ void PlainTextEditorWidget::init(PlainTextEditor *customEditor) - { - auto lay = new QVBoxLayout(this); - lay->setContentsMargins({}); -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - d->mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this); - lay->addWidget(d->mTextToSpeechWidget); -+#endif - if (customEditor) { - d->mEditor = customEditor; - } else { - d->mEditor = new PlainTextEditor; - } - lay->addWidget(d->mEditor); -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - connect(d->mEditor, &PlainTextEditor::say, d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say); -- -+#endif - d->mSliderContainer = new KPIMTextEdit::SlideContainer(this); - - d->mFindBar = new KPIMTextEdit::PlainTextEditFindBar(d->mEditor, this); -diff --git a/src/texteditor/richtexteditor/richtexteditor.cpp b/src/texteditor/richtexteditor/richtexteditor.cpp -index dfdf7c5..a004434 100644 ---- a/src/texteditor/richtexteditor/richtexteditor.cpp -+++ b/src/texteditor/richtexteditor/richtexteditor.cpp -@@ -26,7 +26,9 @@ - #include - #include - #include -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - #include -+#endif - - #include - #include -@@ -247,7 +249,7 @@ QMenu *RichTextEditor::mousePopupMenu(QPoint pos) - allowTabAction->setChecked(!tabChangesFocus()); - connect(allowTabAction, &QAction::triggered, this, &RichTextEditor::slotAllowTab); - } -- -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - if (KPIMTextEdit::TextToSpeech::self()->isReady()) { - if (!emptyDocument) { - QAction *speakAction = popup->addAction(i18n("Speak Text")); -@@ -255,6 +257,7 @@ QMenu *RichTextEditor::mousePopupMenu(QPoint pos) - connect(speakAction, &QAction::triggered, this, &RichTextEditor::slotSpeakText); - } - } -+#endif - if (webShortcutSupport() && textCursor().hasSelection()) { - popup->addSeparator(); - const QString selectedText = textCursor().selectedText(); -diff --git a/src/texteditor/richtexteditor/richtexteditorwidget.cpp b/src/texteditor/richtexteditor/richtexteditorwidget.cpp -index d0d8e14..d84cf3f 100644 ---- a/src/texteditor/richtexteditor/richtexteditorwidget.cpp -+++ b/src/texteditor/richtexteditor/richtexteditorwidget.cpp -@@ -10,8 +10,9 @@ - - #include - #include -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - #include -- -+#endif - #include "slidecontainer.h" - - using namespace KPIMTextEdit; -@@ -23,7 +24,9 @@ public: - - KPIMTextEdit::RichTextEditFindBar *mFindBar = nullptr; - RichTextEditor *mEditor = nullptr; -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget = nullptr; -+#endif - KPIMTextEdit::SlideContainer *mSliderContainer = nullptr; - }; - -@@ -97,14 +100,18 @@ void RichTextEditorWidget::init(RichTextEditor *customEditor) - { - auto lay = new QVBoxLayout(this); - lay->setContentsMargins({}); -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - d->mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this); - lay->addWidget(d->mTextToSpeechWidget); -+#endif - if (customEditor) { - d->mEditor = customEditor; - } else { - d->mEditor = new RichTextEditor; - } -+#ifdef HAVE_TEXT_TO_SPEECH_SUPPORT - connect(d->mEditor, &RichTextEditor::say, d->mTextToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say); -+#endif - lay->addWidget(d->mEditor); - - d->mSliderContainer = new KPIMTextEdit::SlideContainer(this); --- -GitLab - diff --git a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch b/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch deleted file mode 100644 index a078840af05c..000000000000 --- a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3596c0a90f590c409654a9aec2b087809cff0a79 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 28 Dec 2021 12:26:25 +0100 -Subject: [PATCH] Fix build without TextToSpeech available - -(the linking happens again further down, inside the if) ---- - src/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 98e2854..a08978e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -167,7 +167,6 @@ target_link_libraries(KF5PimTextEdit - KF5::XmlGui - KF5::I18n - KF5::SyntaxHighlighting -- Qt::TextToSpeech - ) - if (HAVE_TEXT_TO_SPEECH_SUPPORT) - target_link_libraries(KF5PimTextEdit --- -GitLab - 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 deleted file mode 100644 index 617864cd7b02..000000000000 --- a/kde-apps/kpimtextedit/files/kpimtextedit-21.12.3-speech-optional-3.patch +++ /dev/null @@ -1,100 +0,0 @@ -From b248e11f0c6f4e389052e616e6dd262135a23f3c Mon Sep 17 00:00:00 2001 -From: Laurent Montel -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.3.ebuild b/kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild deleted file mode 100644 index 227a61ba07a8..000000000000 --- a/kde-apps/kpimtextedit/kpimtextedit-21.12.3.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_QTHELP="true" -ECM_TEST="true" -KFMIN=5.88.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Extended text editor for PIM applications" - -LICENSE="LGPL-2.1+" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="speech" - -RESTRICT="test" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=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 ) -" - -PATCHES=( "${FILESDIR}"/${PN}-21.12.3-speech-optional-{1,2,3}.patch ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package speech Qt5TextToSpeech) - ) - ecm_src_configure -} -- cgit v1.2.3