diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-06-12 04:23:28 -0500 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-06-12 23:51:56 +0000 |
| commit | 958e020e931914e6e48991b5b519ca2ad560768c (patch) | |
| tree | 75fdf941649ed4d1a7fe8e480638d3c5fe078d46 /user/cantor | |
| parent | 03d40e00be780b73d3e87f131b8215794423dcc9 (diff) | |
| download | packages-958e020e931914e6e48991b5b519ca2ad560768c.tar.gz packages-958e020e931914e6e48991b5b519ca2ad560768c.tar.bz2 packages-958e020e931914e6e48991b5b519ca2ad560768c.tar.xz packages-958e020e931914e6e48991b5b519ca2ad560768c.zip | |
user/[KDE Apps]: Update to 22.04.2
Diffstat (limited to 'user/cantor')
| -rw-r--r-- | user/cantor/APKBUILD | 14 | ||||
| -rw-r--r-- | user/cantor/rip-out-webengine.patch | 56 |
2 files changed, 65 insertions, 5 deletions
diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index a2dfbd753..b8be268b5 100644 --- a/user/cantor/APKBUILD +++ b/user/cantor/APKBUILD @@ -1,24 +1,27 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cantor -pkgver=20.08.1 +pkgver=22.04.2 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" arch="all" options="!check" # Tests require X11. license="GPL-2.0-only" -depends="r" +depends="qt5-qttools r shared-mime-info" depends_dev="libspectre-dev" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev karchive-dev kcompletion-dev kconfig-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev kiconthemes-dev kio-dev knewstuff-dev kparts-dev kpty-dev ktexteditor-dev ktextwidgets-dev kxmlgui-dev $depends_dev poppler-dev poppler-qt5-dev - + qt5-qttools-dev + analitza-dev gfortran libqalculate-dev python3-dev r r-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/release-service/$pkgver/src/cantor-$pkgver.tar.xz" +source="https://download.kde.org/stable/release-service/$pkgver/src/cantor-$pkgver.tar.xz + rip-out-webengine.patch + " build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -43,4 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7f3193753a3368940cad14b51cb920f59a2c5550ef2ae527869c1011b238533e15b0d89b47c29b383d623709e7576457d9bc803a63124c641e58871115e72d6c cantor-20.08.1.tar.xz" +sha512sums="a452cb1e91c5b75587d520c139109a81c6b78bd17060f7c97ba1ae4fe444c31f3dae34a8a31597345c1b275b508cac349ef6af4b2bdd09cca37da9d8c7400ec5 cantor-22.04.2.tar.xz +d29103817ef512f34e84c6dda26a1e675a1e57d9b9392f309f583e41384569f041a662af207cf7bfde428a379db189c05c0b1f6321e8fa7804bfad3c2ecd4189 rip-out-webengine.patch" diff --git a/user/cantor/rip-out-webengine.patch b/user/cantor/rip-out-webengine.patch new file mode 100644 index 000000000..15bda36b1 --- /dev/null +++ b/user/cantor/rip-out-webengine.patch @@ -0,0 +1,56 @@ +This is temporary until I have time to write a proper patch to make the +WebEngine dependency truly optional. + +Upstream-URL: https://bugs.kde.org/show_bug.cgi?id=455108 +BUG: 455108 + +--- cantor-22.04.2/CMakeLists.txt.old 2022-06-06 22:43:15.000000000 -0500 ++++ cantor-22.04.2/CMakeLists.txt 2022-06-10 00:48:15.475027350 -0500 +@@ -37,9 +37,7 @@ + Xml + XmlPatterns + Test +- Help +- WebEngine +- WebEngineWidgets) ++ Help) + + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED + Config +--- cantor-22.04.2/src/CMakeLists.txt.old 2022-06-06 22:43:15.000000000 -0500 ++++ cantor-22.04.2/src/CMakeLists.txt 2022-06-10 00:47:38.599064429 -0500 +@@ -39,7 +39,7 @@ + add_executable(cantor ${cantor_SRCS}) + + target_link_libraries(cantor KF5::Parts KF5::NewStuff KF5::ConfigCore KF5::CoreAddons KF5::ConfigGui +- KF5::Crash KF5::XmlGui Qt5::WebEngine cantorlibs cantor_config) ++ KF5::Crash KF5::XmlGui cantorlibs cantor_config) + + ########### install files ############### + install(TARGETS cantor ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) +--- cantor-22.04.2/src/panelplugins/CMakeLists.txt.old 2022-06-06 22:43:15.000000000 -0500 ++++ cantor-22.04.2/src/panelplugins/CMakeLists.txt 2022-06-10 00:46:15.718138007 -0500 +@@ -13,4 +13,3 @@ + add_subdirectory(variablemgr) + add_subdirectory(filebrowserpanel) + add_subdirectory(tocpanel) +-add_subdirectory(documentationpanel) +--- cantor-22.04.2/src/main.cpp.old 2022-06-06 22:43:15.000000000 -0500 ++++ cantor-22.04.2/src/main.cpp 2022-06-10 00:46:37.755725391 -0500 +@@ -17,16 +17,10 @@ + #include <QFileInfo> + #include <QDir> + #include <QDebug> +-#include <QtWebEngine> + + + int main(int argc, char **argv) + { +- QtWebEngine::initialize(); +- // Register custom scheme handler for qthelp:// scheme +- QWebEngineUrlScheme qthelp("qthelp"); +- QWebEngineUrlScheme::registerScheme(qthelp); +- + QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication app(argc, argv); + |