diff options
Diffstat (limited to 'user/knewstuff')
| -rw-r--r-- | user/knewstuff/APKBUILD | 13 | ||||
| -rw-r--r-- | user/knewstuff/backport.patch | 54 |
2 files changed, 5 insertions, 62 deletions
diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index bef47c3f5..c5e8ef8e8 100644 --- a/user/knewstuff/APKBUILD +++ b/user/knewstuff/APKBUILD @@ -1,12 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knewstuff -pkgver=5.94.0 +pkgver=5.116.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" arch="all" -options="!check" # Requires X11. +options="checkx11" license="LGPL-2.0+" depends="kirigami2" depends_dev="qt5-qtbase-dev attica-dev kconfig-dev kservice-dev kxmlgui-dev @@ -18,9 +18,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz ki18n-dev kiconthemes-dev kirigami2-dev kitemviews-dev kpackage-dev ktextwidgets-dev kwidgetsaddons-dev syndication-dev $docdepends" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.kde.org/stable/frameworks/${pkgver%.*}/knewstuff-$pkgver.tar.xz - backport.patch - " +source="https://download.kde.org/stable/frameworks/${pkgver%.*}/knewstuff-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -30,7 +28,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DBUILD_QCH:BOOL=ON \ @@ -47,5 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6269614a0df2616bd5bd1a8e9c3f8dc16920bbd4cf8fd18a5ccc1e818c292d90533de3dc77ce8fbbb183388ad6fed72a30b78177eddd87624499b3c75d55a226 knewstuff-5.94.0.tar.xz -5c73d39a78658899f4e7b2526608498ff63bf4e6f9b730b0f20f3205017e77fe4a9a96e3ab9e42f0789234a3e0658a89f646bc040488465f07689bc9629105fc backport.patch" +sha512sums="c66f8905c622964a81609d384ea64c0614714b4d760ee908e2efcdaab4ef146fc2af099625e81b83c2e43e4f97a0f5960dae345cbf9d8453a15b465536c06152 knewstuff-5.116.0.tar.xz" diff --git a/user/knewstuff/backport.patch b/user/knewstuff/backport.patch deleted file mode 100644 index 002d4c182..000000000 --- a/user/knewstuff/backport.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau <alexander.lohnau@gmx.de> -Date: Tue, 24 May 2022 12:58:54 +0200 -Subject: [PATCH] Fix QtQuickDialogWrapper dialog not being usable in konsole - -Patch provided by David Edmundson. - -``` -Issue is QGuiApplicationPrivate::showModalWindow - -it marks every other non-modal window as blocked, including new windows. - -when we focus the new dialog at a wayland/X level Qt gets it, but in it's own internal dispatching ignores that and sends it to the modal window - -Qt is smart enough to handle child windows appropriately, but only if it knows about them. Having a transient parent should take care of this. We should have this anyway as that will fix some window placement bugs. -``` - -BUG: 452593 ---- - src/qtquickdialogwrapper.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/qtquickdialogwrapper.cpp b/src/qtquickdialogwrapper.cpp -index 4f22b650..e31e8d80 100644 ---- a/src/qtquickdialogwrapper.cpp -+++ b/src/qtquickdialogwrapper.cpp -@@ -7,10 +7,12 @@ - #include "qtquickdialogwrapper.h" - - #include <QEventLoop> -+#include <QGuiApplication> - #include <QQmlComponent> - #include <QQmlContext> - #include <QQmlEngine> - #include <QTimer> -+#include <QWindow> - - #include <KLocalizedContext> - -@@ -70,6 +72,11 @@ QtQuickDialogWrapper::QtQuickDialogWrapper(const QString &configFile, QObject *p - - // Forward relevant signals - connect(d->item, SIGNAL(closed()), this, SIGNAL(closed())); -+ -+ // Otherwise, the dialog is not in front of other popups, BUG: 452593 -+ auto window = qobject_cast<QWindow *>(d->item); -+ Q_ASSERT(window); -+ window->setTransientParent(QGuiApplication::focusWindow()); - } - } - --- -GitLab - |