From bc994d368f743e284220d7473c14dd010d2c38bc Mon Sep 17 00:00:00 2001 From: Luciogi Date: Wed, 19 Jun 2024 02:23:53 +0500 Subject: [PATCH 01/22] plasma-wayland-protocols: update to 1.13.0. --- srcpkgs/plasma-wayland-protocols/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template index 3055089be2b10f..1d6b7c5f786e0a 100644 --- a/srcpkgs/plasma-wayland-protocols/template +++ b/srcpkgs/plasma-wayland-protocols/template @@ -1,6 +1,6 @@ # Template file for 'plasma-wayland-protocols' pkgname=plasma-wayland-protocols -version=1.12.0 +version=1.13.0 revision=1 build_style=cmake hostmakedepends="extra-cmake-modules" @@ -9,7 +9,7 @@ maintainer="John " license="GPL-3.0-or-later" homepage="https://invent.kde.org/libraries/plasma-wayland-protocols" distfiles="${KDE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=1483bfd279cb913c83579b5d71c58f9958764f9ba4303b3647e1007cb70d4f9e +checksum=dd477e352f5ff6e6ac686286c4b22b19bf5a4921b85ee5a7da02bb7aa115d57e post_install() { vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \ From 5ce6d38dcf69a3d9fb60d5898396ce45eb1584b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 02/22] kf6-kguiaddons: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/kf6-kguiaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kf6-kguiaddons/template b/srcpkgs/kf6-kguiaddons/template index a87ec5485a4178..4e2a48134141f0 100644 --- a/srcpkgs/kf6-kguiaddons/template +++ b/srcpkgs/kf6-kguiaddons/template @@ -1,7 +1,7 @@ # Template file for 'kf6-kguiaddons' pkgname=kf6-kguiaddons version=6.3.0 -revision=2 +revision=3 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base wayland-devel pkg-config qt6-wayland-tools" @@ -24,7 +24,7 @@ kf6-kguiaddons-geo-uri-handler_package() { } kf6-kguiaddons-devel_package() { - depends="${makedepends//private-} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" short_desc+=" - development files" pkg_install() { vmove usr/lib/pkgconfig From 6734bb4a1f85cb95adb7b4e98da9d3637c6f9d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 03/22] kf6-kidletime: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/kf6-kidletime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kf6-kidletime/template b/srcpkgs/kf6-kidletime/template index d5c2e44b235e55..49970801b761e5 100644 --- a/srcpkgs/kf6-kidletime/template +++ b/srcpkgs/kf6-kidletime/template @@ -1,7 +1,7 @@ # Template file for 'kf6-kidletime' pkgname=kf6-kidletime version=6.3.0 -revision=2 +revision=3 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" @@ -17,7 +17,7 @@ distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#kf6-}-${version}.tar.x checksum=cd8f677cce6738342b88817d0e7c1803460f00e409d730c5ae0ea33b1426472d kf6-kidletime-devel_package() { - depends="${makedepends//private-} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 5776f3756ae45e49f0787b8019bcfe176352f201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 04/22] kf6-kwindowsystem: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/kf6-kwindowsystem/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kf6-kwindowsystem/template b/srcpkgs/kf6-kwindowsystem/template index 4874731d97baab..3e16f1cb2e7a38 100644 --- a/srcpkgs/kf6-kwindowsystem/template +++ b/srcpkgs/kf6-kwindowsystem/template @@ -1,7 +1,7 @@ # Template file for 'kf6-kwindowsystem' pkgname=kf6-kwindowsystem version=6.3.0 -revision=2 +revision=3 build_style=cmake configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" @@ -37,7 +37,7 @@ do_check() { } kf6-kwindowsystem-devel_package() { - depends="${makedepends//private-} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} qt6-base-devel" short_desc+=" - development files" pkg_install() { vmove usr/lib/pkgconfig From 3429428241cee79e15bc77065e1f3ce184f8af1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 05/22] kguiaddons: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/kguiaddons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template index 0cb177d18f94cc..d04c84e6cedeb2 100644 --- a/srcpkgs/kguiaddons/template +++ b/srcpkgs/kguiaddons/template @@ -1,7 +1,7 @@ # Template file for 'kguiaddons' pkgname=kguiaddons version=5.115.0 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner $(vopt_bool wayland WITH_WAYLAND) -DBUILD_GEO_SCHEME_HANDLER=OFF" @@ -21,7 +21,7 @@ build_options_default="wayland x11" kguiaddons-devel_package() { short_desc+=" - development" - depends="${makedepends} ${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision} qt5-devel" pkg_install() { vmove usr/include vmove usr/lib/cmake From d0e3d6e679c080a12658f4d0ed093e14d36c8b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 06/22] kidletime: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/kidletime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template index 8961651be27988..f00df77430c9a5 100644 --- a/srcpkgs/kidletime/template +++ b/srcpkgs/kidletime/template @@ -1,7 +1,7 @@ # Template file for 'kidletime' pkgname=kidletime version=5.115.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel qt5-wayland wayland-devel" @@ -17,7 +17,7 @@ checksum=9d8029aa6a740dbcdee6988987d097538f369ce7b6f3dee09d502aa29737ae56 kidletime-devel_package() { short_desc+=" - development" - depends="${makedepends} ${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision} qt5-devel" pkg_install() { vmove usr/include vmove usr/lib/cmake From 6ad5408e40540d56df0e2e6cff0117db5588ba45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 07/22] libkf6screen: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/libkf6screen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libkf6screen/template b/srcpkgs/libkf6screen/template index 00e2ff74f0d381..7a503e253893d2 100644 --- a/srcpkgs/libkf6screen/template +++ b/srcpkgs/libkf6screen/template @@ -1,7 +1,7 @@ # Template file for 'libkf6screen' pkgname=libkf6screen version=6.0.5 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" @@ -18,7 +18,7 @@ checksum=01a77569f372d354c172a23f2d4e0661701c024e44d972971b146735e16ae1d9 libkf6screen-devel_package() { short_desc+=" - development" - depends="${makedepends//private-} ${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision} qt6-base-devel" pkg_install() { vmove usr/include vmove usr/lib/cmake From deaa778c0ff2ec338af8bb661ea4c1712eaf1dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 08/22] kf6-kwayland: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/kf6-kwayland/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kf6-kwayland/template b/srcpkgs/kf6-kwayland/template index a20525faa814bb..6d3755f96eb019 100644 --- a/srcpkgs/kf6-kwayland/template +++ b/srcpkgs/kf6-kwayland/template @@ -1,7 +1,7 @@ # Template file for 'kf6-kwayland' pkgname=kf6-kwayland version=6.0.5 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="kf6-kcoreaddons pkg-config extra-cmake-modules qt6-tools qt6-base @@ -17,7 +17,7 @@ checksum=a8b88411d2ad9497e27d6dbd95d647de5ebe6314561e7a8d935fd79b2fe7ae84 kf6-kwayland-devel_package() { short_desc+=" - development" - depends="${makedepends//private-} ${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision} qt6-base-devel" pkg_install() { vmove usr/include vmove usr/lib/cmake From b4a51bf99c200cd6857016118594c63ce076bcdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 09/22] krfb: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/krfb/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template index c8aaa0dd931d92..354d229aa10763 100644 --- a/srcpkgs/krfb/template +++ b/srcpkgs/krfb/template @@ -1,7 +1,7 @@ # Template file for 'krfb' pkgname=krfb version=24.02.2 -revision=2 +revision=3 build_style=cmake build_helper=qemu configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake From c697e63ffb81f29510b054d1c1030b5471dc9718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 10/22] kwayland: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/kwayland/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template index a4a3762d5f379c..14551fc2a85d92 100644 --- a/srcpkgs/kwayland/template +++ b/srcpkgs/kwayland/template @@ -1,7 +1,7 @@ # Template file for 'kwayland' pkgname=kwayland version=5.115.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-tools-devel @@ -17,7 +17,7 @@ checksum=07b512d9ce51a1cacc6d13c1c26143b57372afed0e30bd1c100ad46861b4643c kwayland-devel_package() { short_desc+=" - development" - depends="${makedepends} ${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision} qt5-devel" pkg_install() { vmove usr/include vmove usr/lib/cmake From a8dfb6a91e263ca0fd1950626888c6e25bf9b2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 11/22] plasma-desktop: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/plasma-desktop/template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template index af69ed87b4c74c..03a29a284fe99b 100644 --- a/srcpkgs/plasma-desktop/template +++ b/srcpkgs/plasma-desktop/template @@ -1,7 +1,7 @@ # Template file for 'plasma-desktop' pkgname=plasma-desktop version=6.0.5 -revision=2 +revision=3 build_style=cmake build_helper=qemu configure_args="-DBUILD_TESTING=OFF @@ -34,7 +34,3 @@ distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=5d9001baea32e35055337667f204e28f206ebccaa0a172e0f109426ba8042ecf replaces="user-manager>=0" python_version=3 - -if [ $CROSS_BUILD ]; then - hostmakedepends+=" kf6-kirigami-devel kirigami-addons-devel kf6-qqc2-desktop-style-devel" -fi From d62cc20a4c0d4be5c8ee65171ba2dd2ffb580574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 12/22] xdg-desktop-portal-kde: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/xdg-desktop-portal-kde/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template index 5a7e898652c501..d1a74bb023ebaa 100644 --- a/srcpkgs/xdg-desktop-portal-kde/template +++ b/srcpkgs/xdg-desktop-portal-kde/template @@ -1,7 +1,7 @@ # Template file for 'xdg-desktop-portal-kde' pkgname=xdg-desktop-portal-kde version=6.0.5 -revision=2 +revision=3 build_style=cmake build_helper=qemu configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner" From f75fe5fb0388a1f0bb426c1c5d411c1a6ec2e895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 12:48:31 +0700 Subject: [PATCH 13/22] kpipewire: rebuild for plasma-wayland-protocols --- srcpkgs/kpipewire/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kpipewire/template b/srcpkgs/kpipewire/template index bc41efe7b1e250..a358bcd6722aca 100644 --- a/srcpkgs/kpipewire/template +++ b/srcpkgs/kpipewire/template @@ -1,7 +1,7 @@ # Template file for 'kpipewire' pkgname=kpipewire version=6.0.5 -revision=2 +revision=3 build_style=cmake build_helper=qemu configure_args="-DKDE_INSTALL_QMLDIR=lib/qt6/qml" @@ -9,6 +9,7 @@ hostmakedepends="extra-cmake-modules gettext qt6-base qt6-tools pkg-config pipewire qt6-wayland-tools wayland-devel qt6-declarative-host-tools" makedepends="ffmpeg-devel kf6-kcoreaddons-devel kf6-kwayland-devel kf6-ki18n-devel libva-devel libepoxy-devel pipewire-devel qt6-wayland-devel + plasma-wayland-protocols wayland-devel qt6-declarative-devel qt6-base-private-devel" depends="pipewire" short_desc="Components relating to Flatpak 'pipewire' use in Plasma" @@ -24,7 +25,8 @@ do_check() { } kpipewire-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} + qt6-base-devel pipewire-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 1717108c220fe037171d5debb10c9e3ae8f08012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 14:44:05 +0700 Subject: [PATCH 14/22] libplasma: rebuild for plasma-wayland-protocols --- srcpkgs/libplasma/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/libplasma/template b/srcpkgs/libplasma/template index d39d37c16d4877..c93e218d3f9616 100644 --- a/srcpkgs/libplasma/template +++ b/srcpkgs/libplasma/template @@ -1,20 +1,20 @@ # Template file for 'libplasma' pkgname=libplasma version=6.0.5 -revision=3 +revision=4 build_style=cmake configure_args="-DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QMLDIR=lib/qt6/qml -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" -hostmakedepends="extra-cmake-modules qt6-base qt6-tools +hostmakedepends="extra-cmake-modules qt6-base qt6-tools qt6-wayland-tools qt6-declarative-host-tools wayland-devel gettext pkg-config - kf6-kconfig-devel kf6-kirigami-devel kf6-kcmutils-devel - kf6-kpackage-devel" -makedepends="qt6-base-devel qt6-declarative-devel qt6-svg-devel + kf6-kconfig kf6-kirigami-devel kf6-kcmutils + kf6-kpackage" +makedepends="qt6-base-private-devel qt6-declarative-devel qt6-svg-devel kf6-kcmutils-devel kf6-ksvg-devel kf6-ki18n-devel kf6-kwindowsystem-devel kf6-kpackage-devel kf6-kiconthemes-devel kf6-kguiaddons-devel kf6-karchive-devel kf6-kconfigwidgets-devel plasma-activities-devel wayland-devel - qt6-wayland-devel qt6-base-private-devel" + plasma-wayland-protocols qt6-wayland-devel" short_desc="Plasma library and runtime components" maintainer="John " license="GPL-3.0-or-later" @@ -29,7 +29,8 @@ do_check() { } libplasma-devel_package() { - depends="${makedepends//private-} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} qt6-declarative-devel + qt6-base-devel kf6-kpackage-devel kf6-kwindowsystem-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 2b473f7403b804a6205b89079941b2974e192c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 15/22] kwin: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/kwin/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index ea6d8129cb039f..a8e18e744f5afc 100644 --- a/srcpkgs/kwin/template +++ b/srcpkgs/kwin/template @@ -1,7 +1,7 @@ # Template file for 'kwin' pkgname=kwin version=6.0.5 -revision=2 +revision=3 build_style=cmake build_helper=qemu configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON @@ -9,10 +9,12 @@ configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" hostmakedepends="extra-cmake-modules gettext pkg-config kf6-kauth-tools qt6-base qt6-tools libcap-progs kf6-kconfig kf6-kpackage kf6-kcmutils - qt6-wayland-tools" + qt6-wayland-tools kf6-kirigami-devel libcap-devel" makedepends="libplasma-devel kf6-kcmutils-devel kf6-knewstuff-devel kscreenlocker-devel kglobalacceld-devel xcb-util-cursor-devel qt6-wayland-devel - qt6-base-private-devel + qt6-base-private-devel plasma-wayland-protocols qt6-declarative-devel + kf6-kconfig-devel kf6-kcoreaddons-devel kf6-kwindowsystem-devel + wayland-devel libepoxy-devel qt6-tools-devel qt6-multimedia-devel kf6-kdecoration-devel libxkbcommon-devel libinput-devel libSM-devel libICE-devel xcb-util-wm-devel qt6-sensors-devel lcms2-devel pipewire-devel kf6-krunner-devel xorg-server-xwayland libxcvt-devel hwids @@ -28,13 +30,11 @@ distfiles="${KDE_SITE}/plasma/${version:0:5}/${pkgname}-${version}.tar.xz" checksum=242e7d210529ec631bc5fe3fe0a117a3d1d4edb1dd3a644aafd5089312f8b0d7 replaces="kwayland-server>=0" -if [ $CROSS_BUILD ]; then - hostmakedepends+=" kf6-kirigami-devel libcap-devel" -fi - kwin-devel_package() { short_desc+=" - development" - depends="${makedepends//private-} ${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision} qt6-base-devel + qt6-declarative-devel kf6-kconfig-devel kf6-kcoreaddons-devel + kf6-kwindowsystem-devel wayland-devel libepoxy-devel" replaces="kwayland-server-devel>=0" pkg_install() { vmove usr/include From 9654700f6a3570353b9fa26c177f365312f39bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 10:42:21 +0700 Subject: [PATCH 16/22] plasma-integration: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/plasma-integration/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/plasma-integration/template b/srcpkgs/plasma-integration/template index 91bbc34862f80e..ccb8e53ebad890 100644 --- a/srcpkgs/plasma-integration/template +++ b/srcpkgs/plasma-integration/template @@ -1,7 +1,7 @@ # Template file for 'plasma-integration' pkgname=plasma-integration version=6.0.5 -revision=2 +revision=3 build_style=cmake build_helper=qemu configure_args="-DBUILD_TESTING=OFF -DBUILD_QT5=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake @@ -10,8 +10,7 @@ hostmakedepends="extra-cmake-modules pkg-config qt6-base qt6-tools gettext wayland-devel qt6-wayland-tools kf6-kconfig" makedepends="kf6-kio-devel kf6-kxmlgui-devel kf6-kstatusnotifieritem-devel kf6-kwayland-devel libXcursor-devel breeze-qt6 qt6-base-private-devel - qt6-wayland-devel - wayland-devel" + qt6-wayland-devel plasma-wayland-protocols wayland-devel" depends="noto-fonts-ttf font-hack-ttf breeze-qt6 kf6-qqc2-desktop-style" short_desc="Theme integration plugins for the Plasma workspaces" maintainer="John " From 8f6d0c25542fb711b65a87e9bb1078072bffd49f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 22:36:36 +0700 Subject: [PATCH 17/22] plasma-workspace: rebuild for plasma-wayland-protocols --- srcpkgs/plasma-workspace/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index bc5fa7c80cecce..72014e144cd911 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -1,7 +1,7 @@ # Template file for 'plasma-workspace' pkgname=plasma-workspace version=6.0.5.1 -revision=2 +revision=3 build_style=cmake build_helper=qemu configure_args="-DBUILD_TESTING=OFF -DKDE_INSTALL_QMLDIR=lib/qt6/qml @@ -20,6 +20,8 @@ makedepends="qt6-declarative-devel libplasma-devel qt6-base-private-devel libXft-devel libkf6screen-devel plasma5support-devel plasma-activities-stats-devel kf6-kwallet-devel plasma-activities-devel kf6-kded-devel kf6-networkmanager-qt-devel kf6-kirigami-devel + kf6-ksvg-devel kf6-kdeclarative-devel kf6-kwayland-devel + kscreenlocker-devel plasma-wayland-protocols kf6-kuserfeedback-devel phonon-devel polkit-qt6-devel qt6-wayland-private-devel $(vopt_if pipewire kpipewire-devel) kirigami-addons-devel libkexiv2-devel" depends="kactivitymanagerd kwin iso-codes milou plasma-integration From 615c09c1685fb10e75c211090e404350c62a7043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 27 Jun 2024 09:33:01 +0700 Subject: [PATCH 18/22] kwayland-integration: rebuild for plasma-wayland-protocols --- srcpkgs/kwayland-integration/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwayland-integration/template b/srcpkgs/kwayland-integration/template index 1cb4ee6bd40195..299be06d942fc8 100644 --- a/srcpkgs/kwayland-integration/template +++ b/srcpkgs/kwayland-integration/template @@ -1,13 +1,13 @@ # Template file for 'kwayland-integration' pkgname=kwayland-integration version=6.0.5 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake wayland-devel pkg-config wayland-protocols qt5-wayland-devel" makedepends="kidletime-devel kwayland-devel kwindowsystem-devel kguiaddons-devel - libxkbcommon-devel" + libxkbcommon-devel plasma-wayland-protocols" short_desc="Integration plugins for Kwayland" maintainer="John " license="LGPL-2.1-or-later" From b6c20acfdc71fc54c1e1404a08a0119c52f36267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 21 Feb 2024 08:16:28 +0700 Subject: [PATCH 19/22] mirror --- etc/xbps.d/repos-remote-musl.conf | 8 ++++---- etc/xbps.d/repos-remote-x86_64-multilib.conf | 6 +++--- etc/xbps.d/repos-remote.conf | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf index cde4832335c048..3c53f8438b4df6 100644 --- a/etc/xbps.d/repos-remote-musl.conf +++ b/etc/xbps.d/repos-remote-musl.conf @@ -1,5 +1,5 @@ # voidlinux remote repositories (musl) -repository=https://repo-default.voidlinux.org/current/musl/bootstrap -repository=https://repo-default.voidlinux.org/current/musl -repository=https://repo-default.voidlinux.org/current/musl/nonfree -repository=https://repo-default.voidlinux.org/current/musl/debug +repository=https://repo-fastly.voidlinux.org/current/musl/bootstrap +repository=https://repo-fastly.voidlinux.org/current/musl +repository=https://repo-fastly.voidlinux.org/current/musl/nonfree +repository=https://repo-fastly.voidlinux.org/current/musl/debug diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf index aa1a24acafdf01..300a4b7825ee07 100644 --- a/etc/xbps.d/repos-remote-x86_64-multilib.conf +++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf @@ -1,4 +1,4 @@ # voidlinux remote repositories (x86_64/glibc) -repository=https://repo-default.voidlinux.org/current/multilib/bootstrap -repository=https://repo-default.voidlinux.org/current/multilib -repository=https://repo-default.voidlinux.org/current/multilib/nonfree +repository=https://repo-fastly.voidlinux.org/current/multilib/bootstrap +repository=https://repo-fastly.voidlinux.org/current/multilib +repository=https://repo-fastly.voidlinux.org/current/multilib/nonfree diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf index e171ed53c2d4ba..ba3218471b2115 100644 --- a/etc/xbps.d/repos-remote.conf +++ b/etc/xbps.d/repos-remote.conf @@ -1,5 +1,5 @@ # voidlinux remote repositories (glibc) -repository=https://repo-default.voidlinux.org/current/bootstrap -repository=https://repo-default.voidlinux.org/current -repository=https://repo-default.voidlinux.org/current/nonfree -repository=https://repo-default.voidlinux.org/current/debug +repository=https://repo-fastly.voidlinux.org/current/bootstrap +repository=https://repo-fastly.voidlinux.org/current +repository=https://repo-fastly.voidlinux.org/current/nonfree +repository=https://repo-fastly.voidlinux.org/current/debug From b39507b50a289a629dfb680ff3a647a84b381b18 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, 25 Jun 2024 20:49:38 +0700 Subject: [PATCH 20/22] hooks/post-install: check for -private-devel if PRIVATE_API is used --- .../hooks/post-install/15-qt-private-api.sh | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 common/hooks/post-install/15-qt-private-api.sh diff --git a/common/hooks/post-install/15-qt-private-api.sh b/common/hooks/post-install/15-qt-private-api.sh new file mode 100644 index 00000000000000..18f3576e7037b8 --- /dev/null +++ b/common/hooks/post-install/15-qt-private-api.sh @@ -0,0 +1,60 @@ +# vim: set ts=4 sw=4 et ft=bash : +# +# This hook execute the following tasks: +# - warn if packages uses private Qt API but makedepends doesn't have +# qt6-*-private-devel +# +# This hook only really target qt6-base-private-devel, a lot of packages +# linked with Qt6::CorePrivate and Qt6::GuiPrivate, yet don't need its +# headers. + +get_qt_private() { + local _elf _fn _lf + find ${PKGDESTDIR} -type f | + while read -r _fn; do + trap - ERR + _lf=${_fn#${PKGDESTDIR}} + if [ "${skiprdeps/${_lf}/}" != "${skiprdeps}" ]; then + continue + fi + read -n4 _elf < "$_fn" + if [ "$_elf" = $'\177ELF' ]; then + $OBJDUMP -p "$_fn" | + sed -n ' + /required from /{s/.*required from \(.*\):/\1/;h;} + /Qt_[0-9]*_PRIVATE_API/{g;p;} + ' + fi + done | + sort -u +} + + +hook() { + local _list _shlib _version _md _v _ok + + if [ -n "$noverifyrdeps" ]; then + return 0 + fi + + _list=$(get_qt_private) + for _shlib in $_list; do + msg_normal "${pkgver}: requires PRIVATE_API from $_shlib\n" + done + _version=$(printf '%s\n' $_list | sed 's/^libQt\([0-9]*\).*/\1/' | grep -v '^5$' | uniq) + for _v in $_version; do + _ok= + for _md in ${makedepends}; do + case "${_md}" in + # Anything will works, because they're updated together + qt${_v}-*-private-devel) + _ok=yes + break + ;; + esac + done + if [ -z "$_ok" ]; then + msg_warn "${pkgver}: using Qt${_v}_PRIVATE_API but doesn't use qt${_v}-*-private-devel\n" + fi + done +} From aa8117f96ebb90e7b02a4502726cb3f81f078e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 26 Jun 2024 14:12:10 +0700 Subject: [PATCH 21/22] do-not-merge-flip-qt-private --- common/hooks/post-install/15-qt-private-api.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/hooks/post-install/15-qt-private-api.sh b/common/hooks/post-install/15-qt-private-api.sh index 18f3576e7037b8..2daa66e860c2b9 100644 --- a/common/hooks/post-install/15-qt-private-api.sh +++ b/common/hooks/post-install/15-qt-private-api.sh @@ -32,6 +32,7 @@ get_qt_private() { hook() { local _list _shlib _version _md _v _ok + local _nok= if [ -n "$noverifyrdeps" ]; then return 0 @@ -55,6 +56,8 @@ hook() { done if [ -z "$_ok" ]; then msg_warn "${pkgver}: using Qt${_v}_PRIVATE_API but doesn't use qt${_v}-*-private-devel\n" + _nok=yes fi done + test -z "$_nok" } From 3440873cd38a46988973cd585a06d90d9b738768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 28 Jun 2024 05:08:00 +0700 Subject: [PATCH 22/22] fixup! plasma-desktop: rebuild against plasma-wayland-protocol --- srcpkgs/plasma-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template index 03a29a284fe99b..f6e96cbc8151ea 100644 --- a/srcpkgs/plasma-desktop/template +++ b/srcpkgs/plasma-desktop/template @@ -9,7 +9,7 @@ configure_args="-DBUILD_TESTING=OFF -DKDE_INSTALL_QMLDIR=lib/qt6/qml -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins" hostmakedepends="extra-cmake-modules pkg-config intltool gettext qt6-base qt6-tools wayland-protocols plasma-wayland-protocols kf6-kdoctools - kf6-kconfig kf6-kcmutils kf6-kpackage kf6-kauth-tools" + kf6-kconfig kf6-kcmutils kf6-kpackage kf6-kauth-tools wayland-devel" makedepends="kf6-kauth-devel kf6-kcrash-devel kf6-kdoctools-devel kf6-ki18n-devel kf6-kcmutils-devel kf6-knewstuff-devel kf6-kio-devel kf6-knotifications-devel kf6-knotifyconfig-devel