[arch-commits] Commit in extra-cmake-modules/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Sat Feb 11 10:01:44 UTC 2017
Date: Saturday, February 11, 2017 @ 10:01:44
Author: arojas
Revision: 288571
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 288570, extra-cmake-modules/trunk/ECM-no-init.py.patch)
extra-cmake-modules/repos/testing-any/PKGBUILD
(from rev 288570, extra-cmake-modules/trunk/PKGBUILD)
extra-cmake-modules/repos/testing-any/fix-python-bindings-generation.patch
(from rev 288570, extra-cmake-modules/trunk/fix-python-bindings-generation.patch)
--------------------------------------+
ECM-no-init.py.patch | 10 ++++++
PKGBUILD | 51 +++++++++++++++++++++++++++++++++
fix-python-bindings-generation.patch | 21 +++++++++++++
3 files changed, 82 insertions(+)
Copied: extra-cmake-modules/repos/testing-any/ECM-no-init.py.patch (from rev 288570, 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-02-11 10:01:44 UTC (rev 288571)
@@ -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 288570, extra-cmake-modules/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD (rev 0)
+++ testing-any/PKGBUILD 2017-02-11 10:01:44 UTC (rev 288571)
@@ -0,0 +1,51 @@
+# $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.31.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=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+ fix-python-bindings-generation.patch ECM-no-init.py.patch
+ 2e20aeab.patch::"https://cgit.kde.org/extra-cmake-modules.git/patch/?id=2e20aeab")
+md5sums=('74d7c29138168f9a62fe475705c0b351'
+ 'SKIP'
+ '4e53103b3e132613dd2e2ae9cf4c7c8b'
+ 'fe4ad511edb544434e7afaeba12dd460'
+ 'e5b690bd3530d310a91ae7c7f19dc61a')
+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
+# Revert commit that breaks kcoreaddons python bindings build
+ patch -Rp1 -i ../2e20aeab.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 288570, 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-02-11 10:01:44 UTC (rev 288571)
@@ -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()
+
More information about the arch-commits
mailing list