gentoo christmass resync : 25.12.2020

3 files changed, 324 insertions, 5 deletions

diff --git a/sci-electronics/ktechlab/Manifest b/sci-electronics/ktechlab/Manifest
index 036ad70195de..54e7d804967a 100644
--- a/sci-electronics/ktechlab/Manifest
+++ b/sci-electronics/ktechlab/Manifest
@@ -1,3 +1,4 @@
+AUX ktechlab-0.50.0-deps.patch 9144 BLAKE2B 1b93b6977fdc9b1d648f276d18dcde6fb302de36d6873db561577e630d54cc81d2628fdec9cd410068e8c9b61c7ad11bbf121a6574c8463fee62b9b765e7ced4 SHA512 7ef87942c27829a40bb8a1b7b15a0e67c691b15ffffd160d05b4b6c3b812a1fc736ba78b64ac9db3f5cb8c4ca6ac1edb243decc4703e8f489a52257d322d71e1
 DIST ktechlab-0.50.0.tar.xz 2195752 BLAKE2B 213bee84364f8fc99ee6991ca465ce126f7fd16932a9e399947428955156500ce57e2c93170e16698b3d5e64f294ea208bff388c0d8e2ee6551bbe97e785233e SHA512 236be69f18ae21f1dffe1ae3d9e55665b6bdfd443bf6b3ae39c2e370923bae679fe8b1b09dac3d354a61278ca9f85113804a47a95a7f1de996b330f5a4b13a42
-EBUILD ktechlab-0.50.0.ebuild 1274 BLAKE2B f1781f8cf714902dd9d574d7b28cb4ab4c6f89052bfa49aa9c9e6fbb50fe3492e722974f0d3fd21c598ca0accf76f10f6bbc5bffed17823a66ad52d0f2666ebb SHA512 7e98c2f0be1bf8276903aeb1a373f32570ea4c852ea44699b7acd0e63d4cfa47170142aa953019318487a3f9a09022343aa20ce3866179f28389eff719957a45
+EBUILD ktechlab-0.50.0-r1.ebuild 1267 BLAKE2B 827cc18442b5933e52acb165b9864c8d653d236d8c9a4274237382db4ab175e2f63009ff615d2ce83de68ffbaffaafac9e316afb984f0ce05b73caff8a7d26f5 SHA512 a157a0d1eafb23950dd400f5878c743598afbdc9b5172efa5e360b5d9df0dddcb01d6ec19ae1a6af682c375dd41d57b5605337194f323b8dea77543f65b55db7
 MISC metadata.xml 389 BLAKE2B eb1975abf8d47ba0a692d395ed068aa2cb45f12223cba29838abf0a67286ed1b90746c9558bd792099029e587beacfae4f035fed84b905aad1dfb8b9761dc804 SHA512 f3f6a85eb3fcd5cf47797847848712dbf3699ce1382e4b55e4a396c16679739d7ddc1d75b414591fcba4b993a0409e0155358f0172716572a336e7c5b8913d67
diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch
new file mode 100644
index 000000000000..67ded56c9594
--- /dev/null
+++ b/sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch
@@ -0,0 +1,317 @@
+From 76764e7f7b64d36fc4f650516838662b406aa8ac Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Mon, 2 Nov 2020 18:53:22 +0100
+Subject: [PATCH 1/4] cmake: stop requiring the Solid framework
+
+It is not used.
+
+(cherry picked from commit aaf83474c8a145ad67ed03074dd4033f5a12c2ab)
+---
+ CMakeLists.txt | 1 -
+ README         | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 15efb196..73e40695 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,7 +41,6 @@ find_package(KF5 REQUIRED COMPONENTS
+     Parts
+     TextEditor
+     TextWidgets
+-    Solid
+     WidgetsAddons
+     WindowSystem
+     XmlGui
+diff --git a/README b/README
+index 940e2b3b..9f91740d 100644
+--- a/README
++++ b/README
+@@ -122,7 +122,7 @@ Required dependencies
+ - Extra Cmake Modules (ECM)
+ - KDE Frameworks 5 libraries -dev  (at the time of writing:
+    Config CoreAddons DocTools IconThemes I18n KDELibs4Support
+-    KHtml KIO Parts TextEditor TextWidgets Solid WidgetsAddons
++    KHtml KIO Parts TextEditor TextWidgets WidgetsAddons
+     WindowSystem XmlGui)
+ 
+ Optional dependencies
+-- 
+2.29.2
+
+
+From 672dc6a1d4b8d1fd8f44b64779a43f0e4b65e946 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Mon, 2 Nov 2020 13:10:45 +0100
+Subject: [PATCH 2/4] cmake: build test_ktechlab only if testing is enabled
+
+The test_ktechlab static library basically builds almost all the
+ktechlab sources, resulting in a "double build" in case testing is
+enabled. Considering that is used only by test binaries built only
+when testing is enabled, then limit its build accordingly.
+
+(cherry picked from commit f3a754ddcbc8a086ca48920bd33e96082cef699c)
+---
+ src/CMakeLists.txt | 26 +++++++++++++++-----------
+ 1 file changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e84f737d..1a9af964 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -379,19 +379,23 @@ install(TARGETS ktechlab ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ # for helping testing
+ 
+-add_library(test_ktechlab STATIC ${ktechlab_SRCS})
++if(BUILD_TESTING)
+ 
+-target_link_libraries(test_ktechlab
+-    KF5::TextEditor
+-    KF5::IconThemes
+-    KF5::Parts
+-    KF5::KHtml
+-    KF5::WidgetsAddons
+-    KF5::WindowSystem
++    add_library(test_ktechlab STATIC ${ktechlab_SRCS})
+ 
+-    Qt5::Widgets
+-    Qt5::PrintSupport
+-)
++    target_link_libraries(test_ktechlab
++        KF5::TextEditor
++        KF5::IconThemes
++        KF5::Parts
++        KF5::KHtml
++        KF5::WidgetsAddons
++        KF5::WindowSystem
++
++        Qt5::Widgets
++        Qt5::PrintSupport
++    )
++
++endif()
+ 
+ ########### install files ###############
+ 
+-- 
+2.29.2
+
+
+From 1d416ac6e3191eefca0f7e98487ae912d8bafe23 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Wed, 4 Nov 2020 13:13:44 +0100
+Subject: [PATCH 3/4] cmake: explicitly require and link to KCompletion
+
+It is already used (because of KLineEdit), so make sure to explicitly
+use it.
+
+(cherry picked from commit 852f94f4e6f3cb8d4e4ec60c2c77dfd5ae4b6fc0)
+---
+ CMakeLists.txt     | 1 +
+ src/CMakeLists.txt | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73e40695..45442519 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,6 +31,7 @@ find_package(Qt5 CONFIG REQUIRED COMPONENTS
+     )
+ 
+ find_package(KF5 REQUIRED COMPONENTS
++    Completion
+     Config
+     CoreAddons
+     DocTools
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1a9af964..ac6e487a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -343,6 +343,7 @@ target_link_libraries( ktechlab
+ 	#itemeditor math
+     KF5::TextEditor
+     KF5::Parts
++    KF5::Completion
+     KF5::ConfigCore
+     KF5::ConfigGui
+     KF5::CoreAddons
+@@ -390,6 +391,7 @@ if(BUILD_TESTING)
+         KF5::KHtml
+         KF5::WidgetsAddons
+         KF5::WindowSystem
++        KF5::Completion
+ 
+         Qt5::Widgets
+         Qt5::PrintSupport
+-- 
+2.29.2
+
+
+From 56fb8dde63c19f6c4bc0decda879843e552fad85 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
+Date: Tue, 22 Dec 2020 11:46:54 +0100
+Subject: [PATCH 4/4] replace khtml with qtextbrowser
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                     |  1 -
+ src/CMakeLists.txt                 |  2 --
+ src/gui/contexthelp.cpp            | 33 +++++++++++-------------------
+ src/gui/contexthelp.h              |  6 ++----
+ tests/tests_app/CMakeLists.txt     |  1 -
+ tests/tests_compile/CMakeLists.txt |  1 -
+ 6 files changed, 14 insertions(+), 30 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 45442519..5adaec45 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,7 +37,6 @@ find_package(KF5 REQUIRED COMPONENTS
+     DocTools
+     IconThemes
+     I18n
+-    KHtml
+     KIO
+     Parts
+     TextEditor
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ac6e487a..e09d9070 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -349,7 +349,6 @@ target_link_libraries( ktechlab
+     KF5::CoreAddons
+     KF5::IconThemes
+     KF5::KIOCore
+-    KF5::KHtml
+     KF5::XmlGui
+     KF5::WidgetsAddons
+     KF5::WindowSystem
+@@ -388,7 +387,6 @@ if(BUILD_TESTING)
+         KF5::TextEditor
+         KF5::IconThemes
+         KF5::Parts
+-        KF5::KHtml
+         KF5::WidgetsAddons
+         KF5::WindowSystem
+         KF5::Completion
+diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp
+index 567c0c3d..cce84617 100644
+--- a/src/gui/contexthelp.cpp
++++ b/src/gui/contexthelp.cpp
+@@ -20,8 +20,6 @@
+ 
+ #include <KParts/ReadWritePart>
+ #include <KParts/BrowserExtension>
+-#include <KHTMLView>
+-#include <KHTMLPart>
+ #include <KIO/Global>
+ #include <KIconLoader>
+ #include <KLocalizedString>
+@@ -43,6 +41,7 @@
+ // #include <q3widgetstack.h>
+ #include <QMimeData>
+ #include <QStandardPaths>
++#include <QTextBrowser>
+ 
+ #include <cassert>
+ 
+@@ -81,15 +80,13 @@ ContextHelp::ContextHelp( KateMDI::ToolView * parent )
+ 	m_pNameLabel->setFont( font );
+ 	m_pNameLabel->setTextFormat( Qt::RichText );
+ 
+-	m_pBrowser = new KHTMLPart( m_pWidgetStack->widget( 0 ) );
+-	m_pBrowserView = m_pBrowser->view();
++	m_pBrowserView = new QTextBrowser;
++	m_pBrowserView->setOpenLinks(false);
++
+ 	m_pBrowserView->setFocusPolicy( Qt::NoFocus );
+ 	m_pBrowserLayout->addWidget( m_pBrowserView );
+-	connect(m_pBrowser->browserExtension(), &KParts::BrowserExtension::openUrlRequest,
+-	        this, &ContextHelp::openURL);
+ 
+-	// Adjust appearance of browser
+-	m_pBrowserView->setMarginWidth( 4 );
++	connect(m_pBrowserView, &QTextBrowser::anchorClicked, this, &ContextHelp::openURL);
+ 
+ 	m_pEditor = new RichTextEditor( m_pWidgetStack->widget( 1 ), "ContextHelpEditor" );
+ 	m_pTopLayout->addWidget( m_pEditor );
+@@ -280,20 +277,14 @@ void ContextHelp::setContextHelp( QString name, QString help )
+ 	addLinkTypeAppearances( & help );
+ 	//END modify help string as appropriate
+ 
+-	// HACK Adjust top spacing according to whether the item description uses <p>.
+-	// This is because the help editor uses paragraphs, but old item help stored
+-	// in the items just uses <br>
+-	QFont f;
+-	int fontPixelSize = QFontInfo( f ).pixelSize();
+-	if ( help.contains( "<p>" ) )
+-		m_pBrowserView->setMarginHeight( 3-fontPixelSize );
+-	else
+-		m_pBrowserView->setMarginHeight( 3 );
+-
+ 	m_pNameLabel->setText( name );
+-     m_pBrowser->begin( QUrl::fromLocalFile( itemLibrary()->itemDescriptionsDirectory() ) );
+-     m_pBrowser->write( help );
+-     m_pBrowser->end();
++    m_pBrowserView->setSearchPaths({itemLibrary()->itemDescriptionsDirectory()});
++    m_pBrowserView->clear();
++    if (help.startsWith("<html>")) {
++        m_pBrowserView->insertHtml(help);
++    } else {
++        m_pBrowserView->insertPlainText(help);
++    }
+ }
+ 
+ 
+diff --git a/src/gui/contexthelp.h b/src/gui/contexthelp.h
+index fe992deb..7190ea81 100644
+--- a/src/gui/contexthelp.h
++++ b/src/gui/contexthelp.h
+@@ -20,8 +20,7 @@ class Item;
+ class ContextHelp;
+ class RichTextEditor;
+ 
+-class KHTMLPart;
+-class KHTMLView;
++class QTextBRowser;
+ class QUrl;
+ class QLabel;
+ class QTextBrowser;
+@@ -123,8 +122,7 @@ class ContextHelp : public QWidget, public Ui::ContextHelpWidget
+ 		bool isEditChanged();
+ 		QString m_currentLanguage;
+ 		QString m_lastItemType;
+-		KHTMLPart * m_pBrowser;
+-		KHTMLView * m_pBrowserView;
++		QTextBrowser *m_pBrowserView;
+ 		RichTextEditor * m_pEditor;
+ 
+ 	private slots:
+diff --git a/tests/tests_app/CMakeLists.txt b/tests/tests_app/CMakeLists.txt
+index b0a505d4..c93137a4 100644
+--- a/tests/tests_app/CMakeLists.txt
++++ b/tests/tests_app/CMakeLists.txt
+@@ -36,7 +36,6 @@ target_link_libraries( tests_app
+     KF5::ConfigCore
+     KF5::ConfigGui
+     KF5::KIOCore
+-    KF5::KHtml
+     KF5::CoreAddons
+     KF5::XmlGui
+     KF5::TextEditor
+diff --git a/tests/tests_compile/CMakeLists.txt b/tests/tests_compile/CMakeLists.txt
+index 424692be..bec8b864 100644
+--- a/tests/tests_compile/CMakeLists.txt
++++ b/tests/tests_compile/CMakeLists.txt
+@@ -37,7 +37,6 @@ target_link_libraries( test_compile
+     KF5::ConfigCore
+     KF5::ConfigGui
+     KF5::KIOCore
+-    KF5::KHtml
+     KF5::CoreAddons
+     KF5::XmlGui
+     KF5::TextEditor
+-- 
+2.29.2
+
diff --git a/sci-electronics/ktechlab/ktechlab-0.50.0.ebuild b/sci-electronics/ktechlab/ktechlab-0.50.0-r1.ebuild
index fc12299c0b28..47f9f7469ef3 100644
--- a/sci-electronics/ktechlab/ktechlab-0.50.0.ebuild
+++ b/sci-electronics/ktechlab/ktechlab-0.50.0-r1.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
+ECM_EXAMPLES="true"
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 KDE_ORG_CATEGORY="sdk"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="IDE for microcontrollers and electronics"
@@ -29,7 +30,6 @@ DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/khtml-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kiconthemes-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -40,7 +40,8 @@ DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
 	gpsim? ( dev-embedded/gpsim )
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-deps.patch )