Date: Tuesday, August 27, 2019 @ 18:19:41 Author: arojas Revision: 361285
archrelease: copy trunk to extra-any Added: extra-cmake-modules/repos/extra-any/ECM-no-init.py.patch (from rev 361284, extra-cmake-modules/trunk/ECM-no-init.py.patch) extra-cmake-modules/repos/extra-any/PKGBUILD (from rev 361284, extra-cmake-modules/trunk/PKGBUILD) extra-cmake-modules/repos/extra-any/libdir.patch (from rev 361284, extra-cmake-modules/trunk/libdir.patch) Deleted: extra-cmake-modules/repos/extra-any/ECM-no-init.py.patch extra-cmake-modules/repos/extra-any/PKGBUILD ----------------------+ ECM-no-init.py.patch | 20 +++++----- PKGBUILD | 91 +++++++++++++++++++++++++------------------------ libdir.patch | 12 ++++++ 3 files changed, 69 insertions(+), 54 deletions(-) Deleted: ECM-no-init.py.patch =================================================================== --- ECM-no-init.py.patch 2019-08-27 18:19:15 UTC (rev 361284) +++ ECM-no-init.py.patch 2019-08-27 18:19:41 UTC (rev 361285) @@ -1,10 +0,0 @@ -diff --git a/find-modules/GeneratePythonBindingUmbrellaModule.cmake b/find-modules/GeneratePythonBindingUmbrellaModule.cmake -index de79393..144fab4 100644 ---- a/find-modules/GeneratePythonBindingUmbrellaModule.cmake -+++ b/find-modules/GeneratePythonBindingUmbrellaModule.cmake -@@ -4,4 +4,4 @@ get_filename_component(PYTHON_UMBRELLA_MODULE_DIR ${PYTHON_UMBRELLA_MODULE_FILE} - - file(MAKE_DIRECTORY "${PYTHON_UMBRELLA_MODULE_DIR}") - --execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${PYTHON_UMBRELLA_MODULE_FILE}") -+#execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${PYTHON_UMBRELLA_MODULE_FILE}") Copied: extra-cmake-modules/repos/extra-any/ECM-no-init.py.patch (from rev 361284, extra-cmake-modules/trunk/ECM-no-init.py.patch) =================================================================== --- ECM-no-init.py.patch (rev 0) +++ ECM-no-init.py.patch 2019-08-27 18:19:41 UTC (rev 361285) @@ -0,0 +1,10 @@ +diff --git a/find-modules/GeneratePythonBindingUmbrellaModule.cmake b/find-modules/GeneratePythonBindingUmbrellaModule.cmake +index de79393..144fab4 100644 +--- a/find-modules/GeneratePythonBindingUmbrellaModule.cmake ++++ b/find-modules/GeneratePythonBindingUmbrellaModule.cmake +@@ -4,4 +4,4 @@ get_filename_component(PYTHON_UMBRELLA_MODULE_DIR ${PYTHON_UMBRELLA_MODULE_FILE} + + file(MAKE_DIRECTORY "${PYTHON_UMBRELLA_MODULE_DIR}") + +-execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${PYTHON_UMBRELLA_MODULE_FILE}") ++#execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${PYTHON_UMBRELLA_MODULE_FILE}") Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-08-27 18:19:15 UTC (rev 361284) +++ PKGBUILD 2019-08-27 18:19:41 UTC (rev 361285) @@ -1,44 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Andrea Scarpino <and...@archlinux.org> - -pkgname=extra-cmake-modules -pkgver=5.61.0 -pkgrel=1 -pkgdesc='Extra modules and scripts for CMake' -arch=(any) -url='https://community.kde.org/Frameworks' -license=(LGPL) -depends=(cmake) -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) -sha256sums=('a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c' - 'SKIP' - '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52') -validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <fa...@kde.org> - -prepare() { - mkdir -p build - - cd $pkgname-$pkgver - 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 -} - -build() { - cd build - cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_HTML_DOCS=OFF \ - -DBUILD_QTHELP_DOCS=ON \ - -DBUILD_TESTING=OFF - make -} - -package() { - cd build - make DESTDIR="$pkgdir" install -} Copied: extra-cmake-modules/repos/extra-any/PKGBUILD (from rev 361284, extra-cmake-modules/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-08-27 18:19:41 UTC (rev 361285) @@ -0,0 +1,47 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=extra-cmake-modules +pkgver=5.61.0 +pkgrel=2 +pkgdesc='Extra modules and scripts for CMake' +arch=(any) +url='https://community.kde.org/Frameworks' +license=(LGPL) +depends=(cmake) +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 + libdir.patch) +sha256sums=('a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c' + 'SKIP' + '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52' + '2b8c0532497c906ef64886d6751c4a52d06713962736bc455460b6974d5659d9') +validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <fa...@kde.org> + +prepare() { + mkdir -p build + + cd $pkgname-$pkgver + 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() { + cd build + cmake ../$pkgname-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_HTML_DOCS=OFF \ + -DBUILD_QTHELP_DOCS=ON \ + -DBUILD_TESTING=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} Copied: extra-cmake-modules/repos/extra-any/libdir.patch (from rev 361284, extra-cmake-modules/trunk/libdir.patch) =================================================================== --- libdir.patch (rev 0) +++ libdir.patch 2019-08-27 18:19:41 UTC (rev 361285) @@ -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)