PR#2: Update to 2022.2 - rpms/gi-docgen

rpms / gi-docgen

#2 Update to 2022.2

Merged 2 years ago by music. Opened 2 years ago by music.

rpms/ music/gi-docgen v2022.2 into rawhide

Update License to SPDX

Benjamin A. Beasley • 2 years ago

b78801f

Update to 2022.2 (close RHBZ#2140725)

Benjamin A. Beasley • 2 years ago

93ea121

.gitignore

file modified

		`@@ -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`

gi-docgen-2022.2-no-web-fonts.patch ~~gi-docgen-2021.8-no-web-fonts.patch~~

file renamed

+18 -18

		`@@ -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 @@`
		`- "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 @@`
		`+ 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]`

gi-docgen.spec

file modified

+17 -15

		`@@ -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`

		`@@ -13,48 +13,50 @@`
		`# .reuse/dep5, and on inspection of SPDX headers or other file contents with`
		`# assistance from licensecheck.`
		`#`
		`- # The entire source is (ASL 2.0 or GPLv3+) except the following files that are`
		`+ # The entire source is (Apache-2.0 OR GPL-3.0-or-later) except the following files that are`
		`# packaged or are used to generate packaged files:`
		`#`
		`# MIT:`
		`# - gidocgen/templates/basic/fzy.js`
		`# - gidocgen/templates/basic/solarized-{dark,light}.js`
		`#`
		`- # CC0:`
		`+ # CC0-1.0:`
		`# - gi-docgen.pc.in (from which gi-docgen.pc is generated)`
		`# - gidocgen/templates/basic/*.png`
		`# - docs/CODEOWNERS (-doc subpackage)`
		`# - examples/*.toml (-doc subpackage)`
		`- # - gidocgen/porter.py`
		`+ #`
		`+ # Note that CC0-1.0 is allowed for content only; these files may reasonably be`
		`+ # called content.`
		`#`
		`# Additionally, the following sources are under licenses other than (ASL 2.0 or`
		`# GPLv3+), but are not packaged in any of the binary RPMs:`
		`#`
		`- # CC0:`
		`+ # CC0-1.0:`
		`# - .editorconfig (not installed)`
		`# - .gitlab-ci.yml (not installed)`
		`# - gi-docgen.doap (not installed)`
		`# - MANIFEST.in (not installed)`
		`# - pytest.ini (not installed)`
		`#`
		`- # CC-BY-SA`
		`+ # CC-BY-SA-3.0:`
		`# - docs/gi-docgen.{png,svg} (for HTML docs; not currently packaged)`
		`# - code-of-conduct.md (not installed)`
		`#`
		`- # OFL:`
		`+ # OFL-1.1:`
		`# - gidocgen/templates/basic/*.{woff,woff2} (removed in prep)`
		`#`
		`- # GPLv2+:`
		`+ # GPL-2.0-or-later:`
		`# - test/gir/{Utility-1.0,Regress-1.0}.gir (not installed; test only)`
		`#`
		`- # LGPLv2+:`
		`+ # LGPL-2.0-or-later:`
		`# - test/gir/{GLib,GObject,Gio}-2.0.gir (not installed; test only)`
		`#`
		`- # (LGPLv2+ or MPLv1.1):`
		`+ # LGPL-2.0-or-later OR MPL-1.1:`
		`# - test/gir/cairo-1.0.gir (not installed; test only)`
		`- License: (ASL 2.0 or GPLv3+) and MIT and CC0`
		`+ License: (Apache-2.0 OR GPL-3.0-or-later) AND MIT AND CC0-1.0`
		`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 +68,7 @@`
		`# 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`

		`@@ -129,7 +131,7 @@`
		`Summary: Metapackage providing fonts for gi-docgen output`
		`# Really, there is nothing copyrightable in this metapackage, so we give it the`
		`# overall license of the project.`
		`- License: (ASL 2.0 or GPLv3+)`
		`+ License: Apache-2.0 OR GPL-3.0-or-later`

		`Requires: font(redhatdisplay)`
		`Requires: font(redhatdisplayblack)`
		`@@ -147,7 +149,7 @@`

		`%package doc`
		`Summary: Documentation for gi-docgen`
		`- License: (ASL 2.0 or GPLv3+) and CC0`
		`+ License: (Apache-2.0 OR GPL-3.0-or-later) AND CC0-1.0`

		`%description doc`
		`Documentation for gi-docgen.`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (gi-docgen-2022.1.tar.bz2) = 8f6997c3517d2cdc0690f9d71aeb473467db8fc26881700f15940858679a7cda001f63e9af4de4362d831b5d98aa583da81450cc9dbe8cc731c616d2f596e6ac`
		`+ SHA512 (gi-docgen-2022.2.tar.bz2) = d52d993f040be621f967bd79c6413bda2184b68ec0a09ecd9191cb8cb40fee2a4298ebb3e91cfdda192a0a4673ce2cf23dfa7aaa2b4e643a7dfc676a94be6baa`

music commented 2 years ago

GI-DocGen 2022.2

Changes since 2022.1
--------------------

* Use const.*.html instead of constant.*.html for search index links
* Remove "terms" from index.json, rewrite commandline search to work without it
* Add interface type description
* Fix failure to generate link to error domain
* Make log.log() thread safe
* Quote string constant values
* Set the license of the generated documentation
* Support (scope forever)
* Add a way to frame images
* Use the appropriate namespace for indices
* Fix type annotations for Repository packages and c_includes
* Add py.typed to comply with PEP561
* Add links to external classes in the hierarchy
* Use definition lists for callable arguments
* Improve styles
* Use definition lists for callable arguments
* Clarify generated description for GError arguments
* Clarify generated description for nullable in/out arguments
* Add emblems for versions and stability
* Require a sufficient minimum dependency of markdown
* Add a "serve" command