Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gtk4: update to 4.2.1, split docs, gi-docgen
@ 2021-07-05 15:12 paper42
  2021-07-07  3:08 ` sgn
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: paper42 @ 2021-07-05 15:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages gtk4-4.2.1
https://github.com/void-linux/void-packages/pull/31820

gtk4: update to 4.2.1, split docs, gi-docgen
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

The gi-docgen package and its dependencies are taken from the libadwaita PR (#31102), I will remove them from there when this PR is merged.

I split the documentation because it's quite big - 70 MB, the -devel subpackage is 10 MB (mostly gir files).

A patch file from https://github.com/void-linux/void-packages/pull/31820.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gtk4-4.2.1-31820.patch --]
[-- Type: text/x-diff, Size: 6488 bytes --]

From fb6d1646264452658e3041e00f4fbe7979efb537 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 1/4] New package: python3-smartypants-2.0.1

---
 srcpkgs/python3-smartypants/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-smartypants/template

diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+	vlicense COPYING
+}

From 35adb1ff2c8adfcfe3893e5e2abff74c374fddf1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 2/4] New package: python3-typogrify-2.0.7

---
 srcpkgs/python3-typogrify/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-typogrify/template

diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..f168a9cad689
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+	vlicense LICENSE.txt
+}

From 74c35d1e88118b13fd37f3ce55720e327a524ad3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 3/4] New package: gi-docgen-2021.6

---
 srcpkgs/gi-docgen/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/gi-docgen/template

diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..ff1c217d297e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails

From 27b1cfe83d482fd5bc8f5c3f555853135efe06dc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Jun 2021 23:48:13 +0200
Subject: [PATCH 4/4] gtk4: update to 4.2.1, split docs

---
 srcpkgs/gtk4-doc      |  1 +
 srcpkgs/gtk4/template | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/gtk4-doc

diff --git a/srcpkgs/gtk4-doc b/srcpkgs/gtk4-doc
new file mode 120000
index 000000000000..870d493d73bf
--- /dev/null
+++ b/srcpkgs/gtk4-doc
@@ -0,0 +1 @@
+gtk4
\ No newline at end of file
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 450d393b09c0..a9cddc8ddc60 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,11 +1,11 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.2.0
+version=4.2.1
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
 build_helper="gir"
-configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
+configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all -Dgtk_doc=true
  -Dbroadway-backend=$(vopt_if broadway true false)
  -Dx11-backend=$(vopt_if x11 true false)
  -Dwayland-backend=$(vopt_if wayland true false)
@@ -14,8 +14,8 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
  -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config sassc gettext
+hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+ pkg-config sassc gettext libxslt docbook-xsl
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
  iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
@@ -29,7 +29,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=e975f286e911666a79b6bcf486e6f99b0bd9d2b4cc348d19bce487a0b1c97072
+checksum=023169775de43f0a1fde066fbc19d78545ea6a7562c1915abde9b8ae4a7309e6
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11"
@@ -38,6 +38,20 @@ desc_option_cloudproviders="Enable integration with cloudproviders, such as Next
 
 build_options_default="colord cups broadway wayland x11 cloudproviders vulkan gir"
 
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+gtk4-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share/doc
+	}
+}
+
 gtk4-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-08-04 21:43 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-05 15:12 [PR PATCH] gtk4: update to 4.2.1, split docs, gi-docgen paper42
2021-07-07  3:08 ` sgn
2021-07-07 20:16 ` [PR PATCH] [Updated] " paper42
2021-07-07 20:18 ` paper42
2021-07-07 20:24 ` paper42
2021-07-07 21:07 ` paper42
2021-07-07 21:34 ` paper42
2021-08-04 21:19 ` [PR PATCH] [Updated] " paper42
2021-08-04 21:43 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).