diff options
Diffstat (limited to 'user/liblxqt')
| -rw-r--r-- | user/liblxqt/APKBUILD | 31 | ||||
| -rw-r--r-- | user/liblxqt/revert-kwindowsystem-bump.patch | 40 |
2 files changed, 56 insertions, 15 deletions
diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD index 24765e4fc..5e50b5430 100644 --- a/user/liblxqt/APKBUILD +++ b/user/liblxqt/APKBUILD @@ -1,40 +1,41 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=liblxqt -pkgver=0.14.1 +pkgver=1.4.0 +_lxqt=0.13.0 +_qtxdg=3.12.0 pkgrel=0 pkgdesc="Core LXQt library" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev - qt5-qttools-dev libxscrnsaver-dev libqtxdg-dev>=3.3.1 - kwindowsystem-dev polkit-qt-1-dev lxqt-build-tools>=0.6.0" + qt5-qttools-dev libxscrnsaver-dev libqtxdg-dev>=$_qtxdg + kwindowsystem-dev polkit-qt-1-dev lxqt-build-tools>=$_lxqt" subpackages="$pkgname-dev" -source="https://github.com/lxqt/liblxqt/releases/download/$pkgver/liblxqt-$pkgver.tar.xz" +source="https://github.com/lxqt/liblxqt/releases/download/$pkgver/liblxqt-$pkgver.tar.xz + revert-kwindowsystem-bump.patch" build() { - cd "$builddir" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - mkdir -p build && cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make + ${CMAKE_CROSSOPTS} -Bbuild + make -C build } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba liblxqt-0.14.1.tar.xz" +sha512sums="2012bedab77fba7979d456c9e223e6a0a2f86c272d59eb66d3dbb4b028348972789249fa4a3889d419004210b7c5fcd1e989c196bb338ec8caa31bb0eca1d703 liblxqt-1.4.0.tar.xz +5fe9aa14d80a567bf7674c170bc1de8b885029ceaabe555284b1e23c1b9ad46ee21a817431e05c61d938dcf8c5c767235d8a2df11bd8ab0a4588c4177e848dda revert-kwindowsystem-bump.patch" diff --git a/user/liblxqt/revert-kwindowsystem-bump.patch b/user/liblxqt/revert-kwindowsystem-bump.patch new file mode 100644 index 000000000..58419a801 --- /dev/null +++ b/user/liblxqt/revert-kwindowsystem-bump.patch @@ -0,0 +1,40 @@ +diff '--color=auto' -Nurd liblxqt-1.4.0/CMakeLists.txt liblxqt-1.4.0.new/CMakeLists.txt +--- liblxqt-1.4.0/CMakeLists.txt 2023-11-05 02:54:50.000000000 -0800 ++++ liblxqt-1.4.0.new/CMakeLists.txt 2023-11-27 06:01:14.963487658 -0800 +@@ -8,7 +8,7 @@ + + + set(LXQTBT_MINIMUM_VERSION "0.13.0") +-set(KF5_MINIMUM_VERSION "5.101.0") ++set(KF5_MINIMUM_VERSION "5.36.0") + set(QT_MINIMUM_VERSION "5.15.0") + set(QTXDG_MINIMUM_VERSION "3.12.0") + +diff '--color=auto' -Nurd liblxqt-1.4.0/lxqtsingleapplication.cpp liblxqt-1.4.0.new/lxqtsingleapplication.cpp +--- liblxqt-1.4.0/lxqtsingleapplication.cpp 2023-11-05 02:54:50.000000000 -0800 ++++ liblxqt-1.4.0.new/lxqtsingleapplication.cpp 2023-11-27 06:03:46.852519095 -0800 +@@ -28,7 +28,6 @@ + #include "lxqtsingleapplication.h" + #include "singleapplicationadaptor.h" + #include <KWindowSystem/KWindowSystem> +-#include <KWindowSystem/KX11Extras> + #include <QDBusMessage> + #include <QWidget> + #include <QDebug> +@@ -99,13 +98,9 @@ + KWindowInfo info(window, KWindowSystem::WMDesktop); + int windowDesktop = info.desktop(); + +- if (windowDesktop != KX11Extras::currentDesktop()) +- KX11Extras::setCurrentDesktop(windowDesktop); +- +- if (QWindow *w = mActivationWindow->windowHandle()) +- KWindowSystem::activateWindow(w); +- else +- qDebug() << Q_FUNC_INFO << "Got null windowHandle"; ++ if (windowDesktop != KWindowSystem::currentDesktop()) ++ KWindowSystem::setCurrentDesktop(windowDesktop); ++ KWindowSystem::activateWindow(window); + } else { + qDebug() << Q_FUNC_INFO << "activationWindow not set or null"; + } |