[arch-commits] Commit in extra-cmake-modules/repos/extra-any (5 files)
Antonio Rojas
arojas at archlinux.org
Fri May 14 18:56:54 UTC 2021
Date: Friday, May 14, 2021 @ 18:56:54
Author: arojas
Revision: 415508
archrelease: copy trunk to extra-any
Added:
extra-cmake-modules/repos/extra-any/ECM-no-init.py.patch
(from rev 415507, extra-cmake-modules/trunk/ECM-no-init.py.patch)
extra-cmake-modules/repos/extra-any/PKGBUILD
(from rev 415507, extra-cmake-modules/trunk/PKGBUILD)
extra-cmake-modules/repos/extra-any/ecm-sphinx4.patch
(from rev 415507, extra-cmake-modules/trunk/ecm-sphinx4.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 | 81 +++++++++++++++++++++++++------------------------
ecm-sphinx4.patch | 64 ++++++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+), 49 deletions(-)
Deleted: ECM-no-init.py.patch
===================================================================
--- ECM-no-init.py.patch 2021-05-14 18:56:37 UTC (rev 415507)
+++ ECM-no-init.py.patch 2021-05-14 18:56:54 UTC (rev 415508)
@@ -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 415507, extra-cmake-modules/trunk/ECM-no-init.py.patch)
===================================================================
--- ECM-no-init.py.patch (rev 0)
+++ ECM-no-init.py.patch 2021-05-14 18:56:54 UTC (rev 415508)
@@ -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 2021-05-14 18:56:37 UTC (rev 415507)
+++ PKGBUILD 2021-05-14 18:56:54 UTC (rev 415508)
@@ -1,39 +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.82.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)
-optdepends=('python-pyxdg: to generate fastlane metadata for Android apps'
- 'python-requests: to generate fastlane metadata for Android apps'
- 'python-yaml: to generate fastlane metadata for Android apps')
-groups=(kf5)
-source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig}
- ECM-no-init.py.patch)
-sha256sums=('5972ec6d78c3e95ab9cbecdb0661c158570e868466357c5cec2b63a4251ecce4'
- '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
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-}
Copied: extra-cmake-modules/repos/extra-any/PKGBUILD (from rev 415507, extra-cmake-modules/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-14 18:56:54 UTC (rev 415508)
@@ -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.82.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)
+optdepends=('python-pyxdg: to generate fastlane metadata for Android apps'
+ 'python-requests: to generate fastlane metadata for Android apps'
+ 'python-yaml: to generate fastlane metadata for Android apps')
+groups=(kf5)
+source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig}
+ ECM-no-init.py.patch
+ ecm-sphinx4.patch)
+sha256sums=('5972ec6d78c3e95ab9cbecdb0661c158570e868466357c5cec2b63a4251ecce4'
+ 'SKIP'
+ '5695e45c7621a00c0bca28f058c13b5d524f963a00b53337c8cefcdaf22c4b52'
+ 'e50408ef16aecec34c1ca624c2b9d2ddbadbcdf431532a5a765f7e80c4dde726')
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure at kde.org>
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < ECM-no-init.py.patch # Don't create __init__.py
+ patch -d $pkgname-$pkgver -p1 < ecm-sphinx4.patch # Fix build with sphinx 4
+}
+
+build() {
+ cmake -B build -S $pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_HTML_DOCS=ON \
+ -DBUILD_QTHELP_DOCS=ON
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+}
Copied: extra-cmake-modules/repos/extra-any/ecm-sphinx4.patch (from rev 415507, extra-cmake-modules/trunk/ecm-sphinx4.patch)
===================================================================
--- ecm-sphinx4.patch (rev 0)
+++ ecm-sphinx4.patch 2021-05-14 18:56:54 UTC (rev 415508)
@@ -0,0 +1,64 @@
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 84cca9e..32687b6 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -110,7 +110,8 @@ if(BUILD_MAN_DOCS)
+ set(name "${CMAKE_MATCH_1}")
+ set(sec "${CMAKE_MATCH_2}")
+ install(
+- FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec}
++ FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec} ${CMAKE_CURRENT_BINARY_DIR}/man/${sec}/${name}.${sec}
++ OPTIONAL
+ DESTINATION ${MAN_INSTALL_DIR}/man${sec}
+ )
+ endif()
+diff --git a/docs/sphinx/ext/ecm.py b/docs/sphinx/ext/ecm.py
+index 8667b36..a09e489 100644
+--- a/docs/sphinx/ext/ecm.py
++++ b/docs/sphinx/ext/ecm.py
+@@ -5,6 +5,7 @@
+ #
+ # SPDX-License-Identifier: BSD-3-Clause
+
++import html
+ import os
+ import re
+
+@@ -19,8 +20,11 @@ CMakeLexer.tokens["args"].append(('(\\$<)(.+?)(>)',
+
+ # Monkey patch for sphinx generating invalid content for qcollectiongenerator
+ # https://bitbucket.org/birkenfeld/sphinx/issue/1435/qthelp-builder-should-htmlescape-keywords
+-from sphinx.util.pycompat import htmlescape
+-from sphinx.builders.qthelp import QtHelpBuilder
++try:
++ from sphinxcontrib.qthelp import QtHelpBuilder
++except ImportError:
++ # sphinx < 4.0
++ from sphinx.builders.qthelp import QtHelpBuilder
+ old_build_keywords = QtHelpBuilder.build_keywords
+ def new_build_keywords(self, title, refs, subitems):
+ old_items = old_build_keywords(self, title, refs, subitems)
+@@ -29,13 +33,12 @@ def new_build_keywords(self, title, refs, subitems):
+ before, rest = item.split("ref=\"", 1)
+ ref, after = rest.split("\"")
+ if ("<" in ref and ">" in ref):
+- new_items.append(before + "ref=\"" + htmlescape(ref) + "\"" + after)
++ new_items.append(before + "ref=\"" + html.escape(ref) + "\"" + after)
+ else:
+ new_items.append(item)
+ return new_items
+ QtHelpBuilder.build_keywords = new_build_keywords
+
+-
+ from docutils.parsers.rst import Directive, directives
+ from docutils.transforms import Transform
+ try:
+@@ -127,7 +130,7 @@ class _ecm_index_entry:
+ self.desc = desc
+
+ def __call__(self, title, targetid):
+- return ('pair', u'%s ; %s' % (self.desc, title), targetid, 'main')
++ return ('pair', u'%s ; %s' % (self.desc, title), targetid, 'main', None)
+
+ _ecm_index_objs = {
+ 'manual': _ecm_index_entry('manual'),
More information about the arch-commits
mailing list