From 10a7b3038c3cc2ae5d2d360bd7b8a165d5bf14e9 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Wed, 19 Jun 2024 02:23:53 +0500 Subject: [PATCH 01/15] 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 b69cc07c7742371eb3f6d883e55226f8ea95574d 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/15] 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 cbc25b09bab0f0ba61d6120ad55c29bb1306a1f0 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/15] 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 80d0edbba32e640955acf4cbe9fb09c6c3106eb6 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/15] 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 6df6d5bd51a755ba19de3dd765e79bae023e37d1 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/15] 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 ecf3d78b6c8b7458064a1189164d51241075260b 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/15] 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 9770db722b3929bfe94c35a2265aeb07e8eb676d 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/15] 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 3fb226d552d26955aa54078643b45a4f1a4b8ee5 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/15] 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 a0a28167c268ad77e0a0c6bd1b382b5b6849275d 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/15] 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 c6fefff527caaceb93e3afd3ce6e0b0614ca2350 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/15] 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 7214d4e2f91b140b3bb4e17e5bc85867083dd41d 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/15] 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 9fc83123c380664962ec813269d620f4ea7f1dfb 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/15] 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 90f21bb633621124628919875e209b00f9e1c12d 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/15] 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..48356a0a33a47d 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" short_desc+=" - development files" pkg_install() { vmove usr/include From e0f40a74e1eb524474a6a90aa05112b6ebf27361 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/15] libplasma: rebuild for plasma-wayland-protocols --- srcpkgs/libplasma/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libplasma/template b/srcpkgs/libplasma/template index d39d37c16d4877..8f745e86c032e2 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 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 220a2b1ebcbc4d7d72c19d81104b271b9e97857b 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/15] kwin: rebuild against plasma-wayland-protocol https://bugs.kde.org/show_bug.cgi?id=488794 --- srcpkgs/kwin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template index ea6d8129cb039f..00f66be06bcc49 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 @@ -12,7 +12,7 @@ hostmakedepends="extra-cmake-modules gettext pkg-config kf6-kauth-tools qt6-wayland-tools" 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-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