Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] KDE: fix libexecdir
@ 2022-11-21 10:32 sgn
  2022-11-21 10:39 ` [PR PATCH] [Updated] " sgn
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: sgn @ 2022-11-21 10:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages kde-fix-libexecdir
https://github.com/void-linux/void-packages/pull/40658

KDE: fix libexecdir
<!-- Uncomment relevant sections and delete options which are not applicable -->

Close #40656

[ci skip]
[skip ci]
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40658.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kde-fix-libexecdir-40658.patch --]
[-- Type: text/x-diff, Size: 39704 bytes --]

From 8786f24b20ce49e8553d1c1532d5d8287f4f405a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:08:51 +0700
Subject: [PATCH 01/45] extra-cmake-modules: fix libexecdir location

---
 .../patches/libexecdir.patch                  | 39 +++++++++++++++++++
 srcpkgs/extra-cmake-modules/template          |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/extra-cmake-modules/patches/libexecdir.patch

diff --git a/srcpkgs/extra-cmake-modules/patches/libexecdir.patch b/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
new file mode 100644
index 000000000000..92b9edfe443d
--- /dev/null
+++ b/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
@@ -0,0 +1,39 @@
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs5.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
+@@ -43,7 +43,7 @@ deprecated variable name in square brack
+     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian) [``LIB_INSTALL_DIR``]
+ ``LIBEXECDIR``
+     executables for internal use by programs and libraries (``BINDIR`` on
+-    Windows, ``LIBDIR/libexec`` otherwise) [``LIBEXEC_INSTALL_DIR``]
++    Windows, ``EXECROOTDIR/libexec`` otherwise) [``LIBEXEC_INSTALL_DIR``]
+ ``CMAKEPACKAGEDIR``
+     CMake packages, including config files (``LIBDIR/cmake``)
+     [``CMAKECONFIG_INSTALL_PREFIX``]
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs6.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
+@@ -46,7 +46,7 @@ where ``<dir>`` is one of (default value
+     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian)
+ ``LIBEXECDIR``
+     executables for internal use by programs and libraries (``BINDIR`` on
+-    Windows, ``LIBDIR/libexec`` otherwise)
++    Windows, ``EXECROOTDIR/libexec`` otherwise)
+ ``CMAKEPACKAGEDIR``
+     CMake packages, including config files (``LIBDIR/cmake``)
+ ``QTPLUGINDIR``
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirsCommon.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
+@@ -248,7 +248,7 @@ if(WIN32)
+         "executables for internal use by programs and libraries"
+         LIBEXEC_INSTALL_DIR)
+ else()
+-    _define_relative(LIBEXECDIR LIBDIR "libexec"
++    _define_relative(LIBEXECDIR EXECROOTDIR "libexec"
+         "executables for internal use by programs and libraries"
+         LIBEXEC_INSTALL_DIR)
+ endif()
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 2476323c63d6..641c29e3e74a 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,7 +1,7 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
 hostmakedepends="python3-Sphinx qt5-tools"

From 3aa410c1fdce724aa84ac7b539fda38b8dc2017a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:22:51 +0700
Subject: [PATCH 02/45] pkglint: forbid /usr/lib/libexec

---
 common/hooks/pre-pkg/99-pkglint.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a63e37207929..8c643f7deb94 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -29,6 +29,15 @@ hook() {
 		fi
 	done
 
+	if [ -d ${PKGDESTDIR}/usr/lib/libexec ]; then
+		# Add exception for kconfig,
+		# other packages hard-coded path to its files
+		if [ "${pkgname}" != kconfig ]; then
+			msg_red "${pkgver}: /usr/lib/libexec directory is not allowed!\n"
+			error=1
+		fi
+	fi
+
 	for f in "$PKGDESTDIR"/*; do
 		f="${f##*/}"
 		case "$f" in

From e9fba52364d0971415bff07f649285a8e34d7bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:15:11 +0700
Subject: [PATCH 03/45] kconfig: fix libexecdir location

---
 .../add-crossbuild-support-for-its-tools.patch        |  8 ++++----
 srcpkgs/kconfig/template                              | 11 ++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
index 83dbe2be9230..081d23ac9a38 100644
--- a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
+++ b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
@@ -14,12 +14,12 @@ of cross-build, since these cmake directive lines are always evalued at *their*
  else()
      include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigCompilerTargets.cmake")
 +    if(CMAKE_CROSSCOMPILING)
-+        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconfig_compiler_kf5)
-+        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconfig_compiler_kf5)
++        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconfig_compiler_kf5)
++        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconfig_compiler_kf5)
 +    endif()
 +    if(CMAKE_CROSSCOMPILING)
-+        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconf_update)
-+        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconf_update)
++        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconf_update)
++        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconf_update)
 +    endif()
  endif()
  include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigMacros.cmake")
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ddf3d4337773..554c82a1c250 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'kconfig'
 pkgname=kconfig
 version=5.100.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
 makedepends="qt5-devel qt5-tools-devel qt5-declarative-devel"
@@ -18,6 +18,15 @@ do_check() {
 	ctest -E 'kconfigcore-kconfigtest'
 }
 
+post_install() {
+	# Backward compatible symlink
+	vmkdir usr/lib/libexec/kf5
+	ln -s ../../../libexec/kf5/kconf_update \
+		${DESTDIR}/usr/lib/libexec/kf5
+	ln -s ../../../libexec/kf5/kconfig_compiler_kf5 \
+		${DESTDIR}/usr/lib/libexec/kf5
+}
+
 kconfig-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 3ef07cf80186553912f3061a967a9c3bbd923b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:57 +0700
Subject: [PATCH 04/45] baloo5: fix libexecdir location

---
 srcpkgs/baloo5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 099f872a6b7b..690adf4694b8 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,7 +1,7 @@
 # Template file for 'baloo5'
 pkgname=baloo5
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From a706b4b2189ccf0b828c75efbd63151c0c16bd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:57 +0700
Subject: [PATCH 05/45] corectrl: fix libexecdir location

---
 srcpkgs/corectrl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index f2f69afbe30d..b85385804faa 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,7 +1,7 @@
 # Template file for 'corectrl'
 pkgname=corectrl
 version=1.2.3
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake

From 9c5ee4f9275e7e4386eb9b68e2e93ba13baa7285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 06/45] execline: fix libexecdir location

---
 srcpkgs/execline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index 2df4249d34cc..f1be2b2618c5 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,7 +1,7 @@
 # Template file for 'execline'
 pkgname=execline
 version=2.9.0.1
-revision=1
+revision=2
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps

From 194693a63b3cfb18771d5d2e936af3563c43b360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 07/45] frameworkintegration: fix libexecdir location

---
 srcpkgs/frameworkintegration/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 30cb2df51f15..7bf125cbaf57 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,7 +1,7 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
  kpackage qt5-host-tools qt5-qmake python3 gettext"

From 7bcc077a2d943498ba3931269b074c0656def061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 08/45] hotspot: fix libexecdir location

---
 srcpkgs/hotspot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hotspot/template b/srcpkgs/hotspot/template
index e11168c91587..30ce05103fab 100644
--- a/srcpkgs/hotspot/template
+++ b/srcpkgs/hotspot/template
@@ -1,7 +1,7 @@
 # Template file for 'hotspot'
 pkgname=hotspot
 version=1.3.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext"
 makedepends="qt5-devel qt5-svg-devel kconfigwidgets-devel kcoreaddons-devel

From baa3a63c6a5c9b278bec7628614c97668f3aa6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 09/45] k3b: fix libexecdir location

---
 srcpkgs/k3b/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 3c8c150df561..daf07b6f24c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
 # Template file for 'k3b'
 pkgname=k3b
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
  qt5-host-tools kauth kdoctools kcoreaddons"

From e5314fa9220fe5e0048fb50e3fd0cea66d0d9f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 10/45] kactivitymanagerd: fix libexecdir location

---
 srcpkgs/kactivitymanagerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 767c8f5a7042..7b7cd536acef 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,7 +1,7 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"

From 5c5156d32a32784be71043dba7ddb2e2913d5f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 11/45] kalarm: fix libexecdir location

---
 srcpkgs/kalarm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 46dd4c15ac29..2b5ed58ffd37 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,7 +1,7 @@
 # Template file for 'kalarm'
 pkgname=kalarm
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig gettext"

From e461b78a8b5da4af895ebb06ba543f33d8105ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 12/45] kauth: fix libexecdir location

---
 srcpkgs/kauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 33549dae70dc..7d7136dc9d02 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,7 +1,7 @@
 # Template file for 'kauth'
 pkgname=kauth
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
  qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From 3d0266bfe4e7d7f0d7c0b936cf83e19073a86164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 13/45] kcmutils: fix libexecdir location

---
 srcpkgs/kcmutils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 09c63c8f51a4..5873687d49e3 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,7 +1,7 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 hostmakedepends="kcoreaddons extra-cmake-modules

From c28a5998be9b30117cecf2fb1f2364dc2f7acf5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 14/45] kcron: fix libexecdir location

---
 srcpkgs/kcron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 0c9741d98267..52264a35b3cd 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,7 +1,7 @@
 # Template file for 'kcron'
 pkgname=kcron
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
  kauth pkg-config qt5-host-tools qt5-qmake"

From ed99fec3c40e05e6d04d0d1e3e99a9475c0d54f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 15/45] kde-cli-tools: fix libexecdir location

---
 srcpkgs/kde-cli-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index c9fb400bfbfe..eddeb93d78d3 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext pkg-config kcmutils-devel

From 4a16cacbac7cdab40e2d6520d20e66e2fb4fca1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 16/45] kde-gtk-config5: fix libexecdir location

---
 srcpkgs/kde-gtk-config5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 62d9c6417e96..9bc414da5175 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,7 +1,7 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools

From 245daa866c4d28b45fd9b8069ec2c16fd0d6e25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 17/45] kdeconnect: fix libexecdir location

---
 srcpkgs/kdeconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 36c644466ca5..3bdbb3294f77 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,7 +1,7 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-host-tools

From 797954e5355640c54198dd078350eb1ceb3dc0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 18/45] kdelibs4support: fix libexecdir location

---
 srcpkgs/kdelibs4support/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b5b6e9f3f26e..4a6f9a568542 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,7 +1,7 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From f8f2cfff1267ae79783bc455086ef602257b81f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 19/45] kdesu: fix libexecdir location

---
 srcpkgs/kdesu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index cb95b31d5b59..a284c59c4b8d 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,7 +1,7 @@
 # Template file for 'kdesu'
 pkgname=kdesu
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"

From 576635bd75df0ab1c4f349302e05ed529eb991ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 20/45] khelpcenter: fix libexecdir location

---
 srcpkgs/khelpcenter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 948e23d7ef57..bc5aae822d3d 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,7 +1,7 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons pkg-config gettext"

From f989f6be420f46718d59bc5bedd5ebafc3a8d1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 21/45] kinfocenter: fix libexecdir location

---
 srcpkgs/kinfocenter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 28fa4fa63aa7..187e6f5518c4 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,7 +1,7 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake

From 09282c6be255264da2c8019a85998daa16a798b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 22/45] kinit: fix libexecdir location

---
 srcpkgs/kinit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index c97bdb9755c2..b18a62a26bf8 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,7 +1,7 @@
 # Template file for 'kinit'
 pkgname=kinit
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
  gettext qt5-host-tools qt5-qmake kdoctools"

From 3e9e34dc079121fd4dd6a624d61c54ffe19a5055 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 23/45] kio: fix libexecdir location

---
 srcpkgs/kio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 5edab27d77b4..1aecf59e7373 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,7 +1,7 @@
 # Template file for 'kio'
 pkgname=kio
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From e5de1bfe855bb88a1b896835d961c0bc9bc4dc24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 24/45] kio-extras: fix libexecdir location

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 1996d2291aa80060c512809fd95098c975416052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 25/45] kitinerary: fix libexecdir location

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index 9f65a32b1ba0..ed9bd13c6fbb 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
 makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel

From 1411f6d5bae2b053618f1a4fc0ddc3e4bb9e81cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 26/45] kpmcore: fix libexecdir location

---
 srcpkgs/kpmcore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template
index b78ba2611391..7398101e0d0c 100644
--- a/srcpkgs/kpmcore/template
+++ b/srcpkgs/kpmcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kpmcore'
 pkgname=kpmcore
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules python3 qt5-devel qt5-qmake pkg-config kcoreaddons

From 717ff7663ba7de0854d39799c3b4326650ee93ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 27/45] kscreen: fix libexecdir location

---
 srcpkgs/kscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 7a02d650019e..7404db1f5139 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'kscreen'
 pkgname=kscreen
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake

From 15a305126fae23311c376407833ed37342aee385 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 28/45] kscreenlocker: fix libexecdir location

---
 srcpkgs/kscreenlocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 607ef3cb61b7..f443166c7d41 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,7 +1,7 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons-devel

From 5c269bafec81cbb9d17f7da677a0db18a5e096e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 29/45] ktexteditor: fix libexecdir location

---
 srcpkgs/ktexteditor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 72b02a5e31c9..1c9f84d3a6ba 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,7 +1,7 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 2013f45cfd57459409383f1a650f7e820d4729da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 30/45] kwallet-pam: fix libexecdir location

---
 srcpkgs/kwallet-pam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 5399331ef61d..f7d1c333e4eb 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,7 +1,7 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
 makedepends="libgcrypt-devel pam-devel kwallet-devel"

From de27573c3302833f62be11c7134c2fee9feb40c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 31/45] kwalletmanager: fix libexecdir location

---
 srcpkgs/kwalletmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 35499d430cde..273af686cb98 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
  qt5-host-tools qt5-qmake"

From f1d8164549b15a6f5ec3f501b75ac429dd501f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 32/45] kwayland: fix libexecdir location

---
 srcpkgs/kwayland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index bddeb188744b..83c66cf4af20 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,7 +1,7 @@
 # Template file for 'kwayland'
 pkgname=kwayland
 version=5.100.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

From 354da1ccc5d4bafeedf8123fc73de12b24b66641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 33/45] kwin: fix libexecdir location

---
 srcpkgs/kwin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 73c68f065932..f51b23bdc216 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON

From b18f48c708bc4a573b29529875510bd5c3abe8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 34/45] kxmlgui: fix libexecdir location

---
 srcpkgs/kxmlgui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 23789d486484..99a2061150fb 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,7 +1,7 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
  gettext qt5-qmake qt5-host-tools python3"

From c8dc9009fd7abf84461220c01271a48a3e2d7334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 35/45] libkscreen: fix libexecdir location

---
 srcpkgs/libkscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index ca5c0095eefe..1fe41232cbaa 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel

From 5390a665a89d56f6dba733bcb59235bf6e414b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 36/45] libksysguard: fix libexecdir location

---
 srcpkgs/libksysguard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 111c748ed47f..dc72a24cc355 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,7 +1,7 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
  kpackage"

From 5b598f212f02dcf49f525cda0e401382893345af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 37/45] plasma-desktop: fix libexecdir location

---
 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 8cd18f600b9e..4bace7523e9e 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DKF5_HOST_TOOLING=/usr/lib/cmake"

From ef1ad1b65d0a64946bfb8437f1dfc02f67f7fc86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 38/45] plasma-disks: fix libexecdir location

---
 srcpkgs/plasma-disks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index d56d660142da..eac0c1076182 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From 273f21a699a4d150d16f8d6a68ece4077bf6a943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 39/45] plasma-firewall: fix libexecdir location

---
 srcpkgs/plasma-firewall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 23931e2158e4..389866622699 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From f98b8c6cc42e25859501b02f5c1dad99dbee4730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 40/45] plasma-workspace: fix libexecdir location

---
 srcpkgs/plasma-workspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 4585fd283ecb..518fb3a18ab8 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner

From fca2c49f70075b5e780ca8f4141d62b76bce7ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 41/45] polkit-kde-agent: fix libexecdir location

---
 srcpkgs/polkit-kde-agent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 79e3930b8fcd..2a30f95a2732 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools gettext kcoreaddons"

From 4f35ff97dba4faf91d098d847fd345997562916d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 42/45] powerdevil: fix libexecdir location

---
 srcpkgs/powerdevil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 52fb9cf6f7a2..4d3a175a168f 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,7 +1,7 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config kdoctools kauth-devel

From fdad59d5c5efa5685275642e7d218f7d4400fc95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 43/45] purpose: fix libexecdir location

---
 srcpkgs/purpose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 2f6c96eb2093..ee6ae961e7f0 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,7 +1,7 @@
 # Template file for 'purpose'
 pkgname=purpose
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
  python3 gettext intltool"

From b42c39be5e3bd0407326aea1313e4b7d9c6615cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 44/45] sddm-kcm: fix libexecdir location

---
 srcpkgs/sddm-kcm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index ad544a1be684..378d86e12fdc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake

From 648aa93be3a9c458e8f1ae26371c7fd3b0360519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 45/45] xdg-desktop-portal-kde: fix libexecdir location

---
 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 3710ea1b836e..9bbfb817fe32 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=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons gettext

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] KDE: fix libexecdir
  2022-11-21 10:32 [PR PATCH] KDE: fix libexecdir sgn
@ 2022-11-21 10:39 ` sgn
  2022-11-21 10:51 ` sgn
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2022-11-21 10:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages kde-fix-libexecdir
https://github.com/void-linux/void-packages/pull/40658

KDE: fix libexecdir
<!-- Uncomment relevant sections and delete options which are not applicable -->

Close #40656

[ci skip]
[skip ci]
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40658.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kde-fix-libexecdir-40658.patch --]
[-- Type: text/x-diff, Size: 38945 bytes --]

From 8786f24b20ce49e8553d1c1532d5d8287f4f405a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:08:51 +0700
Subject: [PATCH 01/44] extra-cmake-modules: fix libexecdir location

---
 .../patches/libexecdir.patch                  | 39 +++++++++++++++++++
 srcpkgs/extra-cmake-modules/template          |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/extra-cmake-modules/patches/libexecdir.patch

diff --git a/srcpkgs/extra-cmake-modules/patches/libexecdir.patch b/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
new file mode 100644
index 000000000000..92b9edfe443d
--- /dev/null
+++ b/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
@@ -0,0 +1,39 @@
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs5.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
+@@ -43,7 +43,7 @@ deprecated variable name in square brack
+     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian) [``LIB_INSTALL_DIR``]
+ ``LIBEXECDIR``
+     executables for internal use by programs and libraries (``BINDIR`` on
+-    Windows, ``LIBDIR/libexec`` otherwise) [``LIBEXEC_INSTALL_DIR``]
++    Windows, ``EXECROOTDIR/libexec`` otherwise) [``LIBEXEC_INSTALL_DIR``]
+ ``CMAKEPACKAGEDIR``
+     CMake packages, including config files (``LIBDIR/cmake``)
+     [``CMAKECONFIG_INSTALL_PREFIX``]
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs6.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
+@@ -46,7 +46,7 @@ where ``<dir>`` is one of (default value
+     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian)
+ ``LIBEXECDIR``
+     executables for internal use by programs and libraries (``BINDIR`` on
+-    Windows, ``LIBDIR/libexec`` otherwise)
++    Windows, ``EXECROOTDIR/libexec`` otherwise)
+ ``CMAKEPACKAGEDIR``
+     CMake packages, including config files (``LIBDIR/cmake``)
+ ``QTPLUGINDIR``
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirsCommon.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
+@@ -248,7 +248,7 @@ if(WIN32)
+         "executables for internal use by programs and libraries"
+         LIBEXEC_INSTALL_DIR)
+ else()
+-    _define_relative(LIBEXECDIR LIBDIR "libexec"
++    _define_relative(LIBEXECDIR EXECROOTDIR "libexec"
+         "executables for internal use by programs and libraries"
+         LIBEXEC_INSTALL_DIR)
+ endif()
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 2476323c63d6..641c29e3e74a 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,7 +1,7 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
 hostmakedepends="python3-Sphinx qt5-tools"

From 3aa410c1fdce724aa84ac7b539fda38b8dc2017a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:22:51 +0700
Subject: [PATCH 02/44] pkglint: forbid /usr/lib/libexec

---
 common/hooks/pre-pkg/99-pkglint.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a63e37207929..8c643f7deb94 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -29,6 +29,15 @@ hook() {
 		fi
 	done
 
+	if [ -d ${PKGDESTDIR}/usr/lib/libexec ]; then
+		# Add exception for kconfig,
+		# other packages hard-coded path to its files
+		if [ "${pkgname}" != kconfig ]; then
+			msg_red "${pkgver}: /usr/lib/libexec directory is not allowed!\n"
+			error=1
+		fi
+	fi
+
 	for f in "$PKGDESTDIR"/*; do
 		f="${f##*/}"
 		case "$f" in

From e9fba52364d0971415bff07f649285a8e34d7bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:15:11 +0700
Subject: [PATCH 03/44] kconfig: fix libexecdir location

---
 .../add-crossbuild-support-for-its-tools.patch        |  8 ++++----
 srcpkgs/kconfig/template                              | 11 ++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
index 83dbe2be9230..081d23ac9a38 100644
--- a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
+++ b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
@@ -14,12 +14,12 @@ of cross-build, since these cmake directive lines are always evalued at *their*
  else()
      include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigCompilerTargets.cmake")
 +    if(CMAKE_CROSSCOMPILING)
-+        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconfig_compiler_kf5)
-+        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconfig_compiler_kf5)
++        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconfig_compiler_kf5)
++        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconfig_compiler_kf5)
 +    endif()
 +    if(CMAKE_CROSSCOMPILING)
-+        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconf_update)
-+        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconf_update)
++        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconf_update)
++        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconf_update)
 +    endif()
  endif()
  include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigMacros.cmake")
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ddf3d4337773..554c82a1c250 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'kconfig'
 pkgname=kconfig
 version=5.100.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
 makedepends="qt5-devel qt5-tools-devel qt5-declarative-devel"
@@ -18,6 +18,15 @@ do_check() {
 	ctest -E 'kconfigcore-kconfigtest'
 }
 
+post_install() {
+	# Backward compatible symlink
+	vmkdir usr/lib/libexec/kf5
+	ln -s ../../../libexec/kf5/kconf_update \
+		${DESTDIR}/usr/lib/libexec/kf5
+	ln -s ../../../libexec/kf5/kconfig_compiler_kf5 \
+		${DESTDIR}/usr/lib/libexec/kf5
+}
+
 kconfig-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 3ef07cf80186553912f3061a967a9c3bbd923b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:57 +0700
Subject: [PATCH 04/44] baloo5: fix libexecdir location

---
 srcpkgs/baloo5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 099f872a6b7b..690adf4694b8 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,7 +1,7 @@
 # Template file for 'baloo5'
 pkgname=baloo5
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From a706b4b2189ccf0b828c75efbd63151c0c16bd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:57 +0700
Subject: [PATCH 05/44] corectrl: fix libexecdir location

---
 srcpkgs/corectrl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index f2f69afbe30d..b85385804faa 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,7 +1,7 @@
 # Template file for 'corectrl'
 pkgname=corectrl
 version=1.2.3
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake

From 67dd75ed0c2e003588d9d6ccdc11c9fb8044eb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 06/44] frameworkintegration: fix libexecdir location

---
 srcpkgs/frameworkintegration/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 30cb2df51f15..7bf125cbaf57 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,7 +1,7 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
  kpackage qt5-host-tools qt5-qmake python3 gettext"

From 4abcac9dc723ca144ed5272264daae29f77a0e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 07/44] hotspot: fix libexecdir location

---
 srcpkgs/hotspot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hotspot/template b/srcpkgs/hotspot/template
index e11168c91587..30ce05103fab 100644
--- a/srcpkgs/hotspot/template
+++ b/srcpkgs/hotspot/template
@@ -1,7 +1,7 @@
 # Template file for 'hotspot'
 pkgname=hotspot
 version=1.3.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext"
 makedepends="qt5-devel qt5-svg-devel kconfigwidgets-devel kcoreaddons-devel

From 4c3629f84dd745d6b402650504546827fca6de99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 08/44] k3b: fix libexecdir location

---
 srcpkgs/k3b/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 3c8c150df561..daf07b6f24c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
 # Template file for 'k3b'
 pkgname=k3b
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
  qt5-host-tools kauth kdoctools kcoreaddons"

From 77c311d4682a2f3de0e7993d0b59b08135468d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 09/44] kactivitymanagerd: fix libexecdir location

---
 srcpkgs/kactivitymanagerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 767c8f5a7042..7b7cd536acef 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,7 +1,7 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"

From 153bb7820016b251633a339bbcec57ed1d8c0924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 10/44] kalarm: fix libexecdir location

---
 srcpkgs/kalarm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 46dd4c15ac29..2b5ed58ffd37 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,7 +1,7 @@
 # Template file for 'kalarm'
 pkgname=kalarm
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig gettext"

From 048d3320241663481c80705b4170770b5b3c59f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 11/44] kauth: fix libexecdir location

---
 srcpkgs/kauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 33549dae70dc..7d7136dc9d02 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,7 +1,7 @@
 # Template file for 'kauth'
 pkgname=kauth
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
  qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From 5529dfdc9be659fa0656354b72b01995d60f480a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 12/44] kcmutils: fix libexecdir location

---
 srcpkgs/kcmutils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 09c63c8f51a4..5873687d49e3 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,7 +1,7 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 hostmakedepends="kcoreaddons extra-cmake-modules

From 7350c3082efa110f15b1bb6706dc135765a07e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 13/44] kcron: fix libexecdir location

---
 srcpkgs/kcron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 0c9741d98267..52264a35b3cd 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,7 +1,7 @@
 # Template file for 'kcron'
 pkgname=kcron
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
  kauth pkg-config qt5-host-tools qt5-qmake"

From a724f85697c3dc4683f5da45903a6853af355662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 14/44] kde-cli-tools: fix libexecdir location

---
 srcpkgs/kde-cli-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index c9fb400bfbfe..eddeb93d78d3 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext pkg-config kcmutils-devel

From 35492b8605920450b468cbf900669fefd0fa4295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 15/44] kde-gtk-config5: fix libexecdir location

---
 srcpkgs/kde-gtk-config5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 62d9c6417e96..9bc414da5175 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,7 +1,7 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools

From ad3ca320f92bedde04e12b868542352264c6bc50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 16/44] kdeconnect: fix libexecdir location

---
 srcpkgs/kdeconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 36c644466ca5..3bdbb3294f77 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,7 +1,7 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-host-tools

From 06b1f641327d1d55a2618b10fcaf225b87fc9b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 17/44] kdelibs4support: fix libexecdir location

---
 srcpkgs/kdelibs4support/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b5b6e9f3f26e..4a6f9a568542 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,7 +1,7 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From e0b7f483a4090b586abd45dfc571dcb101f351bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 18/44] kdesu: fix libexecdir location

---
 srcpkgs/kdesu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index cb95b31d5b59..a284c59c4b8d 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,7 +1,7 @@
 # Template file for 'kdesu'
 pkgname=kdesu
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"

From 581a319d9abec04f638350b42690e3ab9d10dab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 19/44] khelpcenter: fix libexecdir location

---
 srcpkgs/khelpcenter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 948e23d7ef57..bc5aae822d3d 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,7 +1,7 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons pkg-config gettext"

From ff004f1c6c4d7772a4a760688eefa2ef5b2ab149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 20/44] kinfocenter: fix libexecdir location

---
 srcpkgs/kinfocenter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 28fa4fa63aa7..187e6f5518c4 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,7 +1,7 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake

From db204fe9c979bafb6ac25bacd96f8673af13a8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 21/44] kinit: fix libexecdir location

---
 srcpkgs/kinit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index c97bdb9755c2..b18a62a26bf8 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,7 +1,7 @@
 # Template file for 'kinit'
 pkgname=kinit
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
  gettext qt5-host-tools qt5-qmake kdoctools"

From 68fbcb7388c6430bb9c60556494c32a759b4bc85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 22/44] kio: fix libexecdir location

---
 srcpkgs/kio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 5edab27d77b4..1aecf59e7373 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,7 +1,7 @@
 # Template file for 'kio'
 pkgname=kio
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From b012cf359aad7169ed9ab5370cba95b26864cff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 23/44] kio-extras: fix libexecdir location

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 458d51f49c3f5fb8570fb67fb4c80a4b084780d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 24/44] kitinerary: fix libexecdir location

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index 9f65a32b1ba0..ed9bd13c6fbb 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
 makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel

From 13f3da7e83f64feb9798efefd3103245c4dc7636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 25/44] kpmcore: fix libexecdir location

---
 srcpkgs/kpmcore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template
index b78ba2611391..7398101e0d0c 100644
--- a/srcpkgs/kpmcore/template
+++ b/srcpkgs/kpmcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kpmcore'
 pkgname=kpmcore
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules python3 qt5-devel qt5-qmake pkg-config kcoreaddons

From 2012f1e66916deb9d7f1ed03c4378a3820f2ee7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 26/44] kscreen: fix libexecdir location

---
 srcpkgs/kscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 7a02d650019e..7404db1f5139 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'kscreen'
 pkgname=kscreen
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake

From 8df6fd098217fd121e2b51f38b7c852037579a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 27/44] kscreenlocker: fix libexecdir location

---
 srcpkgs/kscreenlocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 607ef3cb61b7..f443166c7d41 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,7 +1,7 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons-devel

From 30775d91bf35a988c2d45a4a8e40e94270e02a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 28/44] ktexteditor: fix libexecdir location

---
 srcpkgs/ktexteditor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 72b02a5e31c9..1c9f84d3a6ba 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,7 +1,7 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 06b7034c678fd0622ed9af1553f752f4ab2c3234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 29/44] kwallet-pam: fix libexecdir location

---
 srcpkgs/kwallet-pam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 5399331ef61d..f7d1c333e4eb 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,7 +1,7 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
 makedepends="libgcrypt-devel pam-devel kwallet-devel"

From 35425399bcae7e69b3d771b495af3d91ca72c361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 30/44] kwalletmanager: fix libexecdir location

---
 srcpkgs/kwalletmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 35499d430cde..273af686cb98 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
  qt5-host-tools qt5-qmake"

From 6e872bd65f83992666b0c0085ba1e01cb11b56fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 31/44] kwayland: fix libexecdir location

---
 srcpkgs/kwayland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index bddeb188744b..83c66cf4af20 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,7 +1,7 @@
 # Template file for 'kwayland'
 pkgname=kwayland
 version=5.100.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

From 9360ede68e89d742cd531571f5e57d3c062efc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 32/44] kwin: fix libexecdir location

---
 srcpkgs/kwin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 73c68f065932..f51b23bdc216 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON

From 79d765e19052974783bc707c3752cf6e48f91d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 33/44] kxmlgui: fix libexecdir location

---
 srcpkgs/kxmlgui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 23789d486484..99a2061150fb 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,7 +1,7 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
  gettext qt5-qmake qt5-host-tools python3"

From 34558fb2e45343aa90ccf4a006dbf82937dd998b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 34/44] libkscreen: fix libexecdir location

---
 srcpkgs/libkscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index ca5c0095eefe..1fe41232cbaa 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel

From 5f855d2fd61692714304c8464709a7b661254a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 35/44] libksysguard: fix libexecdir location

---
 srcpkgs/libksysguard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 111c748ed47f..dc72a24cc355 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,7 +1,7 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
  kpackage"

From 2acc7c8c96d52376c2f599139b2d509f8ddb7424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 36/44] plasma-desktop: fix libexecdir location

---
 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 8cd18f600b9e..4bace7523e9e 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 5ad38d7bffeddd46345037587824d4f33bb8a01d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 37/44] plasma-disks: fix libexecdir location

---
 srcpkgs/plasma-disks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index d56d660142da..eac0c1076182 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From 23110723f4c74d53975192d1ae8522ffe711c75b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 38/44] plasma-firewall: fix libexecdir location

---
 srcpkgs/plasma-firewall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 23931e2158e4..389866622699 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From 847249ac0aaf50f55fe94cade38bf96eb58d68e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 39/44] plasma-workspace: fix libexecdir location

---
 srcpkgs/plasma-workspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 4585fd283ecb..518fb3a18ab8 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner

From a5e7a2136aa96e374fb2c3727eeb4c362192f0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 40/44] polkit-kde-agent: fix libexecdir location

---
 srcpkgs/polkit-kde-agent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 79e3930b8fcd..2a30f95a2732 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools gettext kcoreaddons"

From 02a506be97d9d9097de9dce36e9d30d449369bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 41/44] powerdevil: fix libexecdir location

---
 srcpkgs/powerdevil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 52fb9cf6f7a2..4d3a175a168f 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,7 +1,7 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config kdoctools kauth-devel

From f6979375a2e35a4d585cb1752bb9e695da87d7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 42/44] purpose: fix libexecdir location

---
 srcpkgs/purpose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 2f6c96eb2093..ee6ae961e7f0 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,7 +1,7 @@
 # Template file for 'purpose'
 pkgname=purpose
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
  python3 gettext intltool"

From 7cc15bfbf4677d1a59fac163181fd94ba14e498b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 43/44] sddm-kcm: fix libexecdir location

---
 srcpkgs/sddm-kcm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index ad544a1be684..378d86e12fdc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake

From d3b315b55f1aac2301c732797346bf30846f149e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 44/44] xdg-desktop-portal-kde: fix libexecdir location

---
 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 3710ea1b836e..9bbfb817fe32 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=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons gettext

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] KDE: fix libexecdir
  2022-11-21 10:32 [PR PATCH] KDE: fix libexecdir sgn
  2022-11-21 10:39 ` [PR PATCH] [Updated] " sgn
