diff options
Diffstat (limited to 'user/lxqt-config')
| -rw-r--r-- | user/lxqt-config/APKBUILD | 34 | ||||
| -rw-r--r-- | user/lxqt-config/revert-kscren-bump.patch | 57 |
2 files changed, 74 insertions, 17 deletions
diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD index 0198540b4..3b690abea 100644 --- a/user/lxqt-config/APKBUILD +++ b/user/lxqt-config/APKBUILD @@ -1,44 +1,44 @@ -# 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=lxqt-config -pkgver=0.14.1 +pkgver=1.4.0 +_lxqt=0.13.0 pkgrel=0 pkgdesc="Collection of tools for configuring LXQt and the underlying system" -url="https://lxqt.org" +url="https://lxqt.github.io/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" -depends="" +depends="lxqt-menu-data" makedepends="cmake extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev - liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=0.6.0 libxcursor-dev eudev-dev - kwindowsystem-dev libkscreen-dev xf86-input-libinput-dev libxi-dev" + liblxqt-dev>=${pkgver%.*} lxqt-build-tools>=$_lxqt + libxcursor-dev eudev-dev kwindowsystem-dev libkscreen-dev + xf86-input-libinput-dev libxi-dev" subpackages="$pkgname-doc" -source="https://github.com/lxqt/lxqt-config/releases/download/$pkgver/lxqt-config-$pkgver.tar.xz" +source="https://github.com/lxqt/lxqt-config/releases/download/$pkgver/lxqt-config-$pkgver.tar.xz + revert-kscren-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=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - ${CMAKE_CROSSOPTS} .. - make -j1 + ${CMAKE_CROSSOPTS} -Bbuild + make -j1 -C build } check() { - cd "$builddir"/build - CTEST_OUTPUT_ON_FAILURE=TRUE ctest + CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test } package() { - cd "$builddir"/build - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } -sha512sums="747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f lxqt-config-0.14.1.tar.xz" +sha512sums="a3e6722c3f63b3c7382ec84723e3a4d838d99b2c42ce731565f940873b275ef025b7bc1a570f165b7fce521eb77bb7b83b02e922bee251507b773c8de4f785fc lxqt-config-1.4.0.tar.xz +6580b8254c457a75221faf52410de3f0a678f0e9cde719dbe7d899cade521d4674a9f8b1807647fa7a9e9ed90e8787883a8b5e7d15236872299a0c7a51ad6f5e revert-kscren-bump.patch" diff --git a/user/lxqt-config/revert-kscren-bump.patch b/user/lxqt-config/revert-kscren-bump.patch new file mode 100644 index 000000000..bb9461b72 --- /dev/null +++ b/user/lxqt-config/revert-kscren-bump.patch @@ -0,0 +1,57 @@ +diff '--color=auto' -Nurd lxqt-config-1.4.0/CMakeLists.txt lxqt-config-1.4.0.new/CMakeLists.txt +--- lxqt-config-1.4.0/CMakeLists.txt 2023-11-05 03:36:31.000000000 -0800 ++++ lxqt-config-1.4.0.new/CMakeLists.txt 2023-11-26 02:44:43.889325759 -0800 +@@ -26,7 +26,7 @@ + set(CMAKE_AUTORCC ON) + + set(KF5_MINIMUM_VERSION "5.36.0") +-set(KF5SCREEN_MINIMUM_VERSION "5.27.0") ++set(KF5SCREEN_MINIMUM_VERSION "5.2.0") + set(LXQT_MINIMUM_VERSION "1.4.0") + set(QT_MINIMUM_VERSION "5.15.0") + +diff '--color=auto' -Nurd lxqt-config-1.4.0/lxqt-config-monitor/kscreenutils.cpp lxqt-config-1.4.0.new/lxqt-config-monitor/kscreenutils.cpp +--- lxqt-config-1.4.0/lxqt-config-monitor/kscreenutils.cpp 2023-11-05 03:36:31.000000000 -0800 ++++ lxqt-config-1.4.0.new/lxqt-config-monitor/kscreenutils.cpp 2023-11-26 02:45:27.458971215 -0800 +@@ -63,7 +63,7 @@ + output->setPos(pos); + output->setEnabled(true); + //first left one as primary +- output->setPriority(width == 0 ? 1 : 0); ++ output->setPrimary(width == 0); + KScreen::ModePtr mode(output->currentMode()); + //if (!mode) + { +diff '--color=auto' -Nurd lxqt-config-1.4.0/lxqt-config-monitor/loadsettings.cpp lxqt-config-1.4.0.new/lxqt-config-monitor/loadsettings.cpp +--- lxqt-config-1.4.0/lxqt-config-monitor/loadsettings.cpp 2023-11-05 03:36:31.000000000 -0800 ++++ lxqt-config-1.4.0.new/lxqt-config-monitor/loadsettings.cpp 2023-11-26 02:46:05.328663054 -0800 +@@ -133,7 +133,7 @@ + if( !output->isConnected() ) + continue; + output->setEnabled( monitor.enabled ); +- output->setPriority( monitor.primary ? 1 : 0 ); ++ output->setPrimary( monitor.primary ); + output->setPos( QPoint(monitor.xPos, monitor.yPos) ); + output->setRotation( (KScreen::Output::Rotation)(monitor.rotation) ); + // output->setCurrentModeId could fail. KScreen sometimes changes mode Id. +diff '--color=auto' -Nurd lxqt-config-1.4.0/lxqt-config-monitor/monitorwidget.cpp lxqt-config-1.4.0.new/lxqt-config-monitor/monitorwidget.cpp +--- lxqt-config-1.4.0/lxqt-config-monitor/monitorwidget.cpp 2023-11-05 03:36:31.000000000 -0800 ++++ lxqt-config-1.4.0.new/lxqt-config-monitor/monitorwidget.cpp 2023-11-26 02:47:02.698196214 -0800 +@@ -138,7 +138,7 @@ + if (config->connectedOutputs().count() == 1) { + setOnlyMonitor(true); + // There isn't always a primary output. Gross. +- output->setPriority(1); ++ output->setPrimary(true); + } + + ui.xPosSpinBox->setValue(output->pos().x()); +@@ -208,7 +208,7 @@ + ui.xPosSpinBox->setVisible(idx == ExtendDisplay); + ui.yPosSpinBox->setVisible(idx == ExtendDisplay); + +- output->setPriority(idx == PrimaryDisplay ? 1 : 0); ++ output->setPrimary(idx == PrimaryDisplay); + if(idx == PrimaryDisplay) + emit primaryOutputChanged(this); + } |