[arch-commits] Commit in extra-cmake-modules/trunk (2 files)
Antonio Rojas
arojas at archlinux.org
Fri Jan 6 09:36:41 UTC 2017
Date: Friday, January 6, 2017 @ 09:36:40
Author: arojas
Revision: 285447
Fix python bindings generation
Added:
extra-cmake-modules/trunk/fix-python-bindings-generation.patch
Modified:
extra-cmake-modules/trunk/PKGBUILD
--------------------------------------+
PKGBUILD | 12 +++++++-----
fix-python-bindings-generation.patch | 20 ++++++++++++++++++++
2 files changed, 27 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-06 09:31:17 UTC (rev 285446)
+++ PKGBUILD 2017-01-06 09:36:40 UTC (rev 285447)
@@ -4,7 +4,7 @@
pkgname=extra-cmake-modules
pkgver=5.29.0
-pkgrel=1
+pkgrel=2
pkgdesc='Extra modules and scripts for CMake'
arch=('any')
url='https://community.kde.org/Frameworks'
@@ -11,9 +11,11 @@
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})
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+ fix-python-bindings-generation.patch)
md5sums=('dd3e13ee27fb421a9d215fc708ae02b3'
- 'SKIP')
+ 'SKIP'
+ '5a704fb81d356a678d2affd403d8f468')
validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
prepare() {
@@ -21,8 +23,8 @@
cd $pkgname-$pkgver
sed -e 's|/usr/bin/env python|/usr/bin/env python2|' -i find-modules/*.py
-# Fix harcoded Ubuntu-specific path https://bugs.kde.org/show_bug.cgi?id=372333
- sed -e 's|dist-packages|site-packages|g' -i find-modules/FindPythonModuleGeneration.cmake
+# 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
}
build() {
Added: fix-python-bindings-generation.patch
===================================================================
--- fix-python-bindings-generation.patch (rev 0)
+++ fix-python-bindings-generation.patch 2017-01-06 09:36:40 UTC (rev 285447)
@@ -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