void-linux · sgn · Nov 22, 2022 · Nov 21, 2022 · Nov 21, 2022 · Nov 21, 2022
diff --git 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

diff --git 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"

diff --git 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

diff --git a/srcpkgs/extra-cmake-modules/patches/libexecdir.patch 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
@@ -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"

diff --git 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"

diff --git 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

diff --git 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"

diff --git 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"

diff --git 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"

diff --git 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"

diff --git 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

diff --git 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
@@ -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}"

diff --git 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"

diff --git 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

diff --git 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

diff --git 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

diff --git 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"

diff --git 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"

diff --git 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"

diff --git 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

diff --git 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"

diff --git 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

diff --git 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"

diff --git 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

diff --git 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

diff --git 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

diff --git 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

diff --git 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"

diff --git 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"

diff --git 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"

diff --git 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

diff --git 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

diff --git 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"

diff --git 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

diff --git 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"