Date: Saturday, July 14, 2018 @ 08:59:03 Author: arojas Revision: 328575
archrelease: copy trunk to testing-any Added: extra-cmake-modules/repos/testing-any/ extra-cmake-modules/repos/testing-any/ECM-no-init.py.patch (from rev 328574, extra-cmake-modules/trunk/ECM-no-init.py.patch) extra-cmake-modules/repos/testing-any/PKGBUILD (from rev 328574, extra-cmake-modules/trunk/PKGBUILD) extra-cmake-modules/repos/testing-any/fix-python-bindings-generation.patch (from rev 328574, extra-cmake-modules/trunk/fix-python-bindings-generation.patch) --------------------------------------+ ECM-no-init.py.patch | 10 ++++++ PKGBUILD | 51 +++++++++++++++++++++++++++++++++ fix-python-bindings-generation.patch | 12 +++++++ 3 files changed, 73 insertions(+) Copied: extra-cmake-modules/repos/testing-any/ECM-no-init.py.patch (from rev 328574, extra-cmake-modules/trunk/ECM-no-init.py.patch) =================================================================== --- testing-any/ECM-no-init.py.patch (rev 0) +++ testing-any/ECM-no-init.py.patch 2018-07-14 08:59:03 UTC (rev 328575) @@ -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}") Copied: extra-cmake-modules/repos/testing-any/PKGBUILD (from rev 328574, extra-cmake-modules/trunk/PKGBUILD) =================================================================== --- testing-any/PKGBUILD (rev 0) +++ testing-any/PKGBUILD 2018-07-14 08:59:03 UTC (rev 328575) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Andrea Scarpino <and...@archlinux.org> + +pkgname=extra-cmake-modules +pkgver=5.48.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} + fix-python-bindings-generation.patch ECM-no-init.py.patch ecm-python3.patch) +sha256sums=('fc5b7a9dedb4f6a91db17482578c33f1ec55f11791c592ee431f6d9898ede598' + 'SKIP' + 'af9238c6d1c3b4ebbefab0500c21364805f620a3e408792e2a5eaad3c6dfcc49' + '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52' + 'eae8d9f49209ee333c891b319a990670c16e151e049ded1741be32a7ca0e32ed') +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 +# Fix Ubuntu-specific code https://bugs.kde.org/show_bug.cgi?id=372311 + patch -p1 -i ../fix-python-bindings-generation.patch +# Don't create __init__.py + patch -p1 -i ../ECM-no-init.py.patch +# Port python binding generation scripts to python3 + patch -p1 -i ../ecm-python3.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/testing-any/fix-python-bindings-generation.patch (from rev 328574, extra-cmake-modules/trunk/fix-python-bindings-generation.patch) =================================================================== --- testing-any/fix-python-bindings-generation.patch (rev 0) +++ testing-any/fix-python-bindings-generation.patch 2018-07-14 08:59:03 UTC (rev 328575) @@ -0,0 +1,12 @@ +--- extra-cmake-modules-5.29.0/find-modules/FindPythonModuleGeneration.cmake.0 2017-01-06 09:25:44.345565087 +0000 ++++ extra-cmake-modules-5.29.0/find-modules/FindPythonModuleGeneration.cmake 2017-01-06 09:29:03.881879316 +0000 +@@ -192,7 +192,7 @@ + while(NOT libclang_LIBRARY AND NOT _LIBCLANG_FIND_VERSION EQUAL _LIBCLANG_MIN_MAJOR_VERSION) + math(EXPR _LIBCLANG_FIND_VERSION "${_LIBCLANG_FIND_VERSION} - 1") + set(_GPB_CLANG_SUFFIX ${_LIBCLANG_FIND_VERSION}.0) +- find_library(libclang_LIBRARY clang-${_LIBCLANG_FIND_VERSION}.0) ++ find_library(libclang_LIBRARY NAMES clang-${_LIBCLANG_FIND_VERSION}.0 clang) + endwhile() + + if (NOT libclang_LIBRARY) +