From 93ea12118d50a10877ba96fadf1ce0600d8c3a5c Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 11 Nov 2022 07:54:06 -0500
Subject: [PATCH] Update to 2022.2 (close RHBZ#2140725)

---
 .gitignore                                    |  1 +
 ...tch => gi-docgen-2022.2-no-web-fonts.patch | 34 +++++++++----------
 gi-docgen.spec                                |  6 ++--
 sources                                       |  2 +-
 4 files changed, 22 insertions(+), 21 deletions(-)
 rename gi-docgen-2021.8-no-web-fonts.patch => gi-docgen-2022.2-no-web-fonts.patch (86%)

diff --git a/.gitignore b/.gitignore
index caab93d..7a30c15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /gi-docgen-2021.7.tar.bz2
 /gi-docgen-2021.8.tar.bz2
 /gi-docgen-2022.1.tar.bz2
+/gi-docgen-2022.2.tar.bz2
diff --git a/gi-docgen-2021.8-no-web-fonts.patch b/gi-docgen-2022.2-no-web-fonts.patch
similarity index 86%
rename from gi-docgen-2021.8-no-web-fonts.patch
rename to gi-docgen-2022.2-no-web-fonts.patch
index 8a875c9..996771f 100644
--- a/gi-docgen-2021.8-no-web-fonts.patch
+++ b/gi-docgen-2022.2-no-web-fonts.patch
@@ -1,6 +1,6 @@
-diff -Naur gi-docgen-2021.8-original/gidocgen/templates/basic/basic.toml gi-docgen-2021.8/gidocgen/templates/basic/basic.toml
---- gi-docgen-2021.8-original/gidocgen/templates/basic/basic.toml	2021-10-21 08:02:00.000000000 -0400
-+++ gi-docgen-2021.8/gidocgen/templates/basic/basic.toml	2021-10-21 11:36:23.194672634 -0400
+diff -Naur gi-docgen-2022.2-original/gidocgen/templates/basic/basic.toml gi-docgen-2022.2/gidocgen/templates/basic/basic.toml
+--- gi-docgen-2022.2-original/gidocgen/templates/basic/basic.toml	2022-11-07 09:50:06.000000000 -0500
++++ gi-docgen-2022.2/gidocgen/templates/basic/basic.toml	2022-11-11 08:23:51.069820380 -0500
 @@ -42,35 +42,4 @@
    "solarized-light.css",
    "solarized-dark.css",
@@ -37,9 +37,9 @@ diff -Naur gi-docgen-2021.8-original/gidocgen/templates/basic/basic.toml gi-docg
 -  "SourceCodePro-Regular.ttf.woff",
 -  "SourceCodePro-Semibold.ttf.woff",
  ]
-diff -Naur gi-docgen-2021.8-original/gidocgen/templates/basic/fonts.css gi-docgen-2021.8/gidocgen/templates/basic/fonts.css
---- gi-docgen-2021.8-original/gidocgen/templates/basic/fonts.css	2021-10-21 08:02:00.000000000 -0400
-+++ gi-docgen-2021.8/gidocgen/templates/basic/fonts.css	2021-10-21 11:36:23.194672634 -0400
+diff -Naur gi-docgen-2022.2-original/gidocgen/templates/basic/fonts.css gi-docgen-2022.2/gidocgen/templates/basic/fonts.css
+--- gi-docgen-2022.2-original/gidocgen/templates/basic/fonts.css	2022-11-07 09:50:06.000000000 -0500
++++ gi-docgen-2022.2/gidocgen/templates/basic/fonts.css	2022-11-11 08:23:51.069820380 -0500
 @@ -14,9 +14,7 @@
  
  @font-face {
@@ -225,15 +225,15 @@ diff -Naur gi-docgen-2021.8-original/gidocgen/templates/basic/fonts.css gi-docge
 +  src: local('SourceCodePro-Semibold');
    font-display: swap;
  }
-diff -Naur gi-docgen-2021.8-original/setup.py gi-docgen-2021.8/setup.py
---- gi-docgen-2021.8-original/setup.py	2021-10-21 08:02:00.000000000 -0400
-+++ gi-docgen-2021.8/setup.py	2021-10-21 11:36:23.194672634 -0400
-@@ -49,8 +49,6 @@
-         "templates/basic/*.html",
-         "templates/basic/*.js",
-         "templates/basic/*.png",
--        "templates/basic/*.woff2",
--        "templates/basic/*.woff",
-     ],
- }
+diff -Naur gi-docgen-2022.2-original/setup.cfg gi-docgen-2022.2/setup.cfg
+--- gi-docgen-2022.2-original/setup.cfg	2022-11-07 09:50:06.000000000 -0500
++++ gi-docgen-2022.2/setup.cfg	2022-11-11 08:24:25.200224213 -0500
+@@ -74,8 +74,6 @@
+   templates/basic/*.html
+   templates/basic/*.js
+   templates/basic/*.png
+-  templates/basic/*.woff2
+-  templates/basic/*.woff
+   py.typed
  
+ [bdist_wheel]
diff --git a/gi-docgen.spec b/gi-docgen.spec
index 2c14949..c5879e2 100644
--- a/gi-docgen.spec
+++ b/gi-docgen.spec
@@ -5,7 +5,7 @@
 %bcond_without doc_pdf
 
 Name:           gi-docgen
-Version:        2022.1
+Version:        2022.2
 Release:        %autorelease
 Summary:        Documentation tool for GObject-based libraries
 
@@ -54,7 +54,7 @@ Summary:        Documentation tool for GObject-based libraries
 #   - test/gir/cairo-1.0.gir (not installed; test only)
 License:        (ASL 2.0 or GPLv3+) and MIT and CC0
 URL:            https://gitlab.gnome.org/GNOME/gi-docgen
-Source0:        %{url}/archive/%{version}/gi-docgen-%{version}.tar.bz2
+Source0:        %{url}/-/archive/%{version}/gi-docgen-%{version}.tar.bz2
 
 # We are prohibited from bundling fonts, and we are prohibited from shipping
 # fonts in web font formats; see
@@ -66,7 +66,7 @@ Source0:        %{url}/archive/%{version}/gi-docgen-%{version}.tar.bz2
 # This patch removes all references to WOFF/WOFF2 font files (which we still
 # must remove in %%prep) and ensures the CSS correctly references corresponding
 # local system fonts.
-Patch:          gi-docgen-2021.8-no-web-fonts.patch
+Patch:          gi-docgen-2022.2-no-web-fonts.patch
 
 BuildArch:      noarch
 
diff --git a/sources b/sources
index 31c42b1..34ae420 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gi-docgen-2022.1.tar.bz2) = 8f6997c3517d2cdc0690f9d71aeb473467db8fc26881700f15940858679a7cda001f63e9af4de4362d831b5d98aa583da81450cc9dbe8cc731c616d2f596e6ac
+SHA512 (gi-docgen-2022.2.tar.bz2) = d52d993f040be621f967bd79c6413bda2184b68ec0a09ecd9191cb8cb40fee2a4298ebb3e91cfdda192a0a4673ce2cf23dfa7aaa2b4e643a7dfc676a94be6baa