Date: Tuesday, August 27, 2019 @ 18:19:15 Author: arojas Revision: 361284
Use lib as LIBDIR by default Added: extra-cmake-modules/trunk/libdir.patch Modified: extra-cmake-modules/trunk/PKGBUILD --------------+ PKGBUILD | 9 ++++++--- libdir.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-08-27 18:00:36 UTC (rev 361283) +++ PKGBUILD 2019-08-27 18:19:15 UTC (rev 361284) @@ -4,7 +4,7 @@ pkgname=extra-cmake-modules pkgver=5.61.0 -pkgrel=1 +pkgrel=2 pkgdesc='Extra modules and scripts for CMake' arch=(any) url='https://community.kde.org/Frameworks' @@ -13,10 +13,12 @@ makedepends=(python-sphinx python-requests qt5-tools) groups=(kf5) source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz"{,.sig} - ECM-no-init.py.patch) + ECM-no-init.py.patch + libdir.patch) sha256sums=('a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c' 'SKIP' - '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52') + '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52' + '2b8c0532497c906ef64886d6751c4a52d06713962736bc455460b6974d5659d9') validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <fa...@kde.org> prepare() { @@ -26,6 +28,7 @@ sed -e 's|/usr/bin/env python|/usr/bin/env python2|' -i find-modules/*.py # Don't create __init__.py patch -p1 -i ../ECM-no-init.py.patch + patch -p1 -i ../libdir.patch # Use lib as LIBDIR by default } build() { Added: libdir.patch =================================================================== --- libdir.patch (rev 0) +++ libdir.patch 2019-08-27 18:19:15 UTC (rev 361284) @@ -0,0 +1,12 @@ +diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake +index 2003223..0acd33f 100644 +--- a/kde-modules/KDEInstallDirs.cmake ++++ b/kde-modules/KDEInstallDirs.cmake +@@ -245,6 +245,7 @@ set(_LIBDIR_DEFAULT "lib") + # See https://wiki.debian.org/Multiarch + if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU") + AND NOT CMAKE_CROSSCOMPILING ++ AND NOT EXISTS "/etc/arch-release" + AND NOT DEFINED ENV{FLATPAK_ID}) + if (EXISTS "/etc/debian_version") # is this a debian system ? + if(CMAKE_LIBRARY_ARCHITECTURE)