[PR PATCH] gtk4 4.6.0, libadwaita 1.0.0

[PR PATCH] gtk4 4.6.0, libadwaita 1.0.0

[paper42]

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

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

https://github.com/paper42/void-packages libadwaita-1.0.0
https://github.com/void-linux/void-packages/pull/34802

gtk4 4.6.0, libadwaita 1.0.0
#### Testing the changes
- I tested the changes in this PR: **briefly**

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libadwaita-1.0.0-34802.patch --]
[-- Type: text/x-diff, Size: 3273 bytes --]

From 01965718b2dd714718c96274cea4705f9f7fcaba Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Jan 2022 20:08:54 +0100
Subject: [PATCH 1/2] gtk4: update to 4.6.0.

---
 srcpkgs/gtk4/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index d2b95a4d6fa1..531d1e184ce2 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.4.1
+version=4.6.0
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -14,7 +14,7 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
  -Dvulkan=$(vopt_if vulkan enabled disabled)"
 hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
- pkg-config sassc gettext libxslt docbook-xsl
+ pkg-config sassc gettext libxslt docbook-xsl python3-docutils
  $(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
@@ -28,7 +28,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=0faada983dc6b0bc409cb34c1713c1f3267e67c093f86b1e3b17db6100a3ddf4
+checksum=782d5951fbfd585fc9ec76c09d07e28e6014c72db001fb567fff217fb96e4d8c
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11"

From 5946bed6217e46c9d62f9696a6bfcd265a11f0da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 1 Jan 2022 20:08:57 +0100
Subject: [PATCH 2/2] libadwaita: update to 1.0.0.

---
 srcpkgs/libadwaita/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index ecd0d06959a2..7e770676316a 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,9 +1,7 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.0alpha4
+version=1.0.0
 revision=1
-_ver=1.0.0.alpha.4
-wrksrc="$pkgname-${_ver}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
@@ -11,13 +9,13 @@ configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
 hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
  $(vopt_if gir vala-devel) gettext sassc"
 makedepends="gtk4-devel libglib-devel harfbuzz-devel"
-checkdepends="xvfb-run"
+checkdepends="xvfb-run cantarell-fonts"
 short_desc="GTK4 building blocks for modern adaptive applications"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
-checksum=f9a18952ec96fc5dc4d0827a4873c776a56c4dc236f7924aecb83f6f961a48d1
+distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
+checksum=722d316492f7d80b66cbc97e95ce07c0ef2bfd6500a8ffe44b89070b06eefba3
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

Re: [PR PATCH] [Merged]: gtk4 4.6.0, libadwaita 1.0.0

[paper42]

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

There's a merged pull request on the void-packages repository

gtk4 4.6.0, libadwaita 1.0.0
https://github.com/void-linux/void-packages/pull/34802

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**