From 4d998c3bfa340a9df4e1c2e5e7d2e4719db1dfb8 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Wed, 16 Jun 2021 21:47:02 +0530
Subject: [PATCH] extra-cmake-modules: Update to 5.83.0

Remove upstreamed python sphnix patch
---
 mingw-w64-extra-cmake-modules/PKGBUILD        | 14 ++--
 .../ecm-sphinx4.patch                         | 64 -------------------
 2 files changed, 5 insertions(+), 73 deletions(-)
 delete mode 100644 mingw-w64-extra-cmake-modules/ecm-sphinx4.patch

diff --git a/mingw-w64-extra-cmake-modules/PKGBUILD b/mingw-w64-extra-cmake-modules/PKGBUILD
index c2ad5ac3a4..f2474109ec 100644
--- a/mingw-w64-extra-cmake-modules/PKGBUILD
+++ b/mingw-w64-extra-cmake-modules/PKGBUILD
@@ -4,33 +4,29 @@
 _realname=extra-cmake-modules
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=5.82.0
+pkgver=5.83.0
 pkgrel=1
 pkgdesc='Extra CMake modules (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 url='https://projects.kde.org/projects/kdesupport/extra-cmake-modules'
 license=('LGPL')
+groups=("${MINGW_PACKAGE_PREFIX}-kf5")
 depends=("${MINGW_PACKAGE_PREFIX}-cmake"
          "${MINGW_PACKAGE_PREFIX}-png2ico")
 makedepends=("${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-python-sphinx"
              "${MINGW_PACKAGE_PREFIX}-python-requests")
 source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"{,.sig}
-        "set-AUTOSTATICPLUGINS.patch"
-        "ecm-sphinx4.patch")
-sha256sums=('5972ec6d78c3e95ab9cbecdb0661c158570e868466357c5cec2b63a4251ecce4'
+        "set-AUTOSTATICPLUGINS.patch")
+sha256sums=('72b7f3b3917f3208fff10f0402b0fa3a65815aca924f0f94a4f96383d8e0f81e'
             'SKIP'
-            'a246d25065ac7472b3a4e5995b3c6cb32081ffa21c7de7455006398431e6c886'
-            'e50408ef16aecec34c1ca624c2b9d2ddbadbcdf431532a5a765f7e80c4dde726')
+            'a246d25065ac7472b3a4e5995b3c6cb32081ffa21c7de7455006398431e6c886')
 validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure@kde.org>
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -Np1 -i "${srcdir}/set-AUTOSTATICPLUGINS.patch"
-
-  # From ArchLinux by antonio-rojas
-  patch -Np1 -i "${srcdir}/ecm-sphinx4.patch"
 }
 
 build() {
diff --git a/mingw-w64-extra-cmake-modules/ecm-sphinx4.patch b/mingw-w64-extra-cmake-modules/ecm-sphinx4.patch
deleted file mode 100644
index 809e6ed152..0000000000
--- a/mingw-w64-extra-cmake-modules/ecm-sphinx4.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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'),