[arch-commits] Commit in extra-cmake-modules/repos (4 files)

[Antonio Rojas]

    Date: Saturday, March 11, 2017 @ 11:31:22
  Author: arojas
Revision: 290544

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 290543, extra-cmake-modules/trunk/ECM-no-init.py.patch)
  extra-cmake-modules/repos/testing-any/PKGBUILD
    (from rev 290543, extra-cmake-modules/trunk/PKGBUILD)
  extra-cmake-modules/repos/testing-any/fix-python-bindings-generation.patch
    (from rev 290543, extra-cmake-modules/trunk/fix-python-bindings-generation.patch)

--------------------------------------+
 ECM-no-init.py.patch                 |   10 +++++++
 PKGBUILD                             |   47 +++++++++++++++++++++++++++++++++
 fix-python-bindings-generation.patch |   21 ++++++++++++++
 3 files changed, 78 insertions(+)

Copied: extra-cmake-modules/repos/testing-any/ECM-no-init.py.patch (from rev 290543, 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	2017-03-11 11:31:22 UTC (rev 290544)
@@ -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 290543, extra-cmake-modules/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2017-03-11 11:31:22 UTC (rev 290544)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=extra-cmake-modules
+pkgver=5.32.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 for QtHelp pages
+source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+        fix-python-bindings-generation.patch ECM-no-init.py.patch)
+sha256sums=('b1d87be86f36c20ec1f4ad7946f702fd1a7cab0e2ea2e81f4f9a2d937f9f0ac7'
+            'SKIP'
+            '51cc99dad7c60c8f3f4ffddfd75d781d00e4ac83638a6daf914bc9a3fd8a1502'
+            '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52')
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at 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, depend on python-pykf5 instead
+  patch -p1 -i ../ECM-no-init.py.patch
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_HTML_DOCS=OFF \
+    -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 290543, 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	2017-03-11 11:31:22 UTC (rev 290544)
@@ -0,0 +1,21 @@
+--- 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)
+@@ -251,7 +251,7 @@
+ set(GPB_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR})
+ 
+ function(_compute_implicit_include_dirs)
+-  find_program(_GBP_CLANG_CXX_DRIVER_PATH clang++-${_GPB_CLANG_SUFFIX})
++  find_program(_GBP_CLANG_CXX_DRIVER_PATH clang++)
+   if (NOT _GBP_CLANG_CXX_DRIVER_PATH)
+     message(FATAL_ERROR "Failed to find clang driver corresponding to ${libclang_LIBRARY}")
+   endif()
+