From 465d1a222fc3bef9461e9448b119f0235d4be56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 14 May 2024 06:30:39 +0700 Subject: [PATCH 1/2] lxqt-config: disable monitor config It configures for KDE5 kscreen, which is no longer used. --- srcpkgs/lxqt-config/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template index f3e0f559ae1928..e0eda46a30b2d3 100644 --- a/srcpkgs/lxqt-config/template +++ b/srcpkgs/lxqt-config/template @@ -1,11 +1,12 @@ # Template file for 'lxqt-config' pkgname=lxqt-config version=1.4.0 -revision=1 +revision=2 build_style=cmake -configure_args="-DCMAKE_CXX_STANDARD=17" +# WITH_MONITOR uses libkscreen, re-enable when it moved to KDE6 +configure_args="-DCMAKE_CXX_STANDARD=17 -DWITH_MONITOR=OFF" hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl" -makedepends="liblxqt-devel libXcursor-devel libkscreen-devel +makedepends="liblxqt-devel libXcursor-devel xf86-input-libinput-devel libqtxdg-devel lxqt-menu-data-devel" depends="lxqt-menu-data" short_desc="LXQt System Settings" From 8078cb595a4ab6cc43cef4c4f06f92ae2a12fe4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 14 May 2024 06:32:20 +0700 Subject: [PATCH 2/2] libkscreen: remove package --- common/shlibs | 2 -- srcpkgs/libkscreen-devel | 1 - srcpkgs/libkscreen/template | 35 ------------------------------- srcpkgs/removed-packages/template | 1 + 4 files changed, 1 insertion(+), 38 deletions(-) delete mode 120000 srcpkgs/libkscreen-devel delete mode 100644 srcpkgs/libkscreen/template diff --git a/common/shlibs b/common/shlibs index 8f0811c72c81ac..e2b32e29a2ea4a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2594,8 +2594,6 @@ libosgUtil.so.161 osg-3.6.5_1 libosgVolume.so.161 osg-3.6.5_1 libosgGA.so.161 osg-3.6.5_1 libosgPresentation.so.161 osg-3.6.5_1 -libKF5Screen.so.8 libkscreen-5.26.90_1 -libKF5ScreenDpms.so.8 libkscreen-5.26.90_1 libKF6Screen.so.8 libkf6screen-6.0.0_1 libKF6ScreenDpms.so.8 libkf6screen-6.0.0_1 libdbusmenu-qt5.so.2 libdbusmenu-qt5-0.9.3.0_1 diff --git a/srcpkgs/libkscreen-devel b/srcpkgs/libkscreen-devel deleted file mode 120000 index 29f843cfac44e6..00000000000000 --- a/srcpkgs/libkscreen-devel +++ /dev/null @@ -1 +0,0 @@ -libkscreen \ No newline at end of file diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template deleted file mode 100644 index d1c5947a232c72..00000000000000 --- a/srcpkgs/libkscreen/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'libkscreen' -pkgname=libkscreen -version=5.27.11 -revision=3 -build_style=cmake -configure_args="-DBUILD_TESTING=OFF" -hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel - plasma-wayland-protocols qt5-wayland wayland-devel" -makedepends="qt5-tools-devel qt5-x11extras-devel libXrandr-devel kwayland-devel - kconfig-devel" -short_desc="KDE screen management software" -maintainer="John " -license="LGPL-2.1-or-later" -homepage="https://invent.kde.org/plasma/libkscreen" -distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" -checksum=0d11f41d489f32303988e5a2eee8cef7f4eb18faea5614e65bf202007ea21dd5 - -post_install() { - rm -rf "${DESTDIR}/usr/bin" - rm -rf "${DESTDIR}/usr/lib/systemd" - rm -rf "${DESTDIR}/usr/share/dbus-1" - rm -rf "${DESTDIR}/usr/share/zsh" -} - -libkscreen-devel_package() { - short_desc+=" - development" - depends="${makedepends} ${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/lib/qt5/mkspecs - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 76482075d691eb..7c7e142d97c829 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -355,6 +355,7 @@ replaces=" libgnome-keyring<=3.12.0_5 libgroff<=1.22.4_3 libgtkhtml<=4.10.0_1 + libkscreen<=5.27.11_3 libllvm10<=10.0.0_8 libllvm11<=11.0.0_2 libllvm6.0<=6.0.1_8