@ 2022-11-21 10:51 ` sgn
  2022-11-22  2:04 ` sgn
  2022-11-22  2:05 ` [PR PATCH] [Merged]: " sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2022-11-21 10:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages kde-fix-libexecdir
https://github.com/void-linux/void-packages/pull/40658

KDE: fix libexecdir
<!-- Uncomment relevant sections and delete options which are not applicable -->

Close #40656

[ci skip]
[skip ci]
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40658.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kde-fix-libexecdir-40658.patch --]
[-- Type: text/x-diff, Size: 39499 bytes --]

From 8786f24b20ce49e8553d1c1532d5d8287f4f405a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:08:51 +0700
Subject: [PATCH 01/44] extra-cmake-modules: fix libexecdir location

---
 .../patches/libexecdir.patch                  | 39 +++++++++++++++++++
 srcpkgs/extra-cmake-modules/template          |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/extra-cmake-modules/patches/libexecdir.patch

diff --git a/srcpkgs/extra-cmake-modules/patches/libexecdir.patch b/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
new file mode 100644
index 000000000000..92b9edfe443d
--- /dev/null
+++ b/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
@@ -0,0 +1,39 @@
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs5.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
+@@ -43,7 +43,7 @@ deprecated variable name in square brack
+     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian) [``LIB_INSTALL_DIR``]
+ ``LIBEXECDIR``
+     executables for internal use by programs and libraries (``BINDIR`` on
+-    Windows, ``LIBDIR/libexec`` otherwise) [``LIBEXEC_INSTALL_DIR``]
++    Windows, ``EXECROOTDIR/libexec`` otherwise) [``LIBEXEC_INSTALL_DIR``]
+ ``CMAKEPACKAGEDIR``
+     CMake packages, including config files (``LIBDIR/cmake``)
+     [``CMAKECONFIG_INSTALL_PREFIX``]
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs6.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
+@@ -46,7 +46,7 @@ where ``<dir>`` is one of (default value
+     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian)
+ ``LIBEXECDIR``
+     executables for internal use by programs and libraries (``BINDIR`` on
+-    Windows, ``LIBDIR/libexec`` otherwise)
++    Windows, ``EXECROOTDIR/libexec`` otherwise)
+ ``CMAKEPACKAGEDIR``
+     CMake packages, including config files (``LIBDIR/cmake``)
+ ``QTPLUGINDIR``
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirsCommon.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
+@@ -248,7 +248,7 @@ if(WIN32)
+         "executables for internal use by programs and libraries"
+         LIBEXEC_INSTALL_DIR)
+ else()
+-    _define_relative(LIBEXECDIR LIBDIR "libexec"
++    _define_relative(LIBEXECDIR EXECROOTDIR "libexec"
+         "executables for internal use by programs and libraries"
+         LIBEXEC_INSTALL_DIR)
+ endif()
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 2476323c63d6..641c29e3e74a 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,7 +1,7 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
 hostmakedepends="python3-Sphinx qt5-tools"

From 3aa410c1fdce724aa84ac7b539fda38b8dc2017a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:22:51 +0700
Subject: [PATCH 02/44] pkglint: forbid /usr/lib/libexec

---
 common/hooks/pre-pkg/99-pkglint.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a63e37207929..8c643f7deb94 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -29,6 +29,15 @@ hook() {
 		fi
 	done
 
+	if [ -d ${PKGDESTDIR}/usr/lib/libexec ]; then
+		# Add exception for kconfig,
+		# other packages hard-coded path to its files
+		if [ "${pkgname}" != kconfig ]; then
+			msg_red "${pkgver}: /usr/lib/libexec directory is not allowed!\n"
+			error=1
+		fi
+	fi
+
 	for f in "$PKGDESTDIR"/*; do
 		f="${f##*/}"
 		case "$f" in

From e9fba52364d0971415bff07f649285a8e34d7bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:15:11 +0700
Subject: [PATCH 03/44] kconfig: fix libexecdir location

---
 .../add-crossbuild-support-for-its-tools.patch        |  8 ++++----
 srcpkgs/kconfig/template                              | 11 ++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
index 83dbe2be9230..081d23ac9a38 100644
--- a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
+++ b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
@@ -14,12 +14,12 @@ of cross-build, since these cmake directive lines are always evalued at *their*
  else()
      include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigCompilerTargets.cmake")
 +    if(CMAKE_CROSSCOMPILING)
-+        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconfig_compiler_kf5)
-+        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconfig_compiler_kf5)
++        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconfig_compiler_kf5)
++        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconfig_compiler_kf5)
 +    endif()
 +    if(CMAKE_CROSSCOMPILING)
-+        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconf_update)
-+        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconf_update)
++        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconf_update)
++        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconf_update)
 +    endif()
  endif()
  include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigMacros.cmake")
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ddf3d4337773..554c82a1c250 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'kconfig'
 pkgname=kconfig
 version=5.100.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
 makedepends="qt5-devel qt5-tools-devel qt5-declarative-devel"
@@ -18,6 +18,15 @@ do_check() {
 	ctest -E 'kconfigcore-kconfigtest'
 }
 
+post_install() {
+	# Backward compatible symlink
+	vmkdir usr/lib/libexec/kf5
+	ln -s ../../../libexec/kf5/kconf_update \
+		${DESTDIR}/usr/lib/libexec/kf5
+	ln -s ../../../libexec/kf5/kconfig_compiler_kf5 \
+		${DESTDIR}/usr/lib/libexec/kf5
+}
+
 kconfig-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 3ef07cf80186553912f3061a967a9c3bbd923b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:57 +0700
Subject: [PATCH 04/44] baloo5: fix libexecdir location

---
 srcpkgs/baloo5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 099f872a6b7b..690adf4694b8 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,7 +1,7 @@
 # Template file for 'baloo5'
 pkgname=baloo5
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From a706b4b2189ccf0b828c75efbd63151c0c16bd57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:57 +0700
Subject: [PATCH 05/44] corectrl: fix libexecdir location

---
 srcpkgs/corectrl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index f2f69afbe30d..b85385804faa 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,7 +1,7 @@
 # Template file for 'corectrl'
 pkgname=corectrl
 version=1.2.3
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake

From 67dd75ed0c2e003588d9d6ccdc11c9fb8044eb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 06/44] frameworkintegration: fix libexecdir location

---
 srcpkgs/frameworkintegration/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 30cb2df51f15..7bf125cbaf57 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,7 +1,7 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
  kpackage qt5-host-tools qt5-qmake python3 gettext"

From 4abcac9dc723ca144ed5272264daae29f77a0e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 07/44] hotspot: fix libexecdir location

---
 srcpkgs/hotspot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hotspot/template b/srcpkgs/hotspot/template
index e11168c91587..30ce05103fab 100644
--- a/srcpkgs/hotspot/template
+++ b/srcpkgs/hotspot/template
@@ -1,7 +1,7 @@
 # Template file for 'hotspot'
 pkgname=hotspot
 version=1.3.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext"
 makedepends="qt5-devel qt5-svg-devel kconfigwidgets-devel kcoreaddons-devel

From 4c3629f84dd745d6b402650504546827fca6de99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 08/44] k3b: fix libexecdir location

---
 srcpkgs/k3b/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 3c8c150df561..daf07b6f24c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
 # Template file for 'k3b'
 pkgname=k3b
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
  qt5-host-tools kauth kdoctools kcoreaddons"

From 77c311d4682a2f3de0e7993d0b59b08135468d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 09/44] kactivitymanagerd: fix libexecdir location

---
 srcpkgs/kactivitymanagerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 767c8f5a7042..7b7cd536acef 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,7 +1,7 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"

From 153bb7820016b251633a339bbcec57ed1d8c0924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 10/44] kalarm: fix libexecdir location

---
 srcpkgs/kalarm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 46dd4c15ac29..2b5ed58ffd37 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,7 +1,7 @@
 # Template file for 'kalarm'
 pkgname=kalarm
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig gettext"

From 048d3320241663481c80705b4170770b5b3c59f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 11/44] kauth: fix libexecdir location

---
 srcpkgs/kauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 33549dae70dc..7d7136dc9d02 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,7 +1,7 @@
 # Template file for 'kauth'
 pkgname=kauth
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
  qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From 5529dfdc9be659fa0656354b72b01995d60f480a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 12/44] kcmutils: fix libexecdir location

---
 srcpkgs/kcmutils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 09c63c8f51a4..5873687d49e3 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,7 +1,7 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 hostmakedepends="kcoreaddons extra-cmake-modules

From 7350c3082efa110f15b1bb6706dc135765a07e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 13/44] kcron: fix libexecdir location

---
 srcpkgs/kcron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 0c9741d98267..52264a35b3cd 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,7 +1,7 @@
 # Template file for 'kcron'
 pkgname=kcron
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
  kauth pkg-config qt5-host-tools qt5-qmake"

From a724f85697c3dc4683f5da45903a6853af355662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 14/44] kde-cli-tools: fix libexecdir location

---
 srcpkgs/kde-cli-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index c9fb400bfbfe..eddeb93d78d3 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext pkg-config kcmutils-devel

From 35492b8605920450b468cbf900669fefd0fa4295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 15/44] kde-gtk-config5: fix libexecdir location

---
 srcpkgs/kde-gtk-config5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 62d9c6417e96..9bc414da5175 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,7 +1,7 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools

From ad3ca320f92bedde04e12b868542352264c6bc50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 16/44] kdeconnect: fix libexecdir location

---
 srcpkgs/kdeconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 36c644466ca5..3bdbb3294f77 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,7 +1,7 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-host-tools

From 06b1f641327d1d55a2618b10fcaf225b87fc9b8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 17/44] kdelibs4support: fix libexecdir location

---
 srcpkgs/kdelibs4support/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b5b6e9f3f26e..4a6f9a568542 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,7 +1,7 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From e0b7f483a4090b586abd45dfc571dcb101f351bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 18/44] kdesu: fix libexecdir location

---
 srcpkgs/kdesu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index cb95b31d5b59..a284c59c4b8d 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,7 +1,7 @@
 # Template file for 'kdesu'
 pkgname=kdesu
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"

From 581a319d9abec04f638350b42690e3ab9d10dab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 19/44] khelpcenter: fix libexecdir location

---
 srcpkgs/khelpcenter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 948e23d7ef57..bc5aae822d3d 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,7 +1,7 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons pkg-config gettext"

From ff004f1c6c4d7772a4a760688eefa2ef5b2ab149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 20/44] kinfocenter: fix libexecdir location

---
 srcpkgs/kinfocenter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 28fa4fa63aa7..187e6f5518c4 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,7 +1,7 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake

From db204fe9c979bafb6ac25bacd96f8673af13a8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 21/44] kinit: fix libexecdir location

---
 srcpkgs/kinit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index c97bdb9755c2..b18a62a26bf8 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,7 +1,7 @@
 # Template file for 'kinit'
 pkgname=kinit
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
  gettext qt5-host-tools qt5-qmake kdoctools"

From 68fbcb7388c6430bb9c60556494c32a759b4bc85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 22/44] kio: fix libexecdir location

---
 srcpkgs/kio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 5edab27d77b4..1aecf59e7373 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,7 +1,7 @@
 # Template file for 'kio'
 pkgname=kio
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From b012cf359aad7169ed9ab5370cba95b26864cff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 23/44] kio-extras: fix libexecdir location

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 458d51f49c3f5fb8570fb67fb4c80a4b084780d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 24/44] kitinerary: fix libexecdir location

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index 9f65a32b1ba0..ed9bd13c6fbb 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
 makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel

From 13f3da7e83f64feb9798efefd3103245c4dc7636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 25/44] kpmcore: fix libexecdir location

---
 srcpkgs/kpmcore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template
index b78ba2611391..7398101e0d0c 100644
--- a/srcpkgs/kpmcore/template
+++ b/srcpkgs/kpmcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kpmcore'
 pkgname=kpmcore
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules python3 qt5-devel qt5-qmake pkg-config kcoreaddons

From 2012f1e66916deb9d7f1ed03c4378a3820f2ee7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 26/44] kscreen: fix libexecdir location

---
 srcpkgs/kscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 7a02d650019e..7404db1f5139 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'kscreen'
 pkgname=kscreen
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake

From 8df6fd098217fd121e2b51f38b7c852037579a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 27/44] kscreenlocker: fix libexecdir location

---
 srcpkgs/kscreenlocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 607ef3cb61b7..f443166c7d41 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,7 +1,7 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons-devel

From 30775d91bf35a988c2d45a4a8e40e94270e02a84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 28/44] ktexteditor: fix libexecdir location

---
 srcpkgs/ktexteditor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 72b02a5e31c9..1c9f84d3a6ba 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,7 +1,7 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 06b7034c678fd0622ed9af1553f752f4ab2c3234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 29/44] kwallet-pam: fix libexecdir location

---
 srcpkgs/kwallet-pam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 5399331ef61d..f7d1c333e4eb 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,7 +1,7 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
 makedepends="libgcrypt-devel pam-devel kwallet-devel"

From 35425399bcae7e69b3d771b495af3d91ca72c361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 30/44] kwalletmanager: fix libexecdir location

---
 srcpkgs/kwalletmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 35499d430cde..273af686cb98 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
  qt5-host-tools qt5-qmake"

From 6e872bd65f83992666b0c0085ba1e01cb11b56fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 31/44] kwayland: fix libexecdir location

---
 srcpkgs/kwayland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index bddeb188744b..83c66cf4af20 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,7 +1,7 @@
 # Template file for 'kwayland'
 pkgname=kwayland
 version=5.100.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

From 9360ede68e89d742cd531571f5e57d3c062efc8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 32/44] kwin: fix libexecdir location

---
 srcpkgs/kwin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 73c68f065932..f51b23bdc216 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON

From 79d765e19052974783bc707c3752cf6e48f91d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 33/44] kxmlgui: fix libexecdir location

---
 srcpkgs/kxmlgui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 23789d486484..99a2061150fb 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,7 +1,7 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
  gettext qt5-qmake qt5-host-tools python3"

From 34558fb2e45343aa90ccf4a006dbf82937dd998b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 34/44] libkscreen: fix libexecdir location

---
 srcpkgs/libkscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index ca5c0095eefe..1fe41232cbaa 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel

From 5f855d2fd61692714304c8464709a7b661254a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 35/44] libksysguard: fix libexecdir location

---
 srcpkgs/libksysguard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 111c748ed47f..dc72a24cc355 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,7 +1,7 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
  kpackage"

From 88a5d2efe18f49d1ff29982f4f90462c07838be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 36/44] plasma-desktop: fix libexecdir location

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 8cd18f600b9e..70fa93221088 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,7 +16,7 @@ depends="kmenuedit polkit-kde-agent powerdevil systemsettings
  accountsservice ksystemstats"
 short_desc="KDE Plasma Desktop"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
+license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=6174c23419d425ef1e73c6c81f0536458d685e3ec23cac66d8212d3ef3095cd3

From 71700ab38ddfc447f66342c0e9f5b60736eeb37e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 37/44] plasma-disks: fix libexecdir location

---
 srcpkgs/plasma-disks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index d56d660142da..eac0c1076182 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From fa42430027e56c5bd1264f04d36d42542d2448ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 38/44] plasma-firewall: fix libexecdir location

---
 srcpkgs/plasma-firewall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 23931e2158e4..389866622699 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From 71a530c93ee604efbd27aab446d2c6ce236fe48a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 39/44] plasma-workspace: fix libexecdir location

---
 srcpkgs/plasma-workspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 4585fd283ecb..518fb3a18ab8 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner

From 58b5240d723bf27ce6aa555a6f7c6d1861d2513a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 40/44] polkit-kde-agent: fix libexecdir location

---
 srcpkgs/polkit-kde-agent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 79e3930b8fcd..2a30f95a2732 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools gettext kcoreaddons"

From cd7e9f19ff15b0f10f72fe7cfc7986b9bf385138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 41/44] powerdevil: fix libexecdir location

---
 srcpkgs/powerdevil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 52fb9cf6f7a2..4d3a175a168f 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,7 +1,7 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config kdoctools kauth-devel

From cdbbc9655d093ebdac62049b4e6690ed3a7d83b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 42/44] purpose: fix libexecdir location

---
 srcpkgs/purpose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 2f6c96eb2093..ee6ae961e7f0 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,7 +1,7 @@
 # Template file for 'purpose'
 pkgname=purpose
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
  python3 gettext intltool"

From 760e0aa4a80d9bdb903fc0b97eb7daf1a7d1d441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 43/44] sddm-kcm: fix libexecdir location

---
 srcpkgs/sddm-kcm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index ad544a1be684..378d86e12fdc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake

From a6ee299dd704bf8323921a92f3d4ac3e0ac81e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 44/44] xdg-desktop-portal-kde: fix libexecdir location

---
 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 3710ea1b836e..9bbfb817fe32 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=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons gettext

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] KDE: fix libexecdir
  2022-11-21 10:32 [PR PATCH] KDE: fix libexecdir sgn
  2022-11-21 10:39 ` [PR PATCH] [Updated] " sgn
  2022-11-21 10:51 ` sgn
@ 2022-11-22  2:04 ` sgn
  2022-11-22  2:05 ` [PR PATCH] [Merged]: " sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2022-11-22  2:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1296 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages kde-fix-libexecdir
https://github.com/void-linux/void-packages/pull/40658

KDE: fix libexecdir
<!-- Uncomment relevant sections and delete options which are not applicable -->

Close #40656

[ci skip]
[skip ci]
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40658.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-kde-fix-libexecdir-40658.patch --]
[-- Type: text/x-diff, Size: 39499 bytes --]

From 64952a1fc43ed9c038c2f9de1c986304f3811030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:08:51 +0700
Subject: [PATCH 01/44] extra-cmake-modules: fix libexecdir location

---
 .../patches/libexecdir.patch                  | 39 +++++++++++++++++++
 srcpkgs/extra-cmake-modules/template          |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/extra-cmake-modules/patches/libexecdir.patch

diff --git a/srcpkgs/extra-cmake-modules/patches/libexecdir.patch b/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
new file mode 100644
index 000000000000..92b9edfe443d
--- /dev/null
+++ b/srcpkgs/extra-cmake-modules/patches/libexecdir.patch
@@ -0,0 +1,39 @@
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs5.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs5.cmake
+@@ -43,7 +43,7 @@ deprecated variable name in square brack
+     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian) [``LIB_INSTALL_DIR``]
+ ``LIBEXECDIR``
+     executables for internal use by programs and libraries (``BINDIR`` on
+-    Windows, ``LIBDIR/libexec`` otherwise) [``LIBEXEC_INSTALL_DIR``]
++    Windows, ``EXECROOTDIR/libexec`` otherwise) [``LIBEXEC_INSTALL_DIR``]
+ ``CMAKEPACKAGEDIR``
+     CMake packages, including config files (``LIBDIR/cmake``)
+     [``CMAKECONFIG_INSTALL_PREFIX``]
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirs6.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirs6.cmake
+@@ -46,7 +46,7 @@ where ``<dir>`` is one of (default value
+     ``EXECROOTDIR/lib/<multiarch-tuple`` on Debian)
+ ``LIBEXECDIR``
+     executables for internal use by programs and libraries (``BINDIR`` on
+-    Windows, ``LIBDIR/libexec`` otherwise)
++    Windows, ``EXECROOTDIR/libexec`` otherwise)
+ ``CMAKEPACKAGEDIR``
+     CMake packages, including config files (``LIBDIR/cmake``)
+ ``QTPLUGINDIR``
+Index: extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
+===================================================================
+--- extra-cmake-modules-5.100.0.orig/kde-modules/KDEInstallDirsCommon.cmake
++++ extra-cmake-modules-5.100.0/kde-modules/KDEInstallDirsCommon.cmake
+@@ -248,7 +248,7 @@ if(WIN32)
+         "executables for internal use by programs and libraries"
+         LIBEXEC_INSTALL_DIR)
+ else()
+-    _define_relative(LIBEXECDIR LIBDIR "libexec"
++    _define_relative(LIBEXECDIR EXECROOTDIR "libexec"
+         "executables for internal use by programs and libraries"
+         LIBEXEC_INSTALL_DIR)
+ endif()
diff --git a/srcpkgs/extra-cmake-modules/template b/srcpkgs/extra-cmake-modules/template
index 2476323c63d6..641c29e3e74a 100644
--- a/srcpkgs/extra-cmake-modules/template
+++ b/srcpkgs/extra-cmake-modules/template
@@ -1,7 +1,7 @@
 # Template file for 'extra-cmake-modules'
 pkgname=extra-cmake-modules
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
 hostmakedepends="python3-Sphinx qt5-tools"

From 28e5b6a0463b1e176ed33119fc1fe8dec8659fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:22:51 +0700
Subject: [PATCH 02/44] pkglint: forbid /usr/lib/libexec

---
 common/hooks/pre-pkg/99-pkglint.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a63e37207929..8c643f7deb94 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -29,6 +29,15 @@ hook() {
 		fi
 	done
 
+	if [ -d ${PKGDESTDIR}/usr/lib/libexec ]; then
+		# Add exception for kconfig,
+		# other packages hard-coded path to its files
+		if [ "${pkgname}" != kconfig ]; then
+			msg_red "${pkgver}: /usr/lib/libexec directory is not allowed!\n"
+			error=1
+		fi
+	fi
+
 	for f in "$PKGDESTDIR"/*; do
 		f="${f##*/}"
 		case "$f" in

From d8399125d9aa039e4abeef85e13a749a924efee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:15:11 +0700
Subject: [PATCH 03/44] kconfig: fix libexecdir location

---
 .../add-crossbuild-support-for-its-tools.patch        |  8 ++++----
 srcpkgs/kconfig/template                              | 11 ++++++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
index 83dbe2be9230..081d23ac9a38 100644
--- a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
+++ b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
@@ -14,12 +14,12 @@ of cross-build, since these cmake directive lines are always evalued at *their*
  else()
      include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigCompilerTargets.cmake")
 +    if(CMAKE_CROSSCOMPILING)
-+        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconfig_compiler_kf5)
-+        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconfig_compiler_kf5)
++        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconfig_compiler_kf5)
++        set_target_properties(KF5::kconfig_compiler PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconfig_compiler_kf5)
 +    endif()
 +    if(CMAKE_CROSSCOMPILING)
-+        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/lib/libexec/kf5/kconf_update)
-+        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/lib/libexec/kf5/kconf_update)
++        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION_NONE /usr/libexec/kf5/kconf_update)
++        set_target_properties(KF5::kconf_update PROPERTIES IMPORTED_LOCATION /usr/libexec/kf5/kconf_update)
 +    endif()
  endif()
  include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigMacros.cmake")
diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ddf3d4337773..554c82a1c250 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'kconfig'
 pkgname=kconfig
 version=5.100.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
 makedepends="qt5-devel qt5-tools-devel qt5-declarative-devel"
@@ -18,6 +18,15 @@ do_check() {
 	ctest -E 'kconfigcore-kconfigtest'
 }
 
+post_install() {
+	# Backward compatible symlink
+	vmkdir usr/lib/libexec/kf5
+	ln -s ../../../libexec/kf5/kconf_update \
+		${DESTDIR}/usr/lib/libexec/kf5
+	ln -s ../../../libexec/kf5/kconfig_compiler_kf5 \
+		${DESTDIR}/usr/lib/libexec/kf5
+}
+
 kconfig-devel_package() {
 	short_desc+=" - development"
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From c17ee1fa11827a801ab998715605899f79a1ee38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:57 +0700
Subject: [PATCH 04/44] baloo5: fix libexecdir location

---
 srcpkgs/baloo5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 099f872a6b7b..690adf4694b8 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,7 +1,7 @@
 # Template file for 'baloo5'
 pkgname=baloo5
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 443ace454bc4f018ad88b3fb4b087cd72bc0769a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:57 +0700
Subject: [PATCH 05/44] corectrl: fix libexecdir location

---
 srcpkgs/corectrl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index f2f69afbe30d..b85385804faa 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,7 +1,7 @@
 # Template file for 'corectrl'
 pkgname=corectrl
 version=1.2.3
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake

From 9154f35e0041c6b4c75967b5e66009d1fa1df6f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 06/44] frameworkintegration: fix libexecdir location

---
 srcpkgs/frameworkintegration/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 30cb2df51f15..7bf125cbaf57 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,7 +1,7 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
  kpackage qt5-host-tools qt5-qmake python3 gettext"

From cc3643b05a89c669766a01ab53e8d8e509a3ff55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 07/44] hotspot: fix libexecdir location

---
 srcpkgs/hotspot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hotspot/template b/srcpkgs/hotspot/template
index e11168c91587..30ce05103fab 100644
--- a/srcpkgs/hotspot/template
+++ b/srcpkgs/hotspot/template
@@ -1,7 +1,7 @@
 # Template file for 'hotspot'
 pkgname=hotspot
 version=1.3.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext"
 makedepends="qt5-devel qt5-svg-devel kconfigwidgets-devel kcoreaddons-devel

From 48e4af98e0e9a991c7b5739e01c1936fc6eae2d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 08/44] k3b: fix libexecdir location

---
 srcpkgs/k3b/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 3c8c150df561..daf07b6f24c6 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,7 +1,7 @@
 # Template file for 'k3b'
 pkgname=k3b
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
  qt5-host-tools kauth kdoctools kcoreaddons"

From 6ef06c569c097be8f03d00d99a402820061b005a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 09/44] kactivitymanagerd: fix libexecdir location

---
 srcpkgs/kactivitymanagerd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 767c8f5a7042..7b7cd536acef 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,7 +1,7 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 configure_args="-DBUILD_TESTING=OFF"

From 7954ff0bc23d386080a222adb589e9aa16aef588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:58 +0700
Subject: [PATCH 10/44] kalarm: fix libexecdir location

---
 srcpkgs/kalarm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 46dd4c15ac29..2b5ed58ffd37 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,7 +1,7 @@
 # Template file for 'kalarm'
 pkgname=kalarm
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig gettext"

From bc6f6c5384e529f7ee82745920c754d5e6800051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 11/44] kauth: fix libexecdir location

---
 srcpkgs/kauth/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 33549dae70dc..7d7136dc9d02 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,7 +1,7 @@
 # Template file for 'kauth'
 pkgname=kauth
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
  qt5-host-tools qt5-qmake qt5-tools-devel polkit-qt5-devel"

From 7e46ffe2d8795d237ce7ee97faa82de305785c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 12/44] kcmutils: fix libexecdir location

---
 srcpkgs/kcmutils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 09c63c8f51a4..5873687d49e3 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,7 +1,7 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 hostmakedepends="kcoreaddons extra-cmake-modules

From f472267a75c36e94c5d4d5d0b8f06da71f5696f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 13/44] kcron: fix libexecdir location

---
 srcpkgs/kcron/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 0c9741d98267..52264a35b3cd 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,7 +1,7 @@
 # Template file for 'kcron'
 pkgname=kcron
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
  kauth pkg-config qt5-host-tools qt5-qmake"

From 7468747d5b12ce46c8ae9c3124d81ec14062498c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:26:59 +0700
Subject: [PATCH 14/44] kde-cli-tools: fix libexecdir location

---
 srcpkgs/kde-cli-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde-cli-tools/template b/srcpkgs/kde-cli-tools/template
index c9fb400bfbfe..eddeb93d78d3 100644
--- a/srcpkgs/kde-cli-tools/template
+++ b/srcpkgs/kde-cli-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'kde-cli-tools'
 pkgname=kde-cli-tools
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext pkg-config kcmutils-devel

From 029109e4456f6420214dbb52b5d37823ba8f32f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 15/44] kde-gtk-config5: fix libexecdir location

---
 srcpkgs/kde-gtk-config5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kde-gtk-config5/template b/srcpkgs/kde-gtk-config5/template
index 62d9c6417e96..9bc414da5175 100644
--- a/srcpkgs/kde-gtk-config5/template
+++ b/srcpkgs/kde-gtk-config5/template
@@ -1,7 +1,7 @@
 # Template file for 'kde-gtk-config5'
 pkgname=kde-gtk-config5
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools

From a250afb8cb7d4590b2b24fe37a330ea8c115d9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 16/44] kdeconnect: fix libexecdir location

---
 srcpkgs/kdeconnect/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index 36c644466ca5..3bdbb3294f77 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,7 +1,7 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-host-tools

From 382c708cda6eb4cf1529eed878c4917ca9581837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 17/44] kdelibs4support: fix libexecdir location

---
 srcpkgs/kdelibs4support/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index b5b6e9f3f26e..4a6f9a568542 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,7 +1,7 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From cfe035e838508a6e381a719275cdf724785c37c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 18/44] kdesu: fix libexecdir location

---
 srcpkgs/kdesu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index cb95b31d5b59..a284c59c4b8d 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,7 +1,7 @@
 # Template file for 'kdesu'
 pkgname=kdesu
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  qt5-host-tools qt5-qmake python3"

From 28ecbfc22dfab3c894e1feeae857714b41e82251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 19/44] khelpcenter: fix libexecdir location

---
 srcpkgs/khelpcenter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 948e23d7ef57..bc5aae822d3d 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,7 +1,7 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules kcoreaddons pkg-config gettext"

From 211399aceb2cf3118d5e686282dfc193ab43d9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:00 +0700
Subject: [PATCH 20/44] kinfocenter: fix libexecdir location

---
 srcpkgs/kinfocenter/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 28fa4fa63aa7..187e6f5518c4 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,7 +1,7 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules gettext pkg-config qt5-host-tools qt5-qmake

From 7f2e8f65333975c1e539436b78ae38a062ac131a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 21/44] kinit: fix libexecdir location

---
 srcpkgs/kinit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index c97bdb9755c2..b18a62a26bf8 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,7 +1,7 @@
 # Template file for 'kinit'
 pkgname=kinit
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
  gettext qt5-host-tools qt5-qmake kdoctools"

From 9c72f435ccc43579023e529d194c1b8489b778ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 22/44] kio: fix libexecdir location

---
 srcpkgs/kio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 5edab27d77b4..1aecf59e7373 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,7 +1,7 @@
 # Template file for 'kio'
 pkgname=kio
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 913f7b606d0fbc531ad22dab095b6c7e73b51a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 23/44] kio-extras: fix libexecdir location

---
 srcpkgs/kio-extras/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index e2e4b28fb37f..d14b22c4cc00 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,7 +1,7 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
 hostmakedepends="extra-cmake-modules pkg-config gperf qt5-qmake qt5-host-tools

From 58430c77b1302afdba846269c081116649c1d658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 24/44] kitinerary: fix libexecdir location

---
 srcpkgs/kitinerary/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index 9f65a32b1ba0..ed9bd13c6fbb 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,7 +1,7 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
 version=22.08.2
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
 makedepends="kcalendarcore-devel kcontacts-devel kdeclarative-devel kmime-devel

From 23491c59ee8e64cc5d7811ff6bdf376681daf724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:01 +0700
Subject: [PATCH 25/44] kpmcore: fix libexecdir location

---
 srcpkgs/kpmcore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template
index b78ba2611391..7398101e0d0c 100644
--- a/srcpkgs/kpmcore/template
+++ b/srcpkgs/kpmcore/template
@@ -1,7 +1,7 @@
 # Template file for 'kpmcore'
 pkgname=kpmcore
 version=22.04.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules python3 qt5-devel qt5-qmake pkg-config kcoreaddons

From 4e600ed15f23043c50912b35adbdf59e4bd3f279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 26/44] kscreen: fix libexecdir location

---
 srcpkgs/kscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 7a02d650019e..7404db1f5139 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'kscreen'
 pkgname=kscreen
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-devel qt5-qmake

From ccb6475b19c7a24352f66d6854c1af04fc6cf059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 27/44] kscreenlocker: fix libexecdir location

---
 srcpkgs/kscreenlocker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 607ef3cb61b7..f443166c7d41 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,7 +1,7 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config kcoreaddons-devel

From ef47664acf498c7333cfb176af91f9093d5247ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 28/44] ktexteditor: fix libexecdir location

---
 srcpkgs/ktexteditor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 72b02a5e31c9..1c9f84d3a6ba 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,7 +1,7 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From fe94c17f18fe71b82e7c0b87e48c1cc9bc58028c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 29/44] kwallet-pam: fix libexecdir location

---
 srcpkgs/kwallet-pam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwallet-pam/template b/srcpkgs/kwallet-pam/template
index 5399331ef61d..f7d1c333e4eb 100644
--- a/srcpkgs/kwallet-pam/template
+++ b/srcpkgs/kwallet-pam/template
@@ -1,7 +1,7 @@
 # Template file for 'kwallet-pam'
 pkgname=kwallet-pam
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules"
 makedepends="libgcrypt-devel pam-devel kwallet-devel"

From 0b039a7335e2d49724528eca7992cf6b0579cbd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:02 +0700
Subject: [PATCH 30/44] kwalletmanager: fix libexecdir location

---
 srcpkgs/kwalletmanager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 35499d430cde..273af686cb98 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
 version=22.04.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
  qt5-host-tools qt5-qmake"

From 285886e859fd35a10bea2d4629a2fdcc14f10076 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 31/44] kwayland: fix libexecdir location

---
 srcpkgs/kwayland/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index bddeb188744b..83c66cf4af20 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,7 +1,7 @@
 # Template file for 'kwayland'
 pkgname=kwayland
 version=5.100.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

From 192109aa73a9ed45ca9c87dea25c8cc7ee70a5f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 32/44] kwin: fix libexecdir location

---
 srcpkgs/kwin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 73c68f065932..f51b23bdc216 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,7 +1,7 @@
 # Template file for 'kwin'
 pkgname=kwin
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 build_helper=qemu
 configure_args="-DBUILD_TESTING=OFF -DFORCE_CROSSCOMPILED_TOOLS=ON

From 0d11dcc2b0ca246046f80d20d71c0527799496d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 33/44] kxmlgui: fix libexecdir location

---
 srcpkgs/kxmlgui/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 23789d486484..99a2061150fb 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,7 +1,7 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
  gettext qt5-qmake qt5-host-tools python3"

From 2bf286d13a85e53e4be2f293c309b87597fc8199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 34/44] libkscreen: fix libexecdir location

---
 srcpkgs/libkscreen/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index ca5c0095eefe..1fe41232cbaa 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,7 +1,7 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel

From 108b69df80e3619b5840f147ab92af07c3749b60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 35/44] libksysguard: fix libexecdir location

---
 srcpkgs/libksysguard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 111c748ed47f..dc72a24cc355 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,7 +1,7 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
  kpackage"

From d83bf7d5b6934c2e3cb731e57cd486065960787e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:03 +0700
Subject: [PATCH 36/44] plasma-desktop: fix libexecdir location

---
 srcpkgs/plasma-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template
index 8cd18f600b9e..70fa93221088 100644
--- a/srcpkgs/plasma-desktop/template
+++ b/srcpkgs/plasma-desktop/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-desktop'
 pkgname=plasma-desktop
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DKF5_HOST_TOOLING=/usr/lib/cmake"
@@ -16,7 +16,7 @@ depends="kmenuedit polkit-kde-agent powerdevil systemsettings
  accountsservice ksystemstats"
 short_desc="KDE Plasma Desktop"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2"
+license="GPL-2.0-or-later, LGPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://invent.kde.org/plasma/plasma-desktop"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=6174c23419d425ef1e73c6c81f0536458d685e3ec23cac66d8212d3ef3095cd3

From e98fb793d4df3101f452372a760b29ea712f017a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 37/44] plasma-disks: fix libexecdir location

---
 srcpkgs/plasma-disks/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-disks/template b/srcpkgs/plasma-disks/template
index d56d660142da..eac0c1076182 100644
--- a/srcpkgs/plasma-disks/template
+++ b/srcpkgs/plasma-disks/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-disks'
 pkgname=plasma-disks
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From d582a0f142ead5b1260043b4e0b4009aef5b9435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 38/44] plasma-firewall: fix libexecdir location

---
 srcpkgs/plasma-firewall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-firewall/template b/srcpkgs/plasma-firewall/template
index 23931e2158e4..389866622699 100644
--- a/srcpkgs/plasma-firewall/template
+++ b/srcpkgs/plasma-firewall/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-firewall'
 pkgname=plasma-firewall
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools

From 60d617976b530e57d8ae2fdd0a69c05550903ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 39/44] plasma-workspace: fix libexecdir location

---
 srcpkgs/plasma-workspace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index 4585fd283ecb..518fb3a18ab8 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,7 +1,7 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner

From d77f6adad18ddd5316ecb36461b6fabfe44076b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 40/44] polkit-kde-agent: fix libexecdir location

---
 srcpkgs/polkit-kde-agent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template
index 79e3930b8fcd..2a30f95a2732 100644
--- a/srcpkgs/polkit-kde-agent/template
+++ b/srcpkgs/polkit-kde-agent/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit-kde-agent'
 pkgname=polkit-kde-agent
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools gettext kcoreaddons"

From bc48cec1f70b11a305fd6f32b03002b90c7fef97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:04 +0700
Subject: [PATCH 41/44] powerdevil: fix libexecdir location

---
 srcpkgs/powerdevil/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 52fb9cf6f7a2..4d3a175a168f 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,7 +1,7 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config kdoctools kauth-devel

From e35205e5c3c6035fd855a068a06ef3916d4ddff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 42/44] purpose: fix libexecdir location

---
 srcpkgs/purpose/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 2f6c96eb2093..ee6ae961e7f0 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,7 +1,7 @@
 # Template file for 'purpose'
 pkgname=purpose
 version=5.100.0
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
  python3 gettext intltool"

From 2be3cf501279b1f27599007d817226298ce20bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 43/44] sddm-kcm: fix libexecdir location

---
 srcpkgs/sddm-kcm/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sddm-kcm/template b/srcpkgs/sddm-kcm/template
index ad544a1be684..378d86e12fdc 100644
--- a/srcpkgs/sddm-kcm/template
+++ b/srcpkgs/sddm-kcm/template
@@ -1,7 +1,7 @@
 # Template file for 'sddm-kcm'
 pkgname=sddm-kcm
 version=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKF5_HOST_TOOLING=/usr/lib/cmake"
 hostmakedepends="extra-cmake-modules pkg-config qt5-devel qt5-qmake

From f2a5fc896b0f8f5c1627c40b624156aa877bb1d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 21 Nov 2022 17:27:05 +0700
Subject: [PATCH 44/44] xdg-desktop-portal-kde: fix libexecdir location

---
 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 3710ea1b836e..9bbfb817fe32 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=5.26.3
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons gettext

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: KDE: fix libexecdir
  2022-11-21 10:32 [PR PATCH] KDE: fix libexecdir sgn
                   ` (2 preceding siblings ...)
  2022-11-22  2:04 ` sgn
@ 2022-11-22  2:05 ` sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2022-11-22  2:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1137 bytes --]

There's a merged pull request on the void-packages repository

KDE: fix libexecdir
https://github.com/void-linux/void-packages/pull/40658

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

Close #40656

[ci skip]
[skip ci]
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-11-22  2:05 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-21 10:32 [PR PATCH] KDE: fix libexecdir sgn
2022-11-21 10:39 ` [PR PATCH] [Updated] " sgn
2022-11-21 10:51 ` sgn
2022-11-22  2:04 ` sgn
2022-11-22  2:05 ` [PR PATCH] [Merged]: " sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).