[arch-commits] Commit in extra-cmake-modules/repos/extra-any (5 files)
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.patch2020-10-02 12:03:36 UTC (rev 397073) +++ ECM-no-init.py.patch2020-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.patch2020-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 === --- PKGBUILD2020-10-02 12:03:36 UTC (rev 397073) +++ PKGBUILD2020-10-02 12:12:55 UTC (rev 397074) @@ -1,37 +0,0 @@ -# Maintainer: Felix Yan -# Maintainer: Antonio Rojas -# Contributor: Andrea Scarpino - -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 - -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) +++ PKGBUILD2020-10-02 12:12:55 UTC (rev 397074) @@ -0,0 +1,42 @@ +# Maintainer: Felix Yan +# Maintainer: Antonio Rojas +# Contributor: Andrea Scarpino + +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' +
[arch-commits] Commit in extra-cmake-modules/repos/extra-any (5 files)
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.patch2019-12-19 06:47:09 UTC (rev 371670) +++ ECM-no-init.py.patch2019-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.patch2019-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 === --- PKGBUILD2019-12-19 06:47:09 UTC (rev 371670) +++ PKGBUILD2019-12-19 06:47:48 UTC (rev 371671) @@ -1,44 +0,0 @@ -# Maintainer: Felix Yan -# Maintainer: Antonio Rojas -# Contributor: Andrea Scarpino - -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 - -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,
[arch-commits] Commit in extra-cmake-modules/repos/extra-any (5 files)
Date: Tuesday, August 27, 2019 @ 18:19:41 Author: arojas Revision: 361285 archrelease: copy trunk to extra-any Added: extra-cmake-modules/repos/extra-any/ECM-no-init.py.patch (from rev 361284, extra-cmake-modules/trunk/ECM-no-init.py.patch) extra-cmake-modules/repos/extra-any/PKGBUILD (from rev 361284, extra-cmake-modules/trunk/PKGBUILD) extra-cmake-modules/repos/extra-any/libdir.patch (from rev 361284, extra-cmake-modules/trunk/libdir.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 | 91 + libdir.patch | 12 ++ 3 files changed, 69 insertions(+), 54 deletions(-) Deleted: ECM-no-init.py.patch === --- ECM-no-init.py.patch2019-08-27 18:19:15 UTC (rev 361284) +++ ECM-no-init.py.patch2019-08-27 18:19:41 UTC (rev 361285) @@ -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 361284, extra-cmake-modules/trunk/ECM-no-init.py.patch) === --- ECM-no-init.py.patch(rev 0) +++ ECM-no-init.py.patch2019-08-27 18:19:41 UTC (rev 361285) @@ -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 === --- PKGBUILD2019-08-27 18:19:15 UTC (rev 361284) +++ PKGBUILD2019-08-27 18:19:41 UTC (rev 361285) @@ -1,44 +0,0 @@ -# Maintainer: Felix Yan -# Maintainer: Antonio Rojas -# Contributor: Andrea Scarpino - -pkgname=extra-cmake-modules -pkgver=5.61.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=('a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c' -'SKIP' -'5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52') -validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure - -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 361284, extra-cmake-modules/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2019-08-27 18:19:41 UTC (rev 361285) @@ -0,0 +1,47 @@ +# Maintainer: Felix Yan +# Maintainer: Antonio Rojas +# Contributor: Andrea Scarpino + +pkgname=extra-cmake-modules +pkgver=5.61.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 +libdir.patch) +sha256sums=('a86a3b12c8a540af822131a8d65586d985267b1d642c29b4815b6c7870bc126c' +'SKIP' +
[arch-commits] Commit in extra-cmake-modules/repos/extra-any (5 files)
Date: Saturday, February 2, 2019 @ 12:40:51 Author: arojas Revision: 345072 archrelease: copy trunk to extra-any Added: extra-cmake-modules/repos/extra-any/ECM-Qt5.12.patch (from rev 345071, extra-cmake-modules/trunk/ECM-Qt5.12.patch) extra-cmake-modules/repos/extra-any/ECM-no-init.py.patch (from rev 345071, extra-cmake-modules/trunk/ECM-no-init.py.patch) extra-cmake-modules/repos/extra-any/PKGBUILD (from rev 345071, 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-Qt5.12.patch | 199 + ECM-no-init.py.patch | 20 ++-- PKGBUILD | 99 3 files changed, 260 insertions(+), 58 deletions(-) Copied: extra-cmake-modules/repos/extra-any/ECM-Qt5.12.patch (from rev 345071, extra-cmake-modules/trunk/ECM-Qt5.12.patch) === --- ECM-Qt5.12.patch(rev 0) +++ ECM-Qt5.12.patch2019-02-02 12:40:51 UTC (rev 345072) @@ -0,0 +1,199 @@ +diff --git a/cmake/FindQHelpGenerator.cmake b/cmake/FindQHelpGenerator.cmake +new file mode 100644 +--- /dev/null b/cmake/FindQHelpGenerator.cmake +@@ -0,0 +1,94 @@ ++#.rst: ++# FindQHelpGenerator ++# -- ++# ++# Try to find the Qt help generator. ++# Based on FindQCollectionGenerator.cmake ++# ++# This will define the following variables: ++# ++# ``QHelpGenerator_FOUND`` ++# True if (the requested version of) Sphinx is available ++# ``QHelpGenerator_VERSION`` ++# The version of the Qt help generator. Note that this not the ++# same as the version of Qt it is provided by. ++# ``QHelpGenerator_QT_VERSION`` ++# The version of Qt that the Qt help generator is from. ++# ``QHelpGenerator_EXECUTABLE`` ++# The path to the Qt help generator executable. ++# ++# If ``QHelpGenerator_FOUND`` is TRUE, it will also define the following ++# imported target: ++# ++# ``QHelpGenerator::Generator`` ++# The Qt help generator. ++# ++# In general we recommend using the imported target, as it is easier to use. ++# ++# Since 5.53.0. ++ ++#= ++# Copyright 2015 Alex Merry ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# ++# 1. Redistributions of source code must retain the copyright ++#notice, this list of conditions and the following disclaimer. ++# 2. Redistributions in binary form must reproduce the copyright ++#notice, this list of conditions and the following disclaimer in the ++#documentation and/or other materials provided with the distribution. ++# 3. The name of the author may not be used to endorse or promote products ++#derived from this software without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++#= ++ ++find_program(QHelpGenerator_EXECUTABLE ++NAMES ++qhelpgenerator-qt5 ++qhelpgenerator ++DOC "Qt help generator" ++) ++ ++if (QHelpGenerator_EXECUTABLE) ++if(NOT TARGET QHelpGenerator::Generator) ++add_executable(QHelpGenerator::Generator IMPORTED) ++set_target_properties(QHelpGenerator::Generator PROPERTIES ++IMPORTED_LOCATION "${QHelpGenerator_EXECUTABLE}" ++) ++endif() ++ ++execute_process( ++COMMAND "${QHelpGenerator_EXECUTABLE}" -v ++OUTPUT_VARIABLE _QHelpGenerator_version_raw ++ERROR_VARIABLE _QHelpGenerator_version_raw ++) ++if (_QHelpGenerator_version_raw MATCHES "^Qt Help Generator version ([0-9]+(\\.[0-9]+)*) \\(Qt ([0-9]+(\\.[0-9]+)*)\\)") ++set(QHelpGenerator_VERSION "${CMAKE_MATCH_1}") ++set(QHelpGenerator_QT_VERSION "${CMAKE_MATCH_3}") ++endif() ++unset(_QHelpGenerator_version_raw) ++endif() ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(QHelpGenerator ++FOUND_VAR ++QHelpGenerator_FOUND ++REQUIRED_VARS ++