From 88a30a7f0e54a4ac39f6ff78e5407ba175ac3813 Mon Sep 17 00:00:00 2001 From: Đoàn Trần Công Danh <congdanhqx@gmail.com> Date: Mon, 21 Nov 2022 17:08:51 +0700 Subject: extra-cmake-modules: fix libexecdir location --- .../extra-cmake-modules/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 00000000000..92b9edfe443 --- /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 2476323c63d..641c29e3e74 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" -- cgit v1.2.3