[arch-commits] Commit in extra-cmake-modules/repos/extra-any (5 files)
Antonio Rojas
arojas at archlinux.org
Thu Dec 19 06:47:49 UTC 2019
Date: Thursday, December 19, 2019 @ 06:47:48
Author: arojas
Revision: 371671
archrelease: copy trunk to extra-any
Added:
extra-cmake-modules/repos/extra-any/ECM-no-init.py.patch
(from rev 371670, extra-cmake-modules/trunk/ECM-no-init.py.patch)
extra-cmake-modules/repos/extra-any/ECM-sip5.patch
(from rev 371670, extra-cmake-modules/trunk/ECM-sip5.patch)
extra-cmake-modules/repos/extra-any/PKGBUILD
(from rev 371670, extra-cmake-modules/trunk/PKGBUILD)
Deleted:
extra-cmake-modules/repos/extra-any/ECM-no-init.py.patch
extra-cmake-modules/repos/extra-any/PKGBUILD
----------------------+
ECM-no-init.py.patch | 20 +++++-----
ECM-sip5.patch | 12 ++++++
PKGBUILD | 91 +++++++++++++++++++++++++------------------------
3 files changed, 69 insertions(+), 54 deletions(-)
Deleted: ECM-no-init.py.patch
===================================================================
--- ECM-no-init.py.patch 2019-12-19 06:47:09 UTC (rev 371670)
+++ ECM-no-init.py.patch 2019-12-19 06:47:48 UTC (rev 371671)
@@ -1,10 +0,0 @@
-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/extra-any/ECM-no-init.py.patch (from rev 371670, extra-cmake-modules/trunk/ECM-no-init.py.patch)
===================================================================
--- ECM-no-init.py.patch (rev 0)
+++ ECM-no-init.py.patch 2019-12-19 06:47:48 UTC (rev 371671)
@@ -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/extra-any/ECM-sip5.patch (from rev 371670, extra-cmake-modules/trunk/ECM-sip5.patch)
===================================================================
--- ECM-sip5.patch (rev 0)
+++ ECM-sip5.patch 2019-12-19 06:47:48 UTC (rev 371671)
@@ -0,0 +1,12 @@
+diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake
+index 9a34220..6d4f97e 100644
+--- a/find-modules/FindPythonModuleGeneration.cmake
++++ b/find-modules/FindPythonModuleGeneration.cmake
+@@ -309,6 +309,7 @@ get_filename_component(libclang_file "${libclang_file}" REALPATH)
+
+ find_file(SIP_Qt5Core_Mod_FILE
+ NAMES QtCoremod.sip
++ HINTS ${KDE_INSTALL_PYTHON3DIR}/PyQt5/bindings/QtCore
+ PATH_SUFFIXES share/sip/PyQt5/QtCore
+ )
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-19 06:47:09 UTC (rev 371670)
+++ PKGBUILD 2019-12-19 06:47:48 UTC (rev 371671)
@@ -1,44 +0,0 @@
-# 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.64.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)
-sha256sums=('1865efc6254bed44e0a6918c5af3da62be4008ba7a197a47f35251f298041a69'
- 'SKIP'
- '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
-# Don't create __init__.py
- patch -p1 -i ../ECM-no-init.py.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/extra-any/PKGBUILD (from rev 371670, extra-cmake-modules/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-12-19 06:47:48 UTC (rev 371671)
@@ -0,0 +1,47 @@
+# 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.65.0
+pkgrel=2
+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-sip5.patch)
+sha256sums=('41634536ca1165a758acd85aa11112177616019e2d3974693a92d1d9bc91c105'
+ 'SKIP'
+ '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52'
+ '3be2f6c9413c9155aa1be19f75fc847af4fd1bd9d82b3fd7b1c040ce108bc7cf')
+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
+# Compatibility with sip 5
+ patch -p1 -i ../ECM-sip5.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
+}
More information about the arch-commits
mailing list