[arch-commits] Commit in extra-cmake-modules/repos/extra-any (5 files)

Antonio Rojas arojas at archlinux.org
Fri Oct 2 12:12:55 UTC 2020


    Date: Friday, October 2, 2020 @ 12:12:55
  Author: arojas
Revision: 397074

archrelease: copy trunk to extra-any

Added:
  extra-cmake-modules/repos/extra-any/ECM-no-init.py.patch
    (from rev 397073, extra-cmake-modules/trunk/ECM-no-init.py.patch)
  extra-cmake-modules/repos/extra-any/PKGBUILD
    (from rev 397073, extra-cmake-modules/trunk/PKGBUILD)
  extra-cmake-modules/repos/extra-any/fix-pykf5-tests.patch
    (from rev 397073, extra-cmake-modules/trunk/fix-pykf5-tests.patch)
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 ++++++------
 PKGBUILD              |   79 +++++++++++++++++++++++++-----------------------
 fix-pykf5-tests.patch |   20 ++++++++++++
 3 files changed, 72 insertions(+), 47 deletions(-)

Deleted: ECM-no-init.py.patch
===================================================================
--- ECM-no-init.py.patch	2020-10-02 12:03:36 UTC (rev 397073)
+++ ECM-no-init.py.patch	2020-10-02 12:12:55 UTC (rev 397074)
@@ -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 397073, extra-cmake-modules/trunk/ECM-no-init.py.patch)
===================================================================
--- ECM-no-init.py.patch	                        (rev 0)
+++ ECM-no-init.py.patch	2020-10-02 12:12:55 UTC (rev 397074)
@@ -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}")

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-02 12:03:36 UTC (rev 397073)
+++ PKGBUILD	2020-10-02 12:12:55 UTC (rev 397074)
@@ -1,37 +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.74.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=('71406067bcd99ac106e0e3bfbb073653b18fd6d01039c0298d9767680977364f'
-            'SKIP'
-            '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52')
-validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
-
-prepare() {
-  patch -d $pkgname-$pkgver -p1 -i ../ECM-no-init.py.patch # Don't create __init__.py
-}
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_HTML_DOCS=OFF \
-    -DBUILD_QTHELP_DOCS=ON \
-    -DBUILD_TESTING=OFF
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: extra-cmake-modules/repos/extra-any/PKGBUILD (from rev 397073, extra-cmake-modules/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-10-02 12:12:55 UTC (rev 397074)
@@ -0,0 +1,42 @@
+# 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.74.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 fix-pykf5-tests.patch)
+sha256sums=('71406067bcd99ac106e0e3bfbb073653b18fd6d01039c0298d9767680977364f'
+            'SKIP'
+            '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52'
+            'bc9d50485a3c57e3ba6fc716ef621f3c15eb468e877dce480b42322e38d98e9c')
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 -i ../ECM-no-init.py.patch # Don't create __init__.py
+  patch -d $pkgname-$pkgver -p1 -i ../fix-pykf5-tests.patch # Fix locating pykf5 modules when running tests
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_HTML_DOCS=OFF \
+    -DBUILD_QTHELP_DOCS=ON
+  cmake --build build
+}
+
+check() {
+  cmake --build build --target test
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Copied: extra-cmake-modules/repos/extra-any/fix-pykf5-tests.patch (from rev 397073, extra-cmake-modules/trunk/fix-pykf5-tests.patch)
===================================================================
--- fix-pykf5-tests.patch	                        (rev 0)
+++ fix-pykf5-tests.patch	2020-10-02 12:12:55 UTC (rev 397074)
@@ -0,0 +1,20 @@
+diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake
+index 083b767..5baefd3 100644
+--- a/find-modules/FindPythonModuleGeneration.cmake
++++ b/find-modules/FindPythonModuleGeneration.cmake
+@@ -484,14 +484,9 @@ headers = sipAPI${GPB_MODULENAME}
+         set_property(TARGET Py${pyversion}KF5${GPB_MODULENAME} PROPERTY
+             OUTPUT_NAME "${GPB_MODULENAME}")
+ 
+-        if (GPB_SIP_DEPENDS MATCHES PyKF5)
+-          set(_kf5_python_prefix ${KDE_INSTALL_FULL_PYTHON${pyversion}DIR})
+-        else()
+-          set(_kf5_python_prefix ${CMAKE_BINARY_DIR}/py${pyversion})
+-        endif()
+         add_test(NAME Py${pyversion}Test${GPB_MODULENAME} COMMAND
+             ${GPB_PYTHON${pyversion}_COMMAND} "${CMAKE_SOURCE_DIR}/autotests/pythontest.py"
+-            ${_kf5_python_prefix}
++            ${CMAKE_BINARY_DIR}/py${pyversion}
+         )
+ 
+         install(DIRECTORY ${CMAKE_BINARY_DIR}/py${pyversion}/${GPB_PYTHONNAMESPACE}



More information about the arch-commits mailing list