[arch-commits] Commit in extra-cmake-modules/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Sat Jan 14 11:59:41 UTC 2017
Date: Saturday, January 14, 2017 @ 11:59:40
Author: arojas
Revision: 286278
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 286277, extra-cmake-modules/trunk/ECM-no-init.py.patch)
extra-cmake-modules/repos/testing-any/PKGBUILD
(from rev 286277, extra-cmake-modules/trunk/PKGBUILD)
extra-cmake-modules/repos/testing-any/fix-python-bindings-generation.patch
(from rev 286277, extra-cmake-modules/trunk/fix-python-bindings-generation.patch)
--------------------------------------+
ECM-no-init.py.patch | 11 +++++++
PKGBUILD | 51 +++++++++++++++++++++++++++++++++
fix-python-bindings-generation.patch | 20 ++++++++++++
3 files changed, 82 insertions(+)
Copied: extra-cmake-modules/repos/testing-any/ECM-no-init.py.patch (from rev 286277, 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-01-14 11:59:40 UTC (rev 286278)
@@ -0,0 +1,11 @@
+--- extra-cmake-modules-5.30.0/find-modules/FindPythonModuleGeneration.cmake.0 2017-01-11 21:36:42.219762963 +0000
++++ extra-cmake-modules-5.30.0/find-modules/FindPythonModuleGeneration.cmake 2017-01-11 21:37:48.932898438 +0000
+@@ -409,7 +409,6 @@
+ foreach(pyversion ${_pyversions})
+ file(MAKE_DIRECTORY
+ "${CMAKE_CURRENT_BINARY_DIR}/py${pyversion}/${pythonnamespace_value}")
+- execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${CMAKE_CURRENT_BINARY_DIR}/py${pyversion}/${pythonnamespace_value}/__init__.py")
+
+ add_library(Py${pyversion}KF5${modulename_value} MODULE
+ "${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}/unified${modulename_value}.cpp"
+
Copied: extra-cmake-modules/repos/testing-any/PKGBUILD (from rev 286277, extra-cmake-modules/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD (rev 0)
+++ testing-any/PKGBUILD 2017-01-14 11:59:40 UTC (rev 286278)
@@ -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.30.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
+ python-bindings-c++14.patch::"https://cgit.kde.org/extra-cmake-modules.git/patch/?id=8aa68434")
+md5sums=('3678f6f17ff10ba5022fc1800028538f'
+ 'SKIP'
+ '5a704fb81d356a678d2affd403d8f468'
+ '63582bd0c967a2315736da7c2cb48d81'
+ 'a898dc73e16a0f60bdf339a2a9aaf0cf')
+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=372333 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
+# Pass -std=gnu++14 flags to clang for Python bindings generation https://bugs.kde.org/show_bug.cgi?id=374801
+ patch -p1 -i ../python-bindings-c++14.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 286277, 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-01-14 11:59:40 UTC (rev 286278)
@@ -0,0 +1,20 @@
+--- 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 _LIBCLANG3_FIND_VERSION EQUAL _LIBCLANG3_MIN_VERSION)
+ math(EXPR _LIBCLANG3_FIND_VERSION "${_LIBCLANG3_FIND_VERSION} - 1")
+ set(_GPB_CLANG_SUFFIX 3.${_LIBCLANG3_FIND_VERSION})
+- find_library(libclang_LIBRARY clang-3.${_LIBCLANG3_FIND_VERSION})
++ find_library(libclang_LIBRARY NAMES clang-3.${_LIBCLANG3_FIND_VERSION} clang)
+ endwhile()
+ endif()
+
+@@ -428,7 +428,7 @@
+ add_test(NAME Py${pyversion}Test COMMAND ${GPB_PYTHON${pyversion}_COMMAND} "${CMAKE_SOURCE_DIR}/autotests/pythontest.py" ${CMAKE_CURRENT_BINARY_DIR}/py${pyversion})
+
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/py${pyversion}/${pythonnamespace_value}
+- DESTINATION lib/python${pyversion${pyversion}_maj_min}/dist-packages)
++ DESTINATION lib/python${pyversion${pyversion}_maj_min}/site-packages)
+ install(FILES ${sip_files} "${CMAKE_CURRENT_BINARY_DIR}/sip/${pythonnamespace_value}/${modulename_value}/${modulename_value}mod.sip"
+ DESTINATION share/sip/${pythonnamespace_value}/${modulename_value}
+ )
More information about the arch-commits
mailing list