diff options
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/Manifest.gz | bin | 8547 -> 8548 bytes | |||
| -rw-r--r-- | sci-electronics/klayout/Manifest | 4 | ||||
| -rw-r--r-- | sci-electronics/klayout/klayout-0.27.12.ebuild | 91 | ||||
| -rw-r--r-- | sci-electronics/klayout/klayout-0.28.5.ebuild | 2 | ||||
| -rw-r--r-- | sci-electronics/ktechlab/Manifest | 8 | ||||
| -rw-r--r-- | sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch | 38 | ||||
| -rw-r--r-- | sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch | 52 | ||||
| -rw-r--r-- | sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch | 26 | ||||
| -rw-r--r-- | sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch | 317 | ||||
| -rw-r--r-- | sci-electronics/ktechlab/ktechlab-0.51.0.ebuild (renamed from sci-electronics/ktechlab/ktechlab-0.50.0-r2.ebuild) | 12 |
10 files changed, 8 insertions, 542 deletions
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz Binary files differindex 945aa71ad1f5..dbe94d2dfee8 100644 --- a/sci-electronics/Manifest.gz +++ b/sci-electronics/Manifest.gz diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest index 9e16c766d332..742b1ec434bf 100644 --- a/sci-electronics/klayout/Manifest +++ b/sci-electronics/klayout/Manifest @@ -1,6 +1,4 @@ -DIST klayout-0.27.12.tar.gz 57616686 BLAKE2B 18c69c799412554547f9b671c80f097b93b15fb04272c4ea6f06b54783fa97ac0da5f50ea61fbf88e75e5436524c9271ffdb7560911b7b8e130a4a287ba2cf60 SHA512 25bb854b9f265801a9ee13bdead0ae1fa4ce21bd0d018c10b0c89aff72f48d4131e80987750bd47e3996296ced1936fffb4ed02daa5a7bdff5f05ae6e820e067 DIST klayout-0.28.5.tar.gz 88218961 BLAKE2B 59154bc1cc6596c4deb10b9c59f8957c2fcb8815b8d8ab09e79521a2e281e82d5437a222a48e0f378188b34162cd92229694c58e15ff74b6cde4c2b65df7bfe7 SHA512 ae2f4a08d8939eccba41f2a76ef3e1a97bdd61925329f3d3c314206dfc2783e0db0ffad58cc1357355f0853079987b9c083dde78ae29914b4db8aadc24181082 -EBUILD klayout-0.27.12.ebuild 1873 BLAKE2B 7d8a24f5bf571ce237b452063877aeb40cbb935218d8f2f4910c09ee0dd8ddb47f80d10aa8b4c3deb7e25aeefc61d8c97001411c8826cb64e6a20714175d63ba SHA512 dced1703900fba00a3902878e615fa7f7d4af42670f3cfaaa925637fb72d8100c7d572c01714cbd2f3d8125319a8b010c280c40691a682235a0d08c148dde63e -EBUILD klayout-0.28.5.ebuild 1874 BLAKE2B e9eb55e306c99fb910b2f5ece353831cafcd892f4c65513257bedafe01ae8412da75af2250d5f9393985294e2d35528a887b2a19c4ce66a053171721bc38a373 SHA512 7732a188ed63db16d5f9b444854e22fa60f51d281a2b590130e70b691afc4040d8245332da4f51180b0d8c6eb878babe8e6157b9fc70edbccd3f6244708c5f06 +EBUILD klayout-0.28.5.ebuild 1873 BLAKE2B 9e2273a61172683645bd0d5b9111d2c6c51701abe899ae3657f9b46f8cc23a419ce78873cc05b4c30ae27a034610e7dce9cf4b2faf803526497bced614db81fa SHA512 a713d02746333386a4ef1600685c8485bb9e0b300b593c7a9c59e23fcdf79320123e5cc8db9325d4adcdd6fea6ebc1de4c15b7f2e0648febc69433be2a9ec8ff EBUILD klayout-9999.ebuild 1874 BLAKE2B e9eb55e306c99fb910b2f5ece353831cafcd892f4c65513257bedafe01ae8412da75af2250d5f9393985294e2d35528a887b2a19c4ce66a053171721bc38a373 SHA512 7732a188ed63db16d5f9b444854e22fa60f51d281a2b590130e70b691afc4040d8245332da4f51180b0d8c6eb878babe8e6157b9fc70edbccd3f6244708c5f06 MISC metadata.xml 459 BLAKE2B 991af576cef99c2b7a659026da387777cdd94dcba1037147fd476cde48d3b150755d4da3d44815ac34e4260387d5fbd9a8c107a5a64b7a4261dcd42c04c8e828 SHA512 d8766767f4af4b83ffe2f2485d40cca3a893a270d04ac62be3188f6a74b9f426e62223acc1900784f3ac0b36f6481c9b2a2b7181c4fa37d05b87d012d9213dc2 diff --git a/sci-electronics/klayout/klayout-0.27.12.ebuild b/sci-electronics/klayout/klayout-0.27.12.ebuild deleted file mode 100644 index 87201edfa6b9..000000000000 --- a/sci-electronics/klayout/klayout-0.27.12.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -RUBY_OPTIONAL=no -USE_RUBY="ruby27" -# note: define maximally ONE implementation here - -PYTHON_COMPAT=( python3_{9,10,11} ) - -inherit toolchain-funcs python-single-r1 ruby-ng - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git" - inherit git-r3 - EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P} -else - SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz" - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts" -HOMEPAGE="https://www.klayout.de/" -LICENSE="GPL-2" -SLOT="0" -IUSE="" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -RDEPEND=" - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - sys-libs/zlib - ${PYTHON_DEPS} - $(ruby_implementations_depend) -" -DEPEND="${RDEPEND}" - -pkg_setup() { - python-single-r1_pkg_setup - ruby-ng_pkg_setup -} - -each_ruby_configure() { - tc-export CC CXX AR LD RANLIB - export CFLAGS CXXFLAGS - ./build.sh \ - -expert \ - -dry-run \ - -qmake "$EPREFIX/usr/$(get_libdir)/qt5/bin/qmake" \ - -ruby "${RUBY}" \ - -python "${PYTHON}" \ - -build . \ - -bin "${T}/bin" \ - -rpath "$EPREFIX/usr/$(get_libdir)/klayout" \ - -option "${MAKEOPTS}" \ - -with-qtbinding \ - -without-64bit-coord \ - -qt5 || die "Configuration failed" -} - -each_ruby_compile() { - emake all -} - -each_ruby_install() { - emake install - - cd "${T}/bin" || die - - dodir "/usr/$(get_libdir)/klayout" - mv lib* lay_plugins db_plugins "${ED}/usr/$(get_libdir)/klayout/" || die - - mkdir -p "${D}/$(python_get_sitedir)" || die - mv pymod/* "${D}/$(python_get_sitedir)/" || die - rmdir pymod || die - - dobin * - - python_optimize -} diff --git a/sci-electronics/klayout/klayout-0.28.5.ebuild b/sci-electronics/klayout/klayout-0.28.5.ebuild index 9f93b3381a94..c3810e90ea1a 100644 --- a/sci-electronics/klayout/klayout-0.28.5.ebuild +++ b/sci-electronics/klayout/klayout-0.28.5.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P} else SRC_URI="https://www.klayout.org/downloads/source/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts" diff --git a/sci-electronics/ktechlab/Manifest b/sci-electronics/ktechlab/Manifest index f84642e3ec6c..305d270a96de 100644 --- a/sci-electronics/ktechlab/Manifest +++ b/sci-electronics/ktechlab/Manifest @@ -1,7 +1,3 @@ -AUX ktechlab-0.50.0-crashfix-connectors-diverging.patch 1191 BLAKE2B fa0eb5fc82d9f8f9c88f87f413b08969a4b2d681296bec8b40dbd1e4ca10ffe626b0b0e6adfc86bbdafba020a7e837a45c56d18b687f2c9dad0733e8a3f91f1d SHA512 2faa14aa0efb036b9001c187d47b18cfb866ae785c874619c16b95c9bb029165f72162a242721eeb56d50f7b4957a6fcc6a458140a1bb6518ce09aa04aacbc16 -AUX ktechlab-0.50.0-crashfix-propertyeditor.patch 1783 BLAKE2B 217a2255f46630802f3821f4a974a99b0690f9c473ef6f94b2baf1fd6dd4563ae142072e210cdaeec993d40d9fa1a8030e5074e02e6fdd89ed5f874ee15bcc0a SHA512 c9a2a68634ed04f2fdbeaab550dac0d7b276f8e0b5fea766e2d0aa0aad84b6f499058e48dd23266a3595ba5f87aa91bf7a42901b5f5c6fb14a64763b60c775e4 -AUX ktechlab-0.50.0-crashfix.patch 815 BLAKE2B 2e1ea6d6909d077c9891911ee8ccc35f1543b1e3c7409433b3585d22a489ecf2af79300fe9af605ca8b01ba6daf41d2c196fd4afd21d36c0b9c3cdc4f7a4f48f SHA512 a486c365c459c111f658c821efcf5fd06f595f325c6bfbc5d261ae1a0cf85be3e517dd3a5884d8fd242f2cde5a9802739f4ad69d8237f1143b9bfd57f15b26ef -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-r2.ebuild 1343 BLAKE2B 034440493d9ecd58db5b36d278f8121d50f46069632d1d01abb29457cd1e4ea931b13f03b995c3b6785532296b7e5f877bf1538d7c87c1ba9298d1e933791a6b SHA512 6fafceb0b349a7a4489d3dc8f87331478ca246b9f77b21579af3adc5ffe3806f3e5411419abaccd8308ece21c90b27c3a508abe4795aba8d0a8321f6cf2916a1 +DIST ktechlab-0.51.0.tar.xz 2280352 BLAKE2B 9f7004bf82a6f1c5c2b7a638692eb7ea778a3680ebf73db3caa1947a0ebd62249f1d15f9508852af5cf347907051d8f4757899692a8677a1b76bac12dad45cc7 SHA512 65c71bafb4ea90dbe34860ebefa8c05b393953d690309d61a53fa9f012e14a2544c03c2aeac2c79e700d449ed84d7d691beafdf398348fe02ad1562b326c0c40 +EBUILD ktechlab-0.51.0.ebuild 1258 BLAKE2B 35f0b2eb246aaa50b5c1338615826e6cc47e63d858f06120e8af13fbd49e07e4b4920c74ee308ba0c5edc5c857340bf1e5c414385ff91ca4091bce1e2d9d1f35 SHA512 b20ac9c30d7d8d87810b72d54bfb36aebb4e69067922f720ec24fba195091eb799e2cb1e46cdf752cf0027cef2dc24bc152ad4e2c37518d23b9d6e9925fd8daa MISC metadata.xml 458 BLAKE2B c7bcf8be3d2a3cb94a6d31a2ab64e89dc7d8b5ca3acde1a61f4f3724a331b899f156d40b02f64a1d26f008b92452e997e7ea5004eef50b9d13a02edbb9e396db SHA512 506f455f24d17973637f12558a0cee063882fb40efd44df4e78a0e2d543d204c1ff170a9722f16933f2fd65b28283450c5f06ec61dbb49b08b2d38e6cd744a9e diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch deleted file mode 100644 index 20222c89daab..000000000000 --- a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-connectors-diverging.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1b814b266f1bd25d92b701e071473f2267330933 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org> -Date: Mon, 22 Mar 2021 12:49:26 +0100 -Subject: [PATCH] fix crash when looking for where connectors diverge - ---- - src/electronics/ecnode.cpp | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/src/electronics/ecnode.cpp b/src/electronics/ecnode.cpp -index 385844c1..28f2a556 100644 ---- a/src/electronics/ecnode.cpp -+++ b/src/electronics/ecnode.cpp -@@ -225,10 +225,18 @@ QPoint ECNode::findConnectorDivergePoint(bool *found) - if (!gotP1 || !gotP2 ) - return QPoint(0,0); - -- unsigned maxLength = p1.size() > p2.size() ? p1.size() : p2.size(); -+ // If they are differing lengths, return the end of the shortest -+ if (p1.size() < p2.size()) { -+ *found = true; -+ return p1.last(); -+ } else if (p2.size() < p1.size()) { -+ *found = true; -+ return p2.last(); -+ } -+ -+ Q_ASSERT(p1.size() == p2.size()); - -- for ( unsigned i = 1; i < maxLength; ++i ) -- { -+ for (unsigned i = 1; i < qMin(p1.size(), p2.size()); ++i) { - if ( p1[i] != p2[i] ) { - *found = true; - return p1[i-1]; --- -GitLab - diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch deleted file mode 100644 index ec970b64ad81..000000000000 --- a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix-propertyeditor.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 730a5492e4780504a80db1a27dc307d8f61b4696 Mon Sep 17 00:00:00 2001 -From: Zoltan Padrah <zoltan_padrah@users.sf.net> -Date: Fri, 18 Dec 2020 20:47:55 +0200 -Subject: [PATCH] property editor: fix crash when changing a property and - clicking circuit - -apparently Ubuntu 18.04 is affected (Qt 5.9.5) -and Ubuntu 20.04 is not (Qt 5.12.8). - -to reproduce: - -1. place and select a resistor -2. in the property editor click on any of its properties, - in order to start editing it -3. click on the circuit, to stop editing of the properties -3.1. Expected: property value is kept, program continues -3.2. Actually: crash with the same stack trace from above - -Should fix issue on GitHub: -https://github.com/ktechlab/ktechlab/issues/60 ---- - src/gui/itemeditor/propertyeditor.cpp | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/gui/itemeditor/propertyeditor.cpp b/src/gui/itemeditor/propertyeditor.cpp -index 88b86842..60821177 100644 ---- a/src/gui/itemeditor/propertyeditor.cpp -+++ b/src/gui/itemeditor/propertyeditor.cpp -@@ -476,8 +476,19 @@ void PropertyEditor::showDefaultsButton(bool show) - - void PropertyEditor::updateDefaultsButton() - { -- if (!m_editItem) -+ QTableWidgetItem *currItem = currentItem(); -+ if (!currItem) { -+ m_editItem = nullptr; - return; -+ } -+ m_editItem = dynamic_cast<PropertyEditorItem*>(currItem); -+ if (!m_editItem) { -+ qWarning() << "failed to cast current item to PropertyEditorItem, " << currItem; -+ return; -+ } -+ qDebug() << "currentItem=" << currentItem(); -+ qDebug() << "m_editItem=" << m_editItem; -+ qDebug() << "m_editItem->property=" << m_editItem->property(); - showDefaultsButton( m_editItem->property()->changed() ); - repaint(); // m_editItem->repaint(); - } --- -GitLab - diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch deleted file mode 100644 index c72fdd60021b..000000000000 --- a/sci-electronics/ktechlab/files/ktechlab-0.50.0-crashfix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e0bb9ff940f6eda544342c499998cf6142258629 Mon Sep 17 00:00:00 2001 -From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org> -Date: Sun, 20 Dec 2020 14:43:31 +0100 -Subject: [PATCH] fix odd crash - ---- - src/nodegroup.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nodegroup.cpp b/src/nodegroup.cpp -index f4cfa2b4..94430409 100644 ---- a/src/nodegroup.cpp -+++ b/src/nodegroup.cpp -@@ -142,8 +142,7 @@ void NodeGroup::updateRoutes() - Node *next = (routeIt == routeEnd) ? n2 : (Node *)*(routeIt++); - removeRoutedNodes(¤tList, prev, next); - QPointList pointList = *it; -- if ( prev != n1 ) -- { -+ if (!pointList.isEmpty() && prev != n1) { - QPoint first = pointList.first(); - prev->moveBy( first.x() - prev->x(), first.y() - prev->y() ); - } --- -GitLab - diff --git a/sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch b/sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch deleted file mode 100644 index 67ded56c9594..000000000000 --- a/sci-electronics/ktechlab/files/ktechlab-0.50.0-deps.patch +++ /dev/null @@ -1,317 +0,0 @@ -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-r2.ebuild b/sci-electronics/ktechlab/ktechlab-0.51.0.ebuild index 6359c002ea9a..f2ad43fcf17f 100644 --- a/sci-electronics/ktechlab/ktechlab-0.50.0-r2.ebuild +++ b/sci-electronics/ktechlab/ktechlab-0.51.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,8 +7,8 @@ ECM_EXAMPLES="true" ECM_HANDBOOK="forceoptional" ECM_TEST="true" KDE_ORG_CATEGORY="sdk" -KFMIN=5.74.0 -QTMIN=5.15.1 +KFMIN=5.82.0 +QTMIN=5.15.5 inherit ecm kde.org DESCRIPTION="IDE for microcontrollers and electronics" @@ -24,6 +24,7 @@ DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtserialport-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -43,8 +44,3 @@ DEPEND=" gpsim? ( dev-embedded/gpsim ) " RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-deps.patch - "${FILESDIR}"/${P}-crashfix{-propertyeditor,-connectors-diverging,}.patch -) |