[arch-commits] Commit in extra-cmake-modules/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Sat Sep 8 08:32:43 UTC 2018
Date: Saturday, September 8, 2018 @ 08:32:43
Author: arojas
Revision: 334019
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 334018, extra-cmake-modules/trunk/ECM-no-init.py.patch)
extra-cmake-modules/repos/testing-any/PKGBUILD
(from rev 334018, extra-cmake-modules/trunk/PKGBUILD)
extra-cmake-modules/repos/testing-any/ecm-sipflags.patch
(from rev 334018, extra-cmake-modules/trunk/ecm-sipflags.patch)
----------------------+
ECM-no-init.py.patch | 10 ++++++++
PKGBUILD | 48 ++++++++++++++++++++++++++++++++++++++
ecm-sipflags.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 119 insertions(+)
Copied: extra-cmake-modules/repos/testing-any/ECM-no-init.py.patch (from rev 334018, 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-09-08 08:32:43 UTC (rev 334019)
@@ -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 334018, extra-cmake-modules/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD (rev 0)
+++ testing-any/PKGBUILD 2018-09-08 08:32:43 UTC (rev 334019)
@@ -0,0 +1,48 @@
+# $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.50.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}
+ ECM-no-init.py.patch ecm-sipflags.patch)
+sha256sums=('dd33b0b09c9659c4e0f49f5ba0caf48ad01534bc3d31788d0793b140cd7e0489'
+ 'SKIP'
+ '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52'
+ '6f4715fdf7bf452c3f27cd00725083276795bd82d7b38cc420fed056145a36ed')
+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
+# Don't create __init__.py
+ patch -p1 -i ../ECM-no-init.py.patch
+# Use PyQt sip flags
+ patch -p1 -i ../ecm-sipflags.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/ecm-sipflags.patch (from rev 334018, extra-cmake-modules/trunk/ecm-sipflags.patch)
===================================================================
--- testing-any/ecm-sipflags.patch (rev 0)
+++ testing-any/ecm-sipflags.patch 2018-09-08 08:32:43 UTC (rev 334019)
@@ -0,0 +1,61 @@
+diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake
+index 2362c45..c789e9b 100644
+--- a/find-modules/FindPythonModuleGeneration.cmake
++++ b/find-modules/FindPythonModuleGeneration.cmake
+@@ -251,20 +251,6 @@ if(NOT SIP_Qt5Core_Mod_FILE)
+ _report_NOT_FOUND("PyQt module files not found for the ${CMAKE_FIND_PACKAGE_NAME} Module.")
+ endif()
+
+-file(STRINGS "${SIP_Qt5Core_Mod_FILE}" _SIP_Qt5_VERSIONS
+- REGEX "^%Timeline"
+-)
+-
+-string(REGEX MATCHALL "Qt_5_[^ }]+" _SIP_Qt5_VERSIONS "${_SIP_Qt5_VERSIONS}")
+-
+-set(GPB_Qt5_Tag Qt_5_${Qt5Core_VERSION_MINOR}_${Qt5Core_VERSION_PATCH})
+-
+-list(FIND _SIP_Qt5_VERSIONS ${GPB_Qt5_Tag} _SIP_Qt5_Version_Index)
+-
+-if(_SIP_Qt5_Version_Index EQUAL -1)
+- _report_NOT_FOUND("PyQt module \"${SIP_Qt5Core_Mod_FILE}\" does not support Qt version 5.${Qt5Core_VERSION_MINOR}.${Qt5Core_VERSION_PATCH} for the ${CMAKE_FIND_PACKAGE_NAME} Module. Found available Qt5 tags: \"${_SIP_Qt5_VERSIONS}\".")
+-endif()
+-
+ set(PythonModuleGeneration_FOUND TRUE)
+
+ include(CMakeParseArguments)
+@@ -395,14 +395,6 @@ headers = sipAPI${modulename_value}
+ endif()
+ endforeach()
+
+- if (WIN32)
+- set(GPB_WS_Tag -t WS_WIN)
+- elif(APPLE)
+- set(GPB_WS_Tag -t WS_MACX)
+- else()
+- set(GPB_WS_Tag -t WS_X11)
+- endif()
+-
+ add_custom_target(generate_${modulename_value}_sip_files ALL DEPENDS ${sip_files})
+
+ add_custom_command(OUTPUT
+@@ -404,7 +404,6 @@ headers = sipAPI${modulename_value}
+ --module-name "${modulename_value}"
+ -c "${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}"
+ -b "${CMAKE_CURRENT_BINARY_DIR}/pybuild/${pythonnamespace_value}/${modulename_value}/module.sbf"
+- -t ${GPB_Qt5_Tag} ${GPB_WS_Tag}
+
+ -x VendorID -x Py_v3
+
+diff --git a/find-modules/run-sip.py b/find-modules/run-sip.py
+index 74c8486..0edaff7 100755
+--- a/find-modules/run-sip.py
++++ b/find-modules/run-sip.py
+@@ -6,6 +6,8 @@ import subprocess
+
+ sipArgs = sys.argv[1:]
+
++from PyQt5.Qt import PYQT_CONFIGURATION
++sipArgs = PYQT_CONFIGURATION["sip_flags"].split(' ') + sipArgs
+ idx = sipArgs.index("--module-name")
+ modname = sipArgs[idx + 1]
+ del sipArgs[idx]
More information about the arch-commits
mailing list