summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/dconf-editor/Manifest1
-rw-r--r--gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild9
-rw-r--r--gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild43
-rw-r--r--gnome-base/dconf-editor/files/meson-0.61.patch36
-rw-r--r--gnome-base/dconf-editor/metadata.xml11
-rw-r--r--gnome-base/dconf/dconf-0.40.0.ebuild4
-rw-r--r--gnome-base/dconf/metadata.xml11
-rw-r--r--gnome-base/gconf/Manifest1
-rw-r--r--gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch19
-rw-r--r--gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch18
-rw-r--r--gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch41
-rw-r--r--gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch45
-rw-r--r--gnome-base/gconf/files/gconf-3.2.6-python3.patch164
-rw-r--r--gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch83
-rw-r--r--gnome-base/gconf/gconf-3.2.6-r5.ebuild149
-rw-r--r--gnome-base/gconf/metadata.xml13
-rw-r--r--gnome-base/gdm/Manifest3
-rw-r--r--gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch29
-rw-r--r--gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch28
-rw-r--r--gnome-base/gdm/files/gdm-40.0-meson-allow-building-with-elogind.patch211
-rw-r--r--gnome-base/gdm/files/gdm-45.0.1-c99.patch22
-rw-r--r--gnome-base/gdm/files/pam-elogind.patch24
-rw-r--r--gnome-base/gdm/gdm-40.0-r1.ebuild215
-rw-r--r--gnome-base/gdm/gdm-45.0.1-r1.ebuild (renamed from gnome-base/gdm/gdm-40.1.ebuild)43
-rw-r--r--gnome-base/gdm/metadata.xml26
-rw-r--r--gnome-base/gnome-applets/Manifest4
-rw-r--r--gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild56
-rw-r--r--gnome-base/gnome-applets/gnome-applets-3.46.0.ebuild (renamed from gnome-base/gnome-applets/gnome-applets-3.40.0-r1.ebuild)18
-rw-r--r--gnome-base/gnome-applets/gnome-applets-3.50.0.ebuild (renamed from gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild)21
-rw-r--r--gnome-base/gnome-applets/metadata.xml21
-rw-r--r--gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild20
-rw-r--r--gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild18
-rw-r--r--gnome-base/gnome-common/metadata.xml11
-rw-r--r--gnome-base/gnome-control-center/Manifest7
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-45.3.ebuild (renamed from gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild)142
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-45.4.ebuild211
-rw-r--r--gnome-base/gnome-control-center/metadata.xml20
-rw-r--r--gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild54
-rw-r--r--gnome-base/gnome-core-apps/gnome-core-apps-45.2.ebuild60
-rw-r--r--gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild39
-rw-r--r--gnome-base/gnome-core-libs/gnome-core-libs-45.2.ebuild41
-rw-r--r--gnome-base/gnome-desktop/Manifest4
-rw-r--r--gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch48
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild72
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-44.0-r300.ebuild (renamed from gnome-base/gnome-desktop/gnome-desktop-40.3.ebuild)48
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-44.0-r400.ebuild (renamed from gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild)43
-rw-r--r--gnome-base/gnome-desktop/metadata.xml11
-rw-r--r--gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild76
-rw-r--r--gnome-base/gnome-extra-apps/gnome-extra-apps-45.2.ebuild73
-rw-r--r--gnome-base/gnome-flashback/Manifest4
-rw-r--r--gnome-base/gnome-flashback/gnome-flashback-3.46.0.ebuild (renamed from gnome-base/gnome-flashback/gnome-flashback-3.40.0.ebuild)20
-rw-r--r--gnome-base/gnome-flashback/gnome-flashback-3.50.0.ebuild (renamed from gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild)26
-rw-r--r--gnome-base/gnome-flashback/metadata.xml15
-rw-r--r--gnome-base/gnome-keyring/Manifest2
-rw-r--r--gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch40
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild (renamed from gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild)33
-rw-r--r--gnome-base/gnome-keyring/metadata.xml36
-rw-r--r--gnome-base/gnome-light/gnome-light-45.2.ebuild (renamed from gnome-base/gnome-light/gnome-light-40.0.ebuild)34
-rw-r--r--gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild (renamed from gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild)17
-rw-r--r--gnome-base/gnome-menus/metadata.xml11
-rw-r--r--gnome-base/gnome-mime-data/Manifest1
-rw-r--r--gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild27
-rw-r--r--gnome-base/gnome-mime-data/metadata.xml8
-rw-r--r--gnome-base/gnome-panel/Manifest4
-rw-r--r--gnome-base/gnome-panel/gnome-panel-3.46.0.ebuild (renamed from gnome-base/gnome-panel/gnome-panel-3.40.0.ebuild)22
-rw-r--r--gnome-base/gnome-panel/gnome-panel-3.50.0.ebuild (renamed from gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild)31
-rw-r--r--gnome-base/gnome-panel/metadata.xml15
-rw-r--r--gnome-base/gnome-session/Manifest2
-rw-r--r--gnome-base/gnome-session/files/defaults.list-r6 (renamed from gnome-base/gnome-session/files/defaults.list-r5)224
-rw-r--r--gnome-base/gnome-session/gnome-session-45.0-r1.ebuild (renamed from gnome-base/gnome-session/gnome-session-40.1.1.ebuild)31
-rw-r--r--gnome-base/gnome-session/metadata.xml17
-rw-r--r--gnome-base/gnome-settings-daemon/Manifest2
-rw-r--r--gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch40
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch134
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch76
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-45.1.ebuild (renamed from gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild)75
-rw-r--r--gnome-base/gnome-settings-daemon/metadata.xml21
-rw-r--r--gnome-base/gnome-shell/Manifest7
-rw-r--r--gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch59
-rw-r--r--gnome-base/gnome-shell/gnome-shell-40.2.ebuild191
-rw-r--r--gnome-base/gnome-shell/gnome-shell-40.3.ebuild191
-rw-r--r--gnome-base/gnome-shell/gnome-shell-45.2.ebuild (renamed from gnome-base/gnome-shell/gnome-shell-40.4.ebuild)122
-rw-r--r--gnome-base/gnome-shell/gnome-shell-45.4.ebuild188
-rw-r--r--gnome-base/gnome-shell/gnome-shell-45.5.ebuild188
-rw-r--r--gnome-base/gnome-shell/gnome-shell-45.6.ebuild188
-rw-r--r--gnome-base/gnome-shell/metadata.xml39
-rw-r--r--gnome-base/gnome-vfs/Manifest1
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch12
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch19
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch12
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch68
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch19
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch77
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch30
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch25
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch24
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch68
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch38
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch155
-rw-r--r--gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch26
-rw-r--r--gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild141
-rw-r--r--gnome-base/gnome-vfs/metadata.xml8
-rw-r--r--gnome-base/gnome/gnome-45.2.ebuild (renamed from gnome-base/gnome/gnome-40.0.ebuild)25
-rw-r--r--gnome-base/gsettings-desktop-schemas/Manifest3
-rw-r--r--gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild48
-rw-r--r--gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-45.0.ebuild (renamed from gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild)12
-rw-r--r--gnome-base/gsettings-desktop-schemas/metadata.xml12
-rw-r--r--gnome-base/gvfs/Manifest2
-rw-r--r--gnome-base/gvfs/gvfs-1.52.2.ebuild (renamed from gnome-base/gvfs/gvfs-1.48.1-r1.ebuild)39
-rw-r--r--gnome-base/gvfs/metadata.xml51
-rw-r--r--gnome-base/libglade/libglade-2.6.4-r4.ebuild (renamed from gnome-base/libglade/libglade-2.6.4-r3.ebuild)31
-rw-r--r--gnome-base/libglade/metadata.xml11
-rw-r--r--gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild4
-rw-r--r--gnome-base/libgnomecanvas/metadata.xml17
-rw-r--r--gnome-base/libgnomekbd/Manifest2
-rw-r--r--gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild36
-rw-r--r--gnome-base/libgnomekbd/libgnomekbd-3.28.1.ebuild38
-rw-r--r--gnome-base/libgnomekbd/metadata.xml11
-rw-r--r--gnome-base/libgtop/files/2.40.0-clang.patch135
-rw-r--r--gnome-base/libgtop/libgtop-2.40.0-r2.ebuild (renamed from gnome-base/libgtop/libgtop-2.40.0-r1.ebuild)7
-rw-r--r--gnome-base/libgtop/metadata.xml11
-rw-r--r--gnome-base/librsvg/Manifest381
-rw-r--r--gnome-base/librsvg/librsvg-2.40.21.ebuild14
-rw-r--r--gnome-base/librsvg/librsvg-2.50.7.ebuild99
-rw-r--r--gnome-base/librsvg/librsvg-2.57.0.ebuild383
-rw-r--r--gnome-base/librsvg/librsvg-2.57.2.ebuild389
-rw-r--r--gnome-base/librsvg/librsvg-2.57.3.ebuild389
-rw-r--r--gnome-base/librsvg/metadata.xml17
-rw-r--r--gnome-base/nautilus/Manifest2
-rw-r--r--gnome-base/nautilus/files/3.30.5-docs-build.patch42
-rw-r--r--gnome-base/nautilus/files/43.0-optional-gstreamer.patch (renamed from gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch)29
-rw-r--r--gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch116
-rw-r--r--gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch38
-rw-r--r--gnome-base/nautilus/metadata.xml24
-rw-r--r--gnome-base/nautilus/nautilus-45.2.1-r1.ebuild (renamed from gnome-base/nautilus/nautilus-40.2.ebuild)66
135 files changed, 3916 insertions, 3799 deletions
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
index 75ca3cf1323f..155ffea83ace 100644
--- a/gnome-base/dconf-editor/Manifest
+++ b/gnome-base/dconf-editor/Manifest
@@ -1 +1,2 @@
DIST dconf-editor-3.38.3.tar.xz 594544 BLAKE2B 0455fc01be96bccec9a9799c5bf23e9fe58cb34d32899a119753f58f5bc2f03acb96ff0eeba131cd8c0ea130e3afad16e4fadb23601510b618bf7a3d5a1664a3 SHA512 cf00705c1e11eab980777b9696fbaaa0f5f8a8118276f2add4f4fcefe5aab46844a539539418ce61f285e65623179a9d63cc18a91339b70b5e7c9408c697e9d1
+DIST dconf-editor-45.0.1.tar.xz 608576 BLAKE2B 1a444022301b5e3140cc1f59c87c49efa830e09a2004b89ee1b05bf141a116bdac26d42fd791e2dfb1f8c864412c1cd43c9ce413e943d069882fb32491196bd9 SHA512 7daa25cabcce9a51be549491b3809c023d25bf85384e45d0dd0c9624760de36bd26bd0a6ae4f4bad3d0e40834d453e826ab672f8981974487e893c53ae19c2ea
diff --git a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
index 5c60da6b466c..b063d7051c6f 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.38.3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-VALA_MIN_API_VERSION="0.40"
inherit gnome.org gnome2-utils meson vala xdg
@@ -12,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
RDEPEND="
>=gnome-base/dconf-0.26.1
@@ -27,6 +26,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/meson-0.61.patch"
+)
+
src_prepare() {
vala_src_prepare
xdg_src_prepare
diff --git a/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild b/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild
new file mode 100644
index 000000000000..cc5a6bac15d7
--- /dev/null
+++ b/gnome-base/dconf-editor/dconf-editor-45.0.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Graphical tool for editing the dconf configuration database"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/dconf-editor"
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
+
+RDEPEND="
+ >=gnome-base/dconf-0.26.1
+ >=dev-libs/glib-2.55.1:2
+ >=x11-libs/gtk+-3.22.27:3
+ >=gui-libs/libhandy-1.6.0:1[vala]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ $(vala_depend)
+ dev-libs/libxml2:2
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+src_prepare() {
+ default
+ vala_setup
+ xdg_environment_reset
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/dconf-editor/files/meson-0.61.patch b/gnome-base/dconf-editor/files/meson-0.61.patch
new file mode 100644
index 000000000000..caa1806d5779
--- /dev/null
+++ b/gnome-base/dconf-editor/files/meson-0.61.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/831746
+https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/21
+
+From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ editor/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/editor/meson.build b/editor/meson.build
+index 4c89ab99..0eb3bb1a 100644
+--- a/editor/meson.build
++++ b/editor/meson.build
+@@ -1,7 +1,6 @@
+ desktop = dconf_editor_namespace + '.desktop'
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
+@@ -26,7 +25,6 @@ configure_file(
+ appdata = dconf_editor_namespace + '.appdata.xml'
+
+ i18n.merge_file(
+- appdata,
+ input: appdata + '.in',
+ output: appdata,
+ po_dir: po_dir,
+--
+GitLab
+
diff --git a/gnome-base/dconf-editor/metadata.xml b/gnome-base/dconf-editor/metadata.xml
index 7b343b06be8a..c5e19f8cb556 100644
--- a/gnome-base/dconf-editor/metadata.xml
+++ b/gnome-base/dconf-editor/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/dconf-editor</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/dconf/dconf-0.40.0.ebuild b/gnome-base/dconf/dconf-0.40.0.ebuild
index ceacf61216f5..cdef334d4521 100644
--- a/gnome-base/dconf/dconf-0.40.0.ebuild
+++ b/gnome-base/dconf/dconf-0.40.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/dconf"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
IUSE="gtk-doc"
RESTRICT="!test? ( test )" # IUSE=test comes from virtualx.eclass
diff --git a/gnome-base/dconf/metadata.xml b/gnome-base/dconf/metadata.xml
index 7b343b06be8a..7661aabd4e67 100644
--- a/gnome-base/dconf/metadata.xml
+++ b/gnome-base/dconf/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/dconf</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
deleted file mode 100644
index b4e612dbd4a6..000000000000
--- a/gnome-base/gconf/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST GConf-3.2.6.tar.xz 1559904 BLAKE2B dc71bfc6e334b0a3545b6009fc1a592f3ba6adb1471aacc98aaa1ded9e89676f97415c26a3d17e297a846a7efca7ee695107c136ea28b2431f90dc966a3d64cc SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58
diff --git a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch b/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch
deleted file mode 100644
index 8ca6a0d4fc09..000000000000
--- a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN GConf-2.23.2.old/gconf/gconftool.c GConf-2.23.2/gconf/gconftool.c
---- GConf-2.23.2.old/gconf/gconftool.c 2008-06-28 05:27:33.000000000 -0400
-+++ GConf-2.23.2/gconf/gconftool.c 2008-09-23 10:20:00.000000000 -0400
-@@ -856,6 +856,7 @@ main (int argc, char** argv)
- {
- g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"));
- makefile_install_mode = FALSE;
-+ return 0;
- }
-
- if (makefile_uninstall_mode &&
-@@ -863,6 +864,7 @@ main (int argc, char** argv)
- {
- g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"));
- makefile_uninstall_mode = FALSE;
-+ return 0;
- }
-
- if (makefile_install_mode || makefile_uninstall_mode)
diff --git a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch b/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch
deleted file mode 100644
index 680b1a159b4a..000000000000
--- a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Wed, 4 Nov 2009 11:58:25 +0100
-Subject: Do not segfault when entry is NULL
-
----
- gconf/gconf-value.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/gconf/gconf-value.c
-+++ b/gconf/gconf-value.c
-@@ -1609,6 +1609,7 @@ void
- gconf_entry_set_value (GConfEntry *entry,
- const GConfValue *val)
- {
-+ g_return_if_fail (entry != NULL);
- gconf_entry_set_value_nocopy (entry,
- val ? gconf_value_copy (val) : NULL);
- }
diff --git a/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch b/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch
deleted file mode 100644
index dc6c66b1c644..000000000000
--- a/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 405f865c07261a95c8c9a09a84ab679c6dd0a330 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 24 Oct 2013 16:27:24 -0400
-Subject: gsettings-data-convert: Warn (and fix) invalid schema paths
-
-See https://bugzilla.gnome.org/show_bug.cgi?id=704802
-
-https://bugzilla.gnome.org/show_bug.cgi?id=710836
-
-diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
-index 9b2d1d0..160ed41 100644
---- a/gsettings/gsettings-data-convert.c
-+++ b/gsettings/gsettings-data-convert.c
-@@ -182,7 +182,23 @@ handle_file (const gchar *filename)
- }
-
- if (schema_path[1] != NULL)
-- settings = g_settings_new_with_path (schema_path[0], schema_path[1]);
-+ {
-+ char *compat_path_alloced = NULL;
-+ char *compat_path;
-+ /* Work around broken .convert files:
-+ https://bugzilla.gnome.org/show_bug.cgi?id=704802
-+ */
-+ if (!g_str_has_suffix (schema_path[1], "/"))
-+ {
-+ g_warning ("Schema file '%s' has missing trailing / in '%s'",
-+ filename, schema_path[1]);
-+ compat_path = compat_path_alloced = g_strconcat (schema_path[1], "/", NULL);
-+ }
-+ else
-+ compat_path = schema_path[1];
-+ settings = g_settings_new_with_path (schema_path[0], compat_path);
-+ g_free (compat_path_alloced);
-+ }
- else
- settings = g_settings_new (schema_path[0]);
-
---
-cgit v0.10.1
-
diff --git a/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch b/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch
deleted file mode 100644
index 54681bcb0e86..000000000000
--- a/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 98ff7acca7595f508b094506195aeffaf2e8b74c Mon Sep 17 00:00:00 2001
-From: Stefan Sauer <ensonic@users.sf.net>
-Date: Wed, 23 Jan 2013 08:11:18 +0100
-Subject: mconvert: enable recursive scheme lookup and fix a crasher
-
-The recursive scheme lookup is needed to scan the whole settings path. The crash
-would happen in the case of a misconfiguration (e.g. building gconf from source
-and running uninstalled while the configure settings don't match the one used to
-create the installed package).
-
-diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
-index a8af942..9b2d1d0 100644
---- a/gsettings/gsettings-data-convert.c
-+++ b/gsettings/gsettings-data-convert.c
-@@ -22,6 +22,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <errno.h>
-
-@@ -90,6 +91,10 @@ get_writable_client (void)
- GSList *addresses;
-
- addresses = get_writable_source_path ();
-+ if (!addresses) {
-+ g_printf("No writable gconf locations found\n");
-+ exit (1);
-+ }
- engine = gconf_engine_get_local_for_addresses (addresses, NULL);
- gconf_address_list_free (addresses);
-
-@@ -155,7 +160,7 @@ handle_file (const gchar *filename)
-
- schema_path = g_strsplit (groups[i], ":", 2);
-
-- schema = g_settings_schema_source_lookup (source, schema_path[0], FALSE);
-+ schema = g_settings_schema_source_lookup (source, schema_path[0], TRUE);
- if (schema == NULL)
- {
- if (verbose)
---
-cgit v0.10.1
-
diff --git a/gnome-base/gconf/files/gconf-3.2.6-python3.patch b/gnome-base/gconf/files/gconf-3.2.6-python3.patch
deleted file mode 100644
index d1504cc0e235..000000000000
--- a/gnome-base/gconf/files/gconf-3.2.6-python3.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-From dbd4f1bc1992c2942538980e76a50c8b8a758d70 Mon Sep 17 00:00:00 2001
-From: Takao Fujiwara <tfujiwar@redhat.com>
-Date: Fri, 11 Dec 2015 18:29:49 +0900
-Subject: [PATCH] gsettings-schema-convert: Support python3
-
-https://bugzilla.gnome.org/show_bug.cgi?id=759334
----
- gsettings/gsettings-schema-convert | 43 ++++++++++++++++++++------------------
- 1 file changed, 23 insertions(+), 20 deletions(-)
-
-diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert
-index 913cc83..6ccf8c5 100755
---- a/gsettings/gsettings-schema-convert
-+++ b/gsettings/gsettings-schema-convert
-@@ -25,6 +25,9 @@
- # TODO: we don't support migrating a pair from a gconf schema. It has yet to be
- # seen in real-world usage, though.
-
-+from __future__ import print_function
-+
-+import codecs
- import os
- import sys
-
-@@ -398,7 +401,7 @@ class SimpleSchemaParser:
-
- def _word_to_token(self, word):
- lower = word.lower()
-- if lower and lower in self.allowed_tokens.keys():
-+ if lower and lower in list(self.allowed_tokens.keys()):
- return lower
- raise GSettingsSchemaConvertException('\'%s\' is not a valid token.' % lower)
-
-@@ -594,7 +597,7 @@ class SimpleSchemaParser:
- self.object_stack.append(new_object)
-
- def parse(self):
-- f = open(self.file, 'r')
-+ f = codecs.open(self.file, 'r', encoding='utf-8')
- lines = [ line[:-1] for line in f.readlines() ]
- f.close()
-
-@@ -603,7 +606,7 @@ class SimpleSchemaParser:
- for line in lines:
- current_line_nb += 1
- self.parse_line(line)
-- except GSettingsSchemaConvertException, e:
-+ except GSettingsSchemaConvertException as e:
- raise GSettingsSchemaConvertException('%s:%s: %s' % (os.path.basename(self.file), current_line_nb, e))
-
- return self.root
-@@ -711,7 +714,7 @@ class XMLSchemaParser:
- schema = self._parse_schema(schema_node)
-
- for (child_schema, child_name) in schema._children:
-- if parent.has_key(child_schema):
-+ if child_schema in parent:
- raise GSettingsSchemaConvertException('Child \'%s\' is declared by two different schemas: \'%s\' and \'%s\'.' % (child_schema, parent[child_schema], schema.id))
- parent[child_schema] = schema
-
-@@ -719,7 +722,7 @@ class XMLSchemaParser:
-
- # now let's move all schemas where they should leave
- for schema in schemas:
-- if parent.has_key(schema.id):
-+ if schema.id in parent:
- parent_schema = parent[schema.id]
-
- # check that the paths of parent and child are supported by
-@@ -1054,31 +1057,31 @@ def main(args):
- (options, args) = parser.parse_args()
-
- if len(args) < 1:
-- print >> sys.stderr, 'Need a filename to work on.'
-+ print('Need a filename to work on.', file=sys.stderr)
- return 1
- elif len(args) > 1:
-- print >> sys.stderr, 'Too many arguments.'
-+ print('Too many arguments.', file=sys.stderr)
- return 1
-
- if options.simple and options.xml:
-- print >> sys.stderr, 'Too many output formats requested.'
-+ print('Too many output formats requested.', file=sys.stderr)
- return 1
-
- if not options.gconf and options.gettext_domain:
-- print >> sys.stderr, 'Default gettext domain can only be specified when converting a gconf schema.'
-+ print('Default gettext domain can only be specified when converting a gconf schema.', file=sys.stderr)
- return 1
-
- if not options.gconf and options.schema_id:
-- print >> sys.stderr, 'Default schema ID can only be specified when converting a gconf schema.'
-+ print('Default schema ID can only be specified when converting a gconf schema.', file=sys.stderr)
- return 1
-
- if not options.gconf and options.keep_underscores:
-- print >> sys.stderr, 'The --keep-underscores option can only be specified when converting a gconf schema.'
-+ print('The --keep-underscores option can only be specified when converting a gconf schema.', file=sys.stderr)
- return 1
-
- argfile = os.path.expanduser(args[0])
- if not os.path.exists(argfile):
-- print >> sys.stderr, '\'%s\' does not exist.' % argfile
-+ print('\'%s\' does not exist.' % argfile, file=sys.stderr)
- return 1
-
- if options.output:
-@@ -1095,7 +1098,7 @@ def main(args):
- try:
- parser = GConfSchemaParser(argfile, options.gettext_domain, options.schema_id, options.keep_underscores)
- schema_root = parser.parse()
-- except SyntaxError, e:
-+ except SyntaxError as e:
- raise GSettingsSchemaConvertException('\'%s\' does not look like a valid gconf schema file: %s' % (argfile, e))
- else:
- # autodetect if file is XML or not
-@@ -1104,7 +1107,7 @@ def main(args):
- schema_root = parser.parse()
- if not options.simple and not options.xml:
- options.simple = True
-- except SyntaxError, e:
-+ except SyntaxError as e:
- parser = SimpleSchemaParser(argfile)
- schema_root = parser.parse()
- if not options.simple and not options.xml:
-@@ -1113,10 +1116,10 @@ def main(args):
- if options.xml:
- node = schema_root.get_xml_node()
- try:
-- output = ET.tostring(node, pretty_print = True)
-+ output = ET.tostring(node, pretty_print = True, encoding="unicode")
- except TypeError:
- # pretty_print only works with lxml
-- output = ET.tostring(node)
-+ output = ET.tostring(node, encoding="unicode")
- else:
- output = schema_root.get_simple_string()
-
-@@ -1124,17 +1127,17 @@ def main(args):
- sys.stdout.write(output)
- else:
- try:
-- fout = open(options.output, 'w')
-+ fout = codecs.open(options.output, 'w', encoding='utf-8')
- fout.write(output)
- fout.close()
-- except GSettingsSchemaConvertException, e:
-+ except GSettingsSchemaConvertException as e:
- fout.close()
- if os.path.exists(options.output):
- os.unlink(options.output)
- raise e
-
-- except GSettingsSchemaConvertException, e:
-- print >> sys.stderr, '%s' % e
-+ except GSettingsSchemaConvertException as e:
-+ print('%s' % e, file=sys.stderr)
- return 1
-
- return 0
---
-2.4.3
-
diff --git a/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch b/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch
deleted file mode 100644
index 26503f7216ea..000000000000
--- a/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 15 Apr 2013 09:57:34 -0400
-Subject: dbus: Don't spew to console when unable to connect to dbus daemon
-
-Instead pass the error up for the caller to decide what to do.
-
-This prevent untrappable warning messages from showing up at the
-console if gconftool --makefile-install-rule is called.
-
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index 5610fcf..048e3ea 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -105,7 +105,7 @@ static GHashTable *engines_by_db = NULL;
- static GHashTable *engines_by_address = NULL;
- static gboolean dbus_disconnected = FALSE;
-
--static gboolean ensure_dbus_connection (void);
-+static gboolean ensure_dbus_connection (GError **error);
- static gboolean ensure_service (gboolean start_if_not_found,
- GError **err);
- static gboolean ensure_database (GConfEngine *conf,
-@@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf)
- }
-
- static gboolean
--ensure_dbus_connection (void)
-+ensure_dbus_connection (GError **err)
- {
- DBusError error;
-
-@@ -392,7 +392,9 @@ ensure_dbus_connection (void)
-
- if (dbus_disconnected)
- {
-- g_warning ("The connection to DBus was broken. Can't reinitialize it.");
-+ g_set_error (err, GCONF_ERROR,
-+ GCONF_ERROR_NO_SERVER,
-+ "The connection to DBus was broken. Can't reinitialize it.");
- return FALSE;
- }
-
-@@ -402,7 +404,10 @@ ensure_dbus_connection (void)
-
- if (!global_conn)
- {
-- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message);
-+ g_set_error (err, GCONF_ERROR,
-+ GCONF_ERROR_NO_SERVER,
-+ "Client failed to connect to the D-BUS daemon:\n%s",
-+ error.message);
-
- dbus_error_free (&error);
- return FALSE;
-@@ -431,13 +436,8 @@ ensure_service (gboolean start_if_not_found,
-
- if (global_conn == NULL)
- {
-- if (!ensure_dbus_connection ())
-- {
-- g_set_error (err, GCONF_ERROR,
-- GCONF_ERROR_NO_SERVER,
-- _("No D-BUS daemon running\n"));
-- return FALSE;
-- }
-+ if (!ensure_dbus_connection (err))
-+ return FALSE;
-
- g_assert (global_conn != NULL);
- }
-@@ -2512,7 +2512,7 @@ gconf_ping_daemon (void)
- {
- if (global_conn == NULL)
- {
-- if (!ensure_dbus_connection ())
-+ if (!ensure_dbus_connection (NULL))
- {
- return FALSE;
- }
---
-cgit v0.10.1
-
diff --git a/gnome-base/gconf/gconf-3.2.6-r5.ebuild b/gnome-base/gconf/gconf-3.2.6-r5.ebuild
deleted file mode 100644
index 2102f9517875..000000000000
--- a/gnome-base/gconf/gconf-3.2.6-r5.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME_ORG_MODULE="GConf"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 multilib-minimal python-single-r1
-
-DESCRIPTION="GNOME configuration system and daemon"
-HOMEPAGE="https://projects.gnome.org/gconf/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux"
-IUSE="debug +introspection ldap policykit"
-
-RDEPEND="
- ${PYTHON_DEPS}
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
- >=dev-libs/dbus-glib-0.100.2:=[${MULTILIB_USEDEP}]
- >=sys-apps/dbus-1.6.18-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
- ldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
- policykit? ( sys-auth/polkit:= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxslt
- dev-util/glib-utils
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35
- virtual/pkgconfig
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
- kill_gconf
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
- eapply "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
- # Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
- eapply "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
-
- # From 'master'
- # mconvert: enable recursive scheme lookup and fix a crasher
- eapply "${FILESDIR}/${P}-mconvert-crasher.patch"
-
- # dbus: Don't spew to console when unable to connect to dbus daemon
- eapply "${FILESDIR}/${P}-spew-console-error.patch"
-
- # gsettings-data-convert: Warn (and fix) invalid schema paths
- eapply "${FILESDIR}/${P}-gsettings-data-convert-paths.patch"
-
- # gsettings-data-convert: Migrate from Python 2 to 3.
- eapply "${FILESDIR}/${P}-python3.patch"
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- gnome2_src_configure \
- --disable-static \
- --enable-gsettings-backend \
- --with-gtk=3.0 \
- --disable-orbit \
- $(use_enable debug) \
- $(multilib_native_use_enable introspection) \
- $(use_with ldap openldap) \
- $(multilib_native_use_enable policykit defaults-service)
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/gconf/html doc/gconf/html || die
- fi
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- python_fix_shebang "${ED}"/usr/bin/gsettings-schema-convert
-
- keepdir /etc/gconf/gconf.xml.mandatory
- keepdir /etc/gconf/gconf.xml.defaults
- # Make sure this directory exists, bug #268070, upstream #572027
- keepdir /etc/gconf/gconf.xml.system
-
- echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf
- echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
- doenvd 50gconf
- dodir /root/.gconfd
-}
-
-pkg_preinst() {
- kill_gconf
- gnome2_pkg_preinst
-}
-
-pkg_postinst() {
- kill_gconf
-
- gnome2_pkg_postinst
-
- multilib_pkg_postinst() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- multilib_foreach_abi multilib_pkg_postinst
-
- # change the permissions to avoid some gconf bugs
- einfo "changing permissions for gconf dirs"
- find "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
- einfo "changing permissions for gconf files"
- find "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- multilib_pkg_postrm() {
- gnome2_giomodule_cache_update \
- || die "Update GIO modules cache failed (for ${ABI})"
- }
- multilib_foreach_abi multilib_pkg_postrm
-}
-
-kill_gconf() {
- # Avoid harmless error message. See bug #523868.
- mkdir -p "${HOME}"/.config || die
-
- # This function will kill all running gconfd-2 that could be causing troubles
- if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
- then
- "${EPREFIX}"/usr/bin/gconftool-2 --shutdown
- fi
-
- return 0
-}
diff --git a/gnome-base/gconf/metadata.xml b/gnome-base/gconf/metadata.xml
deleted file mode 100644
index 389781af037b..000000000000
--- a/gnome-base/gconf/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="ldap">Build backend which enables default mail accounts,
- addressbooks and calendars for Evolution to be configured using each
- user's LDAP entry."</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index d486cfd45a5b..86ab48d5ae71 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -1,3 +1,2 @@
-DIST gdm-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c
-DIST gdm-40.1.tar.xz 803488 BLAKE2B a0f5349c15c281b666e2e1eb35b81bd4fe3561d7dfa48e43fab7b6ac5c6f9f187f3907fc88eb169ef5e7951c815dec849f64ff2a2b630742b47521bc5c33f618 SHA512 34e3d905195c9d44f3681fcf8170b67e739cef60fe3987802b7006e5063b9cdf5ca047470d0aebd6e9b47dbbb660040648a647ed8d3186a3099b8c6532c5ded7
+DIST gdm-45.0.1.tar.xz 855004 BLAKE2B 1ec7250c49c40a31dbc21d0a141cbe6c2555c43d9a31aa6364b497812de0dab4785f509bf9f8b38febc449ada955a86a22b11986c30d9f9226042e2eb3c485e0 SHA512 f0c667dd5df034087e284c2ec1131b55a85cd9e832c15c2aff1637e1e36d4d62a7d86528a2e524bb2782ca7d7cc7cb9c34a9ce9bba688ad222af409e2eb69abe
DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
diff --git a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
deleted file mode 100644
index cd19077a5f1d..000000000000
--- a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 75fe02c2b383b27b202940bdedd7d8d2c64169fb Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 30 Jul 2013 22:56:30 -0400
-Subject: [PATCH 3/4] Gentoo does not have a fingerprint-auth pam stack
-
----
- data/pam-exherbo/gdm-fingerprint.pam | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/data/pam-exherbo/gdm-fingerprint.pam b/data/pam-exherbo/gdm-fingerprint.pam
-index 41639ec..d9633fb 100644
---- a/data/pam-exherbo/gdm-fingerprint.pam
-+++ b/data/pam-exherbo/gdm-fingerprint.pam
-@@ -1,6 +1,11 @@
- account include system-login
-
--auth substack fingerprint-auth
-+auth optional pam_env.so
-+auth required pam_tally2.so onerr=succeed
-+auth required pam_shells.so
-+auth required pam_nologin.so
-+auth required pam_fprintd.so
-+auth required pam_permit.so
- auth optional pam_gnome_keyring.so
-
- password required pam_deny.so
---
-1.8.5.1
-
diff --git a/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch b/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
deleted file mode 100644
index 2742cf276413..000000000000
--- a/gnome-base/gdm/files/gdm-40.0-meson-Fix-libwrap-detection.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/142
-
-From c713ace4c71a6804734ba5b1bca4abde11ab90d1 Mon Sep 17 00:00:00 2001
-From: Bernd Feige <Bernd.Feige@gmx.net>
-Date: Wed, 19 May 2021 11:28:07 -0700
-Subject: [PATCH] meson: Fix libwrap detection
-
-Bug: https://bugs.gentoo.org/790671
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 0266a938..a490a725 100644
---- a/meson.build
-+++ b/meson.build
-@@ -90,7 +90,7 @@ else
- endif
- xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
- if xdmcp_dep.found() and get_option('tcp-wrappers')
-- libwrap_dep = cc.find_library('libwrap')
-+ libwrap_dep = cc.find_library('wrap')
- endif
- # systemd
- systemd_dep = dependency('systemd')
---
-2.26.3
-
diff --git a/gnome-base/gdm/files/gdm-40.0-meson-allow-building-with-elogind.patch b/gnome-base/gdm/files/gdm-40.0-meson-allow-building-with-elogind.patch
deleted file mode 100644
index 39cd12dd227f..000000000000
--- a/gnome-base/gdm/files/gdm-40.0-meson-allow-building-with-elogind.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/113
-
-From 462cc0f5346f5913cf7151044f1c232c5d21c1c3 Mon Sep 17 00:00:00 2001
-From: Dudemanguy <random342@airmail.cc>
-Date: Mon, 5 Oct 2020 18:41:55 -0500
-Subject: [PATCH] meson: allow building with elogind
-
-Currently, the GDM meson build has a hard dependency on systemd.
-However, GDM can function just fine if one is using elogind. This allows
-a user to build GDM against libelogind and also disable the systemd
-system and user units.
----
- common/meson.build | 2 +-
- data/meson.build | 62 ++++++++++++++----------
- data/pam-arch/gdm-launch-environment.pam | 1 +
- libgdm/meson.build | 2 +-
- meson.build | 36 +++++++++-----
- meson_options.txt | 5 +-
- 6 files changed, 66 insertions(+), 42 deletions(-)
-
-diff --git a/common/meson.build b/common/meson.build
-index 074dd92e1..bca58f7c4 100644
---- a/common/meson.build
-+++ b/common/meson.build
-@@ -11,7 +11,7 @@ libgdmcommon_src = files(
- )
-
- libgdmcommon_deps = [
-- libsystemd_dep,
-+ logind_dep,
- gobject_dep,
- gio_dep,
- gio_unix_dep,
-diff --git a/data/meson.build b/data/meson.build
-index 7c5222eaf..403336c31 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -168,41 +168,53 @@ else
- service_config.set('PLYMOUTH_QUIT_SERVICE', '')
- endif
-
--if get_option('systemdsystemunitdir') != ''
-- systemd_systemunitdir = get_option('systemdsystemunitdir')
--else
-- systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
-+systemdsystemunitdir = get_option('systemdsystemunitdir')
-+if systemdsystemunitdir != 'no'
-+ assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd system unit dir or disable it')
-+ if get_option('systemdsystemunitdir') != ''
-+ systemd_systemunitdir = get_option('systemdsystemunitdir')
-+ else
-+ systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
-+ endif
- endif
-
--if get_option('systemduserunitdir') != ''
-- systemd_userunitdir = get_option('systemduserunitdir')
--else
-- systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-- define_variable: ['prefix', get_option('prefix')])
-+systemduserunitdir = get_option('systemduserunitdir')
-+if systemduserunitdir != 'no'
-+ assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
-+ if get_option('systemduserunitdir') != ''
-+ systemd_userunitdir = get_option('systemduserunitdir')
-+ else
-+ systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-+ define_variable: ['prefix', get_option('prefix')])
-+ endif
- endif
-
--configure_file(
-- input: 'gdm.service.in',
-- output: '@BASENAME@',
-- configuration: service_config,
-- install_dir: systemd_systemunitdir,
-- format: 'cmake'
--)
-+if systemdsystemunitdir != 'no'
-+ configure_file(
-+ input: 'gdm.service.in',
-+ output: '@BASENAME@',
-+ configuration: service_config,
-+ install_dir: systemd_systemunitdir,
-+ format: 'cmake'
-+ )
-+endif
-
- gdm_gnome_session_wanted_targets = []
- foreach component: gdm_gnome_user_session_wanted_components
- gdm_gnome_session_wanted_targets += 'Wants=@0@.target'.format(component)
- endforeach
-
--configure_file(
-- input: 'session.conf.in',
-- output: 'session.conf',
-- configuration: {
-- 'requires_component': gdm_gnome_shell_component,
-- 'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets),
-- },
-- install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d',
--)
-+if systemduserunitdir != 'no'
-+ configure_file(
-+ input: 'session.conf.in',
-+ output: 'session.conf',
-+ configuration: {
-+ 'requires_component': gdm_gnome_shell_component,
-+ 'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets),
-+ },
-+ install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d',
-+ )
-+endif
-
- # XSession
- if get_option('gdm-xsession')
-diff --git a/libgdm/meson.build b/libgdm/meson.build
-index 3f8cafbb7..83e95151b 100644
---- a/libgdm/meson.build
-+++ b/libgdm/meson.build
-@@ -56,7 +56,7 @@ libgdm_deps = [
- glib_dep,
- gio_dep,
- gio_unix_dep,
-- libsystemd_dep,
-+ logind_dep,
- libgdmcommon_dep,
- ]
-
-diff --git a/meson.build b/meson.build
-index e6fcf4b8b..a86a486b7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -92,21 +92,30 @@ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp'))
- if xdmcp_dep.found() and get_option('tcp-wrappers')
- libwrap_dep = cc.find_library('libwrap')
- endif
--# systemd
--systemd_dep = dependency('systemd')
--libsystemd_dep = dependency('libsystemd')
--if meson.version().version_compare('>= 0.53')
-- systemd_multiseat_x = find_program('systemd-multi-seat-x',
-- required: false,
-- dirs: [
-- systemd_dep.get_pkgconfig_variable('systemdutildir'),
-- '/lib/systemd',
-- '/usr/lib/systemd',
-- ])
-+
-+logind_provider = get_option('logind-provider')
-+systemd_dep = dependency('systemd', required: false)
-+if logind_provider == 'systemd'
-+ libsystemd_dep = dependency('libsystemd')
-+ logind_dep = libsystemd_dep
-+ if meson.version().version_compare('>= 0.53')
-+ systemd_multiseat_x = find_program('systemd-multi-seat-x',
-+ required: false,
-+ dirs: [
-+ systemd_dep.get_pkgconfig_variable('systemdutildir'),
-+ '/lib/systemd',
-+ '/usr/lib/systemd',
-+ ])
-+ else
-+ systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
-+ endif
-+ systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
- else
-- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false)
-+ elogind_dep = dependency('libelogind')
-+ logind_dep = elogind_dep
-+ systemd_x_server = 'disabled'
- endif
--systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x'
-+
- # Plymouth
- plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth'))
- # Check for Solaris auditing API (ADT)
-@@ -313,6 +322,7 @@ summary({
- 'PAM Syslog': have_pam_syslog,
- 'Supports PAM Extensions': pam_extensions_supported,
- 'SeLinux': libselinux_dep.found(),
-+ 'Logind Provider': get_option('logind-provider'),
- 'Use GDM Xsession': get_option('gdm-xsession'),
- 'Use UserDisplayServer': get_option('user-display-server'),
- 'Use SystemdJournal': get_option('systemd-journal'),
-diff --git a/meson_options.txt b/meson_options.txt
-index 14e0b908b..5135d7d66 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -12,6 +12,7 @@ option('initial-vt', type: 'integer', value: 1, description: 'Initial virtual te
- option('ipv6', type: 'boolean', value: false, description: 'Enables compilation of IPv6 code.')
- option('lang-file', type: 'string', value: '', description: 'File containing default language settings.')
- option('libaudit', type: 'feature', value: 'auto', description: 'Add Linux audit support.')
-+option('logind-provider', type: 'combo', choices: ['systemd', 'elogind'], value: 'systemd', description: 'Which logind library to use.')
- option('log-dir', type: 'string', value: '/var/log/gdm', description: 'Log directory.')
- option('pam-mod-dir', type: 'string', value: '', description: 'Directory to install PAM modules in.')
- option('pam-prefix', type: 'string', value: '', description: 'Specify where PAM files go.')
-@@ -27,8 +28,8 @@ option('solaris', type: 'boolean', value: false, description: 'Build for Solaris
- option('split-authentication', type: 'boolean', value: true, description: 'Enable multiple simultaneous PAM conversations during login.')
- option('sysconfsubdir', type: 'string', value: 'gdm', description: 'Directory name used under sysconfdir.')
- option('systemd-journal', type: 'boolean', value: true, description: 'Use journald support.')
--option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files.')
--option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files.')
-+option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files, or \'no\' to disable.')
-+option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files, or \'no\' to disable.')
- option('tcp-wrappers', type: 'boolean', value: false, description: 'Use TCP wrappers.')
- option('udev-dir', type: 'string', value: '', description: 'Directory for udev rules file.')
- option('user', type: 'string', value: 'gdm', description: 'GDM\'s username.')
---
-GitLab
-
diff --git a/gnome-base/gdm/files/gdm-45.0.1-c99.patch b/gnome-base/gdm/files/gdm-45.0.1-c99.patch
new file mode 100644
index 000000000000..2d0f5b9cc0eb
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-45.0.1-c99.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/919081
+https://gitlab.gnome.org/GNOME/gdm/-/issues/893
+https://gitlab.gnome.org/GNOME/gdm/-/commit/08ef19e848176e58511f1a66992b5a26cb3c51a2
+
+From 08ef19e848176e58511f1a66992b5a26cb3c51a2 Mon Sep 17 00:00:00 2001
+From: Alessandro Bono <alessandro.bono369@gmail.com>
+Date: Wed, 1 Nov 2023 12:35:44 +0100
+Subject: [PATCH] gdm-session: Pass the correct pointer type
+
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -3045,7 +3045,7 @@ free_pending_worker_connection (GdmSession *self,
+ worker_manager_interface = g_object_get_data (G_OBJECT (connection),
+ "gdm-dbus-worker-manager-interface");
+ if (worker_manager_interface != NULL) {
+- g_dbus_interface_skeleton_unexport (worker_manager_interface);
++ g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (worker_manager_interface));
+ g_object_set_data (G_OBJECT (connection),
+ "gdm-dbus-worker-manager-interface",
+ NULL);
+--
+GitLab
diff --git a/gnome-base/gdm/files/pam-elogind.patch b/gnome-base/gdm/files/pam-elogind.patch
deleted file mode 100644
index e17bed395b54..000000000000
--- a/gnome-base/gdm/files/pam-elogind.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 96e605d6bd832a89f022872492a9c9cb1eb62f66 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 19 Mar 2019 23:13:29 +0200
-Subject: [PATCH 2/2] pam-exherbo: Support elogind
-
----
- data/pam-exherbo/gdm-launch-environment.pam | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/pam-exherbo/gdm-launch-environment.pam b/data/pam-exherbo/gdm-launch-environment.pam
-index 51a8e003..c697a528 100644
---- a/data/pam-exherbo/gdm-launch-environment.pam
-+++ b/data/pam-exherbo/gdm-launch-environment.pam
-@@ -8,6 +8,7 @@ auth required pam_permit.so
-
- password required pam_deny.so
-
-+-session optional pam_elogind.so
- -session optional pam_systemd.so
- session optional pam_keyinit.so force revoke
- session required pam_succeed_if.so audit quiet_success user = gdm
---
-2.17.0
-
diff --git a/gnome-base/gdm/gdm-40.0-r1.ebuild b/gnome-base/gdm/gdm-40.0-r1.ebuild
deleted file mode 100644
index 538537d7e0f5..000000000000
--- a/gnome-base/gdm/gdm-40.0-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop gnome2 meson pam readme.gentoo-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
- branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
- GPL-2+
- branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="^^ ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
-# dbus-run-session used at runtime
-COMMON_DEPEND="
- virtual/udev
- >=dev-libs/glib-2.56:2
- >=x11-libs/gtk+-2.91.1:3
- >=media-libs/libcanberra-0.4[gtk3]
- >=sys-apps/accountsservice-0.6.35
- x11-libs/libxcb
- sys-apps/keyutils:=
- selinux? ( sys-libs/libselinux )
-
- x11-libs/libX11
- x11-libs/libXau
- x11-base/xorg-server[-minimal]
- x11-libs/libXdmcp
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-
- systemd? ( >=sys-apps/systemd-186:0=[pam] )
- elogind? ( >=sys-auth/elogind-239.3[pam] )
-
- plymouth? ( sys-boot/plymouth )
- audit? ( sys-process/audit )
-
- sys-libs/pam
- sys-auth/pambase[elogind?,systemd?]
-
- >=gnome-base/dconf-0.20
- >=gnome-base/gnome-settings-daemon-3.1.4
- gnome-base/gsettings-desktop-schemas
- sys-apps/dbus
-
- >=x11-misc/xdg-utils-1.0.2-r3
-
- >=dev-libs/gobject-introspection-0.9.12:=
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-RDEPEND="${COMMON_DEPEND}
- acct-group/gdm
- acct-user/gdm
- >=gnome-base/gnome-session-3.6
- >=gnome-base/gnome-shell-3.1.90
- x11-apps/xhost
-
- accessibility? (
- >=app-accessibility/orca-3.10
- gnome-extra/mousetweaks
- )
- fprint? ( sys-auth/fprintd[pam] )
-"
-DEPEND="${COMMON_DEPEND}
- x11-base/xorg-proto
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- dev-util/glib-utils
- dev-util/itstool
- >=gnome-base/dconf-0.20
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? ( >=dev-libs/check-0.9.4 )
- app-text/yelp-tools
-"
-
-DOC_CONTENTS="
- To make GDM start at boot with systemd, run:\n
- # systemctl enable gdm.service\n
- \n
- To make GDM start at boot with OpenRC, edit /etc/conf.d to have
- DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
- # rc-update add xdm
- \n
- For passwordless login to unlock your keyring, you need to install
- sys-auth/pambase with USE=gnome-keyring and set an empty password
- on your keyring. Use app-crypt/seahorse for that.\n
- \n
- You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
- for smartcard support
-"
-
-PATCHES=(
- # Gentoo does not have a fingerprint-auth pam stack
- "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
- # Add elogind support
- "${FILESDIR}/${P}-meson-allow-building-with-elogind.patch"
-
- # Support pam_elogind.so in gdm-launch-environment.pam
- "${FILESDIR}/pam-elogind.patch"
-
- "${FILESDIR}"/${P}-meson-Fix-libwrap-detection.patch
-)
-
-src_prepare() {
- default
-
- # Show logo when branding is enabled
- use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch"
-}
-
-src_configure() {
- # --with-initial-vt=7 conflicts with plymouth, bug #453392
- # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which
- # saves on memory. However this means if we don't start on VT1, gdm doesn't start up
- # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1,
- # so lets try always having it in VT1 and see if that is an issue for people before
- # hacking up workarounds for the initial start case.
- local emesonargs=(
- --localstatedir /var
-
- -Ddefault-pam-config=exherbo
- -Dgdm-xsession=true
- -Dgroup=gdm
- $(meson_use ipv6)
- $(meson_feature audit libaudit)
- -Dlogind-provider=$(usex systemd systemd elogind)
- -Dpam-mod-dir=$(getpam_mod_dir)
- $(meson_feature plymouth)
- -Drun-dir=/run/gdm
- $(meson_feature selinux)
- $(meson_use systemd systemd-journal)
- $(meson_use tcpd tcp-wrappers)
- -Dudev-dir=$(get_udevdir)/rules.d
- -Duser=gdm
- -Duser-display-server=true
- $(meson_use wayland wayland-support)
- -Dxdmcp=enabled
- )
-
- if use elogind; then
- emesonargs+=(
- -Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility
- -Dsystemdsystemunitdir=no
- -Dsystemduserunitdir=no
- )
- else
- emesonargs+=(
- -Dinitial-vt=1
- -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
- -Dsystemduserunitdir="$(systemd_get_userunitdir)"
- )
- fi
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- if ! use accessibility ; then
- rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
- fi
-
- if ! use bluetooth-sound ; then
- # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10
- # bug #679526
- insinto /var/lib/gdm/.config/pulse
- doins "${FILESDIR}"/default.pa
- fi
-
- # install XDG_DATA_DIRS gdm changes
- echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
- doenvd 99xdg-gdm
-
- use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- local d ret
-
- # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
- ret=0
- ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
- chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
- for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
- [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
- done
- eend ${ret}
-
- systemd_reenable gdm.service
- readme.gentoo_print_elog
-}
diff --git a/gnome-base/gdm/gdm-40.1.ebuild b/gnome-base/gdm/gdm-45.0.1-r1.ebuild
index 5112360b459b..fe286d39a562 100644
--- a/gnome-base/gdm/gdm-40.1.ebuild
+++ b/gnome-base/gdm/gdm-45.0.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-inherit desktop gnome2 meson pam readme.gentoo-r1 systemd toolchain-funcs udev
+inherit desktop gnome2 meson pam readme.gentoo-r1 systemd udev
DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
+HOMEPAGE="https://wiki.gnome.org/Projects/GDM https://gitlab.gnome.org/GNOME/gdm"
SRC_URI="${SRC_URI}
branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
@@ -19,17 +19,19 @@ LICENSE="
SLOT="0"
-IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland"
+IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland"
RESTRICT="!test? ( test )"
REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
# dconf, dbus and g-s-d are needed at install time for dconf update
-# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
+# keyutils is automagic dep that makes autologin unlock login keyring
+# when all the passwords match (disk encryption, user pw and login keyring)
# dbus-run-session used at runtime
COMMON_DEPEND="
virtual/udev
+ >=dev-libs/libgudev-232:=
>=dev-libs/glib-2.56:2
>=x11-libs/gtk+-2.91.1:3
>=media-libs/libcanberra-0.4[gtk3]
@@ -93,12 +95,12 @@ BDEPEND="
"
DOC_CONTENTS="
- To make GDM start at boot with systemd, run:\n
+ To start GDM at boot with systemd, run:\n
# systemctl enable gdm.service\n
\n
- To make GDM start at boot with OpenRC, edit /etc/conf.d to have
- DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n
- # rc-update add xdm
+ To start GDM at boot with OpenRC, set DISPLAYMANAGER=\"gdm\"\n
+ in /etc/conf.d/display-manager and enable the display-manager service:\n
+ # rc-update add display-manager\n
\n
For passwordless login to unlock your keyring, you need to install
sys-auth/pambase with USE=gnome-keyring and set an empty password
@@ -109,14 +111,7 @@ DOC_CONTENTS="
"
PATCHES=(
- # Gentoo does not have a fingerprint-auth pam stack
- "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
- # Add elogind support
- "${FILESDIR}/${PN}-40.0-meson-allow-building-with-elogind.patch"
-
- # Support pam_elogind.so in gdm-launch-environment.pam
- "${FILESDIR}/pam-elogind.patch"
+ "${FILESDIR}"/${PN}-45.0.1-c99.patch
)
src_prepare() {
@@ -139,7 +134,7 @@ src_configure() {
-Ddefault-pam-config=exherbo
-Dgdm-xsession=true
-Dgroup=gdm
- $(meson_use ipv6)
+ -Dipv6=true
$(meson_feature audit libaudit)
-Dlogind-provider=$(usex systemd systemd elogind)
-Dpam-mod-dir=$(getpam_mod_dir)
@@ -201,7 +196,7 @@ pkg_postinst() {
# bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm
ret=0
- ebegin "Fixing "${EROOT}"/var/lib/gdm ownership"
+ ebegin "Fixing ${EROOT}/var/lib/gdm ownership"
chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1
for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do
[[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1
@@ -210,4 +205,10 @@ pkg_postinst() {
systemd_reenable gdm.service
readme.gentoo_print_elog
+
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
}
diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
index 1bf3d45bbdf0..badb7ce5e45a 100644
--- a/gnome-base/gdm/metadata.xml
+++ b/gnome-base/gdm/metadata.xml
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="bluetooth-sound">Allow loading of bluetooth sound modules.
- This may be necessary for accessibility screen readers, but may cause bluetooth
- sound issues for users logging in.</flag>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session management</flag>
- <flag name="fprint">Enables experimental fingerprint authentication using
- <pkg>sys-auth/fprintd</pkg></flag>
- <flag name="plymouth">Enable support for smooth transition from
- <pkg>sys-boot/plymouth</pkg></flag>
-</use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="bluetooth-sound">Allow loading of bluetooth sound modules. This may be necessary for accessibility screen readers, but may cause bluetooth sound issues for users logging in.</flag>
+ <flag name="fprint">Enables experimental fingerprint authentication using <pkg>sys-auth/fprintd</pkg></flag>
+ <flag name="plymouth">Enable support for smooth transition from <pkg>sys-boot/plymouth</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gdm</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index a2c328d0174c..34b312537bed 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-applets-3.36.4.tar.xz 8638044 BLAKE2B 1ccf045c568ca2d4280eeeebbaec67b63f9c2f1edd3248ef89ff93ef7d468e6a581f3c678e93ff45662368b9ecd189aa38da2ca91a7b14ed3e7b2bd6aac8971f SHA512 6fd8f891358f02f40c8d6548b1680139f18cbbcd20d773798a998246b6431692ce8550e8652eaff09bde3651a4e5449779a0dc85b897345a22c17be2e386d2c7
-DIST gnome-applets-3.40.0.tar.xz 9390340 BLAKE2B 0d8e76086e444789b7a327623db9b21ef0a51f071b67aa5d99dc3e7988be40ec353ced795aaa1acbbe8d1b303d3878e2a0589214dac10f35ab2e40381ee64978 SHA512 909a1e9ecbe6904537b7408239a17aad265890cf179c4b8929968fa4d8ba6f1ac1f6e98612eb9c54266d3abacaaa7ed0e218f41b081b7539532527a3234fc037
+DIST gnome-applets-3.46.0.tar.xz 9248780 BLAKE2B 5bc61dbbb2f6a7c96a9ad6895936996025bfc6d99ac29ff552e62e5061866b1ef30384d6adecefee933cbb533184a47cb6c40c5c8c7562d4892817aa73628dab SHA512 826abf56f76925f0246b49194b09ec9ae43963c43e3f861269ab839c08823bb2b8b1b47cd20a93495bfef0d4220ef579190f0dd491c3cb2ed70fdd0483b1f007
+DIST gnome-applets-3.50.0.tar.xz 9257700 BLAKE2B ce085b1dc352ca267eeb725c3da4903e2017a385759236914707fdc5963e8f2a7eb6b06ce9b8d6a55240cc23ceb94a18474a0c5594c0e8801a2a929ed6cf9d0e SHA512 81eca5e87802e0c146cf6f327653b36e2bc62dc6a294306037139e1deba2f01c30b8d1700960d60b74e405ea98a876e7bed4e32539f37b89dd0091bfc98f20a9
diff --git a/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild b/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild
deleted file mode 100644
index 91a8bbf9357f..000000000000
--- a/gnome-base/gnome-applets/gnome-applets-3.36.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Applets for the GNOME Flashback Panel"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
-
-LICENSE="GPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="ipv6 tracker upower"
-KEYWORDS="~amd64"
-
-# FIXME: automagic wireless-tools
-# TODO: gucharmap could be optional, but no knob
-# TODO: libgweather could be optional, but no knob
-RDEPEND="
- >=x11-libs/gtk+-3.20.0:3[X]
- >=dev-libs/glib-2.44.0:2
- >=gnome-base/gnome-panel-3.24.1
- >=gnome-base/libgtop-2.11.92:=
- >=x11-libs/libwnck-3.14.1:3
- >=x11-libs/libnotify-0.7
- upower? ( >=sys-power/upower-0.99.8:= )
- >=x11-themes/adwaita-icon-theme-3.14.0
- >=dev-libs/libxml2-2.5.0:2
- >=dev-libs/libgweather-3.28.0:2=
- >=gnome-extra/gucharmap-2.33.0:2.90
- >=sys-auth/polkit-0.97
- x11-libs/libX11
- tracker? ( app-misc/tracker:0/2.0 )
-"
-# app-text/docbook-sgml-utils for jw binary
-DEPEND="${RDEPEND}
- app-text/docbook-sgml-utils
- app-text/docbook-xml-dtd:4.1.2
- dev-libs/libxslt
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=dev-util/intltool-0.35.0
- dev-util/itstool
- sys-devel/gettext
- x11-base/xorg-proto
- virtual/pkgconfig
-" # yelp-tools and autoconf-archive for eautoreconf
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_with upower) \
- --disable-battstat \
- --disable-cpufreq \
- $(use_enable tracker tracker-search-bar) \
- $(use_enable ipv6)
-}
diff --git a/gnome-base/gnome-applets/gnome-applets-3.40.0-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-3.46.0.ebuild
index 4320fd2e92f1..39402f8d8618 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.40.0-r1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.46.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome2
DESCRIPTION="Applets for the GNOME Flashback Panel"
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
LICENSE="GPL-2+ FDL-1.1"
SLOT="0"
IUSE="tracker"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~riscv"
# FIXME: automagic wireless-tools
# TODO: gucharmap could be optional, but no knob
@@ -18,30 +18,30 @@ KEYWORDS="~amd64"
RDEPEND="
>=x11-libs/gtk+-3.20.0:3[X]
>=dev-libs/glib-2.44.0:2
- >=gnome-base/gnome-panel-3.37.0
+ >=gnome-base/gnome-panel-3.41.1
>=gnome-base/libgtop-2.11.92:=
- >=x11-libs/libwnck-3.14.1:3
+ >=x11-libs/libwnck-43.0:3
>=x11-libs/libnotify-0.7
+ >=sys-power/upower-0.99.8:=
>=x11-themes/adwaita-icon-theme-3.14.0
>=dev-libs/libxml2-2.5.0:2
- >=dev-libs/libgweather-3.28.0:2=
+ >=dev-libs/libgweather-4.2.0:4=
>=gnome-extra/gucharmap-2.33.0:2.90
>=sys-auth/polkit-0.97
x11-libs/libX11
tracker? ( app-misc/tracker:3 )
+ >=x11-libs/pango-1.50.0
"
DEPEND="${RDEPEND}
x11-base/xorg-proto
"
-# app-text/docbook-sgml-utils for jw binary
BDEPEND="
- app-text/docbook-sgml-utils
app-text/docbook-xml-dtd:4.1.2
dev-libs/libxslt
dev-util/gdbus-codegen
dev-util/glib-utils
dev-util/itstool
- sys-devel/gettext
+ >=sys-devel/gettext-0.19.6
virtual/pkgconfig
" # yelp-tools and autoconf-archive for eautoreconf
diff --git a/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild b/gnome-base/gnome-applets/gnome-applets-3.50.0.ebuild
index 52182b3d367b..791ca5d4c863 100644
--- a/gnome-base/gnome-applets/gnome-applets-3.40.0.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-3.50.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome2
DESCRIPTION="Applets for the GNOME Flashback Panel"
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-applets/"
LICENSE="GPL-2+ FDL-1.1"
SLOT="0"
IUSE="tracker"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~riscv"
# FIXME: automagic wireless-tools
# TODO: gucharmap could be optional, but no knob
@@ -18,36 +18,35 @@ KEYWORDS="~amd64"
RDEPEND="
>=x11-libs/gtk+-3.20.0:3[X]
>=dev-libs/glib-2.44.0:2
- >=gnome-base/gnome-panel-3.37.0
+ >=gnome-base/gnome-panel-3.41.1
>=gnome-base/libgtop-2.11.92:=
- >=x11-libs/libwnck-3.14.1:3
+ >=x11-libs/libwnck-43.0:3
>=x11-libs/libnotify-0.7
+ >=sys-power/upower-0.99.8:=
>=x11-themes/adwaita-icon-theme-3.14.0
>=dev-libs/libxml2-2.5.0:2
- >=dev-libs/libgweather-3.28.0:2=
+ >=dev-libs/libgweather-4.2.0:4=
>=gnome-extra/gucharmap-2.33.0:2.90
>=sys-auth/polkit-0.97
x11-libs/libX11
- tracker? ( app-misc/tracker:0/2.0 )
+ tracker? ( app-misc/tracker:3 )
+ >=x11-libs/pango-1.50.0
"
DEPEND="${RDEPEND}
x11-base/xorg-proto
"
-# app-text/docbook-sgml-utils for jw binary
BDEPEND="
- app-text/docbook-sgml-utils
app-text/docbook-xml-dtd:4.1.2
dev-libs/libxslt
dev-util/gdbus-codegen
dev-util/glib-utils
dev-util/itstool
- sys-devel/gettext
+ >=sys-devel/gettext-0.19.6
virtual/pkgconfig
" # yelp-tools and autoconf-archive for eautoreconf
src_configure() {
gnome2_src_configure \
--disable-static \
- --disable-cpufreq \
$(use_enable tracker tracker-search-bar)
}
diff --git a/gnome-base/gnome-applets/metadata.xml b/gnome-base/gnome-applets/metadata.xml
index 3f95a043b18e..4aa4279c967a 100644
--- a/gnome-base/gnome-applets/metadata.xml
+++ b/gnome-base/gnome-applets/metadata.xml
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="tracker">Build the tracker search bar applet</flag>
-</use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>flow@gentoo.org</email>
+ <name>Florian Schmaus</name>
+ </maintainer>
+ <use>
+ <flag name="tracker">Build the tracker search bar applet</flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-applets</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
deleted file mode 100644
index 3b97fbda242f..000000000000
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Common files for development of Gnome packages"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-common"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND=""
-
-src_configure() {
- # Force people to rely on sys-devel/autoconf-archive, bug #594084
- gnome2_src_configure --with-autoconf-archive
-}
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild
new file mode 100644
index 000000000000..e9ded7f49b86
--- /dev/null
+++ b/gnome-base/gnome-common/gnome-common-3.18.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+DESCRIPTION="Common files for development of Gnome packages"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-common"
+
+LICENSE="GPL-3"
+SLOT="3"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+src_configure() {
+ # Force people to rely on dev-build/autoconf-archive, bug #594084
+ gnome2_src_configure --with-autoconf-archive
+}
diff --git a/gnome-base/gnome-common/metadata.xml b/gnome-base/gnome-common/metadata.xml
index 7b343b06be8a..8b6545dab90b 100644
--- a/gnome-base/gnome-common/metadata.xml
+++ b/gnome-base/gnome-common/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-common</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index aa6db5a0d583..a06257574c6f 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,5 @@
-DIST gnome-control-center-40.0-patchset-2.tar.xz 7396 BLAKE2B 9d3c0461c065cbf0f2051847e516066a38ebffc0972f12060fc41a7d283dd0eecd1a3e581518e13c1dcd545d600e7a2bece5d33d10e8c50adcb2b05f9558e8d0 SHA512 3a93c0c2f0f2bc422e6992c259334d9a90678151882e2df3035e4c233fa8e6c557073cc6679044b27bbfaafaa06d59b76724154dcd63612724e1e89817c99a36
-DIST gnome-control-center-40.0.tar.xz 6463616 BLAKE2B 7c79b79a0cb9bb847cdeb31613e9520b446f7720031fc7cda927a82b6e0acc6af03a047fe296a45f6e171c4ab1659b4ed5c6d07f83c9ffa554b1bdcce6fa26fe SHA512 26980cd18c414b12d2bf7e61be200e02302e170d53aba4f064154eda4c006648160919b6d4c9d168d8c5a461c05dc6593a52066b144af577c6aac420b9723cb9
+DIST gnome-control-center-45.0-patchset.tar.xz 5888 BLAKE2B 7b7d818392e8758ca4d9247f55b84e4e8a37419859040e35d8fb3cef16f09423ad74a88a821a5f5947b3f36543ccc328f9a61cb71f92155b6a14669732569910 SHA512 e58adc6bb61d04f8c5ecf36335fedd190e063e42eed8e1023dcac95665a270d57c7cbd377fd0f5239f2c144040a9699b428536ffdbac798655b2c9aef25e71ae
+DIST gnome-control-center-45.3.tar.xz 7757512 BLAKE2B 2f38b9b6a5c7171eefd8899bb9156b49f6b41f60ce2bfb36d7ade7261cd038ddb60bcc9a6a71e6c49209f0f3c13c49b38758a19f02cc9735cea2874368602434 SHA512 0aad27f3324940292551c0aa9fa79771d1d41cc5a633970c709836a2d6af575f688df8553755f936495f75a02268a5a1f89e7f3b5fb03512140c73bf14fc4cf5
+DIST gnome-control-center-45.4.tar.xz 7764264 BLAKE2B 5e3632901b1203fc71b839a71aad50f63741412dfc673b8b8f87c72716fda386a1c7641b64642be811f94d6b2c54263deb45c4624d828ec66726d2a833a272e4 SHA512 d16b3c1cffeb7db27e9743106b6bc7ad925a832162764d0714b4931d0c21c9e02137b5b5e101be93dd8a92aebaa8556f6ce52e83c5e05e9e3d7e40d46b8c11d5
+DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 570e9326b8abe45849c31fd5cdb3fcfb1b2f18eac522f958928df5c3b747b0699f50a882f31cf7c0ae1f2138194f18596f738f42c942b57d340c53d46d82c551 SHA512 91227dafcf2091bb1568b0f9eec68b5e371ec64c9a6bc3605821f60d6bf2bd94dec0564f6a16a4a70d1db4d4df49fc25b6c910367bae3b85205cc609a9f2701b
+DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527 SHA512 cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b
diff --git a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45.3.ebuild
index 61e996591618..2d9ce59348c8 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-40.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-45.3.ebuild
@@ -1,81 +1,86 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
+inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg
DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-40.0-patchset-2.tar.xz"
-
-LICENSE="GPL-2+"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-45.0-patchset.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg"
+# Logo is CC-BY-SA-2.5
+LICENSE="GPL-2+ CC-BY-SA-2.5"
SLOT="2"
-IUSE="+bluetooth +cups debug elogind flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test v4l wayland"
+IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
RESTRICT="!test? ( test )"
REQUIRED_USE="
- flickr? ( gnome-online-accounts )
^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}"
+" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime,
+# but needs testing if handled gracefully enough
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
# kerberos unfortunately means mit-krb5; build fails with heimdal
# display panel requires colord and gnome-settings-daemon[colord]
# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
+# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional).
+# Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
DEPEND="
- >=gui-libs/libhandy-1:1=
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
- >=media-sound/pulseaudio-2.0[glib]
+ gnome-online-accounts? (
+ x11-libs/gtk+:3
+ >=net-libs/gnome-online-accounts-3.25.3:=
+ )
+ >=media-libs/libpulse-2.0[glib]
+ >=gui-libs/gtk-4.11.2:4[X,wayland=]
+ >=gui-libs/libadwaita-1.4_alpha:1
>=sys-apps/accountsservice-0.6.39
>=x11-misc/colord-0.1.34:0=
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=dev-libs/glib-2.56.0:2
- >=gnome-base/gnome-desktop-3.33.4:3=
- >=gnome-base/gnome-settings-daemon-3.27.90[colord,input_devices_wacom?]
- >=gnome-base/gsettings-desktop-schemas-3.37.0
+ >=dev-libs/glib-2.75.0:2
+ gnome-base/gnome-desktop:4=
+ >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
+ >=gnome-base/gsettings-desktop-schemas-42_alpha
dev-libs/libxml2:2
- >=sys-auth/polkit-0.114
>=sys-power/upower-0.99.8:=
>=dev-libs/libgudev-232
- x11-libs/libX11
+ >=x11-libs/libX11-1.8
>=x11-libs/libXi-1.2
media-libs/libepoxy
- flickr? ( >=media-libs/grilo-0.3.0:0.3= )
- >=x11-libs/gtk+-3.22.0:3[X,wayland=]
+ app-crypt/gcr:0=
+ >=dev-libs/libpwquality-1.2.2
+ >=sys-auth/polkit-0.114
cups? (
>=net-print/cups-1.7[dbus]
>=net-fs/samba-4.0.0[client]
)
- v4l? (
- >=media-video/cheese-3.28.0 )
ibus? ( >=app-i18n/ibus-1.5.2 )
networkmanager? (
- >=net-libs/libnma-1.8.0
- >=net-misc/networkmanager-1.24.0:=[modemmanager]
- >=net-misc/modemmanager-0.7.990 )
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
- input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+ >=net-libs/libnma-1.10.2
+ >=net-misc/networkmanager-1.24.0[modemmanager]
+ >=net-misc/modemmanager-0.7.990:=
+ )
+ bluetooth? ( net-wireless/gnome-bluetooth:3= )
+ input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
kerberos? ( app-crypt/mit-krb5 )
x11-libs/cairo[glib]
- >=x11-libs/colord-gtk-0.1.24
- net-libs/libsoup:2.4
+ >=x11-libs/colord-gtk-0.3.0:=
media-libs/fontconfig
gnome-base/libgtop:2=
>=sys-fs/udisks-2.1.8:2
app-crypt/libsecret
+ net-libs/gnutls:=
media-libs/gsound
- >=dev-libs/libpwquality-1.2.2
+
+ x11-libs/pango
"
+# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in
+# Settings/Sound/Output/Output Device, bug #814110
# systemd/elogind USE flagged because package manager will potentially try to satisfy a
# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
#
@@ -86,27 +91,32 @@ DEPEND="
# system-config-printer provides org.fedoraproject.Config.Printing service and interface
# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
RDEPEND="${DEPEND}
+ media-libs/libcanberra[pulseaudio,sound]
systemd? ( >=sys-apps/systemd-31 )
- elogind? ( app-admin/openrc-settingsd
- sys-auth/elogind )
+ elogind? (
+ app-admin/openrc-settingsd
+ sys-auth/elogind
+ )
x11-themes/adwaita-icon-theme
>=gnome-extra/gnome-color-manager-3.1.2
cups? (
app-admin/system-config-printer
- net-print/cups-pk-helper )
- >=gnome-base/libgnomekbd-3
+ net-print/cups-pk-helper
+ )
+ gnome-extra/tecla
wayland? ( dev-libs/libinput )
!wayland? (
>=x11-drivers/xf86-input-libinput-0.19.0
- input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
- flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
+ input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
+ )
"
# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-BDEPEND="
+# meson.build depends on python unconditionally
+BDEPEND="${PYTHON_DEPS}
dev-libs/libxslt
app-text/docbook-xsl-stylesheets
app-text/docbook-xml-dtd:4.2
@@ -116,13 +126,15 @@ BDEPEND="
dev-util/glib-utils
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
- test? ( $(python_gen_any_dep '
- dev-python/python-dbusmock[${PYTHON_USEDEP}]
- ') )
+ test? (
+ $(python_gen_any_dep '
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
+ ')
+ x11-apps/setxkbmap
+ )
"
PATCHES=(
- # Patches from gnome-40 branch on top of 40.0
# Makes some panels and dependencies optional
# https://bugzilla.gnome.org/686840, 697478, 700145
# Fix some absolute paths to be appropriate for Gentoo
@@ -131,7 +143,7 @@ PATCHES=(
python_check_deps() {
use test || return 0
- has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
}
pkg_setup() {
@@ -139,35 +151,55 @@ pkg_setup() {
}
src_prepare() {
- xdg_src_prepare
+ default
+ xdg_environment_reset
# Mark python tests with shebang executable, so that meson will launch them directly, instead
# of via its own python-single-r1 version, which might not match what we get from python_check_deps
chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
}
src_configure() {
+ # -Werror=strict-aliasing
+ # https://bugs.gentoo.org/889008
+ # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563
+ #
+ # Do not trust with LTO either
+ append-flags -fno-strict-aliasing
+ filter-lto
+
local emesonargs=(
$(meson_use bluetooth)
- $(meson_use v4l cheese)
-Dcups=$(usex cups enabled disabled)
-Ddocumentation=true # manpage
-Dgoa=$(usex gnome-online-accounts enabled disabled)
- -Dgrilo=$(usex flickr enabled disabled)
$(meson_use ibus)
-Dkerberos=$(usex kerberos enabled disabled)
- -Dmalcontent=false # unpackaged
$(meson_use networkmanager network_manager)
-Dprivileged_group=wheel
-Dsnap=false
$(meson_use test tests)
- $(meson_use debug tracing)
$(meson_use input_devices_wacom wacom)
#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
- # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
+ # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2,
+ # which is the same as $(get_bashcompdir)
+ -Dmalcontent=false # unpackaged
+ -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg
+ -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg
)
meson_src_configure
}
+src_test() {
+ virtx meson_src_test
+}
+
+src_install() {
+ meson_src_install
+ insinto /usr/share/pixmaps
+ doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg
+ doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg
+}
+
pkg_postinst() {
xdg_pkg_postinst
gnome2_schemas_update
diff --git a/gnome-base/gnome-control-center/gnome-control-center-45.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45.4.ebuild
new file mode 100644
index 000000000000..e51277b7a52c
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-45.4.ebuild
@@ -0,0 +1,211 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-45.0-patchset.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg"
+# Logo is CC-BY-SA-2.5
+LICENSE="GPL-2+ CC-BY-SA-2.5"
+SLOT="2"
+IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ ^^ ( elogind systemd )
+" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime,
+# but needs testing if handled gracefully enough
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# display panel requires colord and gnome-settings-daemon[colord]
+# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
+# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
+# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional).
+# Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
+DEPEND="
+ gnome-online-accounts? (
+ x11-libs/gtk+:3
+ >=net-libs/gnome-online-accounts-3.25.3:=
+ )
+ >=media-libs/libpulse-2.0[glib]
+ >=gui-libs/gtk-4.11.2:4[X,wayland=]
+ >=gui-libs/libadwaita-1.4_alpha:1
+ >=sys-apps/accountsservice-0.6.39
+ >=x11-misc/colord-0.1.34:0=
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=dev-libs/glib-2.75.0:2
+ gnome-base/gnome-desktop:4=
+ >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
+ >=gnome-base/gsettings-desktop-schemas-42_alpha
+ dev-libs/libxml2:2
+ >=sys-power/upower-0.99.8:=
+ >=dev-libs/libgudev-232
+ >=x11-libs/libX11-1.8
+ >=x11-libs/libXi-1.2
+ media-libs/libepoxy
+ app-crypt/gcr:0=
+ >=dev-libs/libpwquality-1.2.2
+ >=sys-auth/polkit-0.114
+ cups? (
+ >=net-print/cups-1.7[dbus]
+ >=net-fs/samba-4.0.0[client]
+ )
+ ibus? ( >=app-i18n/ibus-1.5.2 )
+ networkmanager? (
+ >=net-libs/libnma-1.10.2
+ >=net-misc/networkmanager-1.24.0[modemmanager]
+ >=net-misc/modemmanager-0.7.990:=
+ )
+ bluetooth? ( net-wireless/gnome-bluetooth:3= )
+ input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
+ kerberos? ( app-crypt/mit-krb5 )
+
+ x11-libs/cairo[glib]
+ >=x11-libs/colord-gtk-0.3.0:=
+ media-libs/fontconfig
+ gnome-base/libgtop:2=
+ >=sys-fs/udisks-2.1.8:2
+ app-crypt/libsecret
+ net-libs/gnutls:=
+ media-libs/gsound
+
+ x11-libs/pango
+"
+# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in
+# Settings/Sound/Output/Output Device, bug #814110
+# systemd/elogind USE flagged because package manager will potentially try to satisfy a
+# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
+# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${DEPEND}
+ media-libs/libcanberra[pulseaudio,sound]
+ systemd? ( >=sys-apps/systemd-31 )
+ elogind? (
+ app-admin/openrc-settingsd
+ sys-auth/elogind
+ )
+ x11-themes/adwaita-icon-theme
+ >=gnome-extra/gnome-color-manager-3.1.2
+ cups? (
+ app-admin/system-config-printer
+ net-print/cups-pk-helper
+ )
+ gnome-extra/tecla
+ wayland? ( dev-libs/libinput )
+ !wayland? (
+ >=x11-drivers/xf86-input-libinput-0.19.0
+ input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
+ )
+"
+# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
+# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
+ networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
+
+# meson.build depends on python unconditionally
+BDEPEND="${PYTHON_DEPS}
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.2
+ x11-base/xorg-proto
+ dev-libs/libxml2:2
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? (
+ $(python_gen_any_dep '
+ dev-python/python-dbusmock[${PYTHON_USEDEP}]
+ ')
+ x11-apps/setxkbmap
+ )
+"
+
+PATCHES=(
+ # Makes some panels and dependencies optional
+ # https://bugzilla.gnome.org/686840, 697478, 700145
+ # Fix some absolute paths to be appropriate for Gentoo
+ "${WORKDIR}"/patches/
+)
+
+python_check_deps() {
+ use test || return 0
+ python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ xdg_environment_reset
+ # Mark python tests with shebang executable, so that meson will launch them directly, instead
+ # of via its own python-single-r1 version, which might not match what we get from python_check_deps
+ chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
+}
+
+src_configure() {
+ # -Werror=strict-aliasing
+ # https://bugs.gentoo.org/889008
+ # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563
+ #
+ # Do not trust with LTO either
+ append-flags -fno-strict-aliasing
+ filter-lto
+
+ local emesonargs=(
+ $(meson_use bluetooth)
+ -Dcups=$(usex cups enabled disabled)
+ -Ddocumentation=true # manpage
+ -Dgoa=$(usex gnome-online-accounts enabled disabled)
+ $(meson_use ibus)
+ -Dkerberos=$(usex kerberos enabled disabled)
+ $(meson_use networkmanager network_manager)
+ -Dprivileged_group=wheel
+ -Dsnap=false
+ $(meson_use test tests)
+ $(meson_use input_devices_wacom wacom)
+ #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
+ # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2,
+ # which is the same as $(get_bashcompdir)
+ -Dmalcontent=false # unpackaged
+ -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg
+ -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg
+ )
+ meson_src_configure
+}
+
+src_test() {
+ virtx meson_src_test
+}
+
+src_install() {
+ meson_src_install
+ insinto /usr/share/pixmaps
+ doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg
+ doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index d6a9c29d21a7..c0fa36df46f1 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="flickr">Add support for using photos from flickr as desktop background</flag>
- <flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
- <flag name="ibus">Enable support for enhanced input methods through <pkg>app-i18n/ibus</pkg></flag>
- </use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+ <flag name="ibus">Enable support for enhanced input methods through <pkg>app-i18n/ibus</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-control-center</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
deleted file mode 100644
index 078b240c3d3c..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-40.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sub-meta package for the core applications integrated with GNOME"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+bluetooth cups"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-
-# gnome-color-manager min version enforced here due to control-center pulling it in
-# tepl min version for gedit deptree
-RDEPEND="
- >=gnome-base/gnome-core-libs-${PV}[cups?]
-
- >=gnome-base/gnome-session-40.0
- >=gnome-base/gnome-settings-daemon-40.0[cups?]
- >=gnome-base/gnome-control-center-40.0[cups?]
- >=gnome-extra/gnome-color-manager-3.36.0
-
- >=app-crypt/gcr-3.38.1
- >=gnome-base/nautilus-40.0
- >=gnome-base/gnome-keyring-40.0
- >=gnome-extra/evolution-data-server-3.${PV}
-
- >=app-crypt/seahorse-40.0
- >=gui-libs/tepl-6.0.0
- >=app-editors/gedit-40.0
- >=app-text/evince-40.0
- >=gnome-extra/gnome-contacts-40.0
- >=media-gfx/eog-40.0
- >=media-video/totem-3.38.0
- >=x11-terms/gnome-terminal-3.40.0
-
- >=gnome-extra/gnome-user-docs-40.0
- >=gnome-extra/yelp-40.0
-
- >=x11-themes/adwaita-icon-theme-40.0
-
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.34.5 )
-"
-DEPEND=""
-BDEPEND=""
-
-# cdr? ( >=app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore
-# >=gnome-base/gnome-menus-3.13.3:3 # not used by core gnome anymore, just gnome-classic extensions
-# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-45.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-45.2.ebuild
new file mode 100644
index 000000000000..0784ed7ebe41
--- /dev/null
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-45.2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sub-meta package for the core applications integrated with GNOME"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="+bluetooth cups"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+
+# gnome-color-manager min version enforced here due to control-center pulling it in
+# glib-networking min version enforced as multiple other deps here rely on it (e.g. via libsoup)
+# TODO: Replace eog with loupe
+RDEPEND="
+ >=gnome-base/gnome-core-libs-${PV}[cups?]
+
+ >=gnome-base/gnome-session-45.0
+ >=gnome-base/gnome-settings-daemon-45.0[cups?]
+ >=gnome-base/gnome-control-center-45.1[cups?]
+ >=gnome-extra/gnome-color-manager-3.36.0
+
+ >=app-crypt/gcr-3.41.1:0
+ >=app-crypt/gcr-4.1.0:4
+ >=gnome-base/nautilus-45.2
+ >=gnome-base/gnome-keyring-42.1
+ >=gnome-extra/evolution-data-server-3.50.2
+ >=net-libs/glib-networking-2.78.0
+
+ || (
+ >=app-editors/gnome-text-editor-45.1
+ >=app-editors/gedit-46.1
+ )
+ >=app-text/evince-45.0
+ >=gnome-extra/gnome-contacts-45.0
+ >=media-gfx/eog-45.1
+ >=media-video/totem-43.0
+ || (
+ >=x11-terms/gnome-terminal-3.50.1
+ >=gui-apps/gnome-console-45.0
+ )
+
+ >=gnome-extra/gnome-user-docs-45.1
+ >=gnome-extra/yelp-42.2
+
+ >=x11-themes/adwaita-icon-theme-45.0
+
+ bluetooth? ( >=net-wireless/gnome-bluetooth-42.7 )
+"
+DEPEND=""
+BDEPEND=""
+
+# cdr? ( >=app-cdr/brasero-3.12.2 ) # not part of gnome releng release anymore
+# >=gnome-base/gnome-menus-3.13.3:3 # not used by core gnome anymore, just gnome-classic extensions
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
deleted file mode 100644
index e4a65565e587..000000000000
--- a/gnome-base/gnome-core-libs/gnome-core-libs-40.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sub-meta package for the core libraries of GNOME"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="cups python"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-# Note to developers:
-# This is a wrapper for the core libraries used by GNOME
-RDEPEND="
- >=dev-libs/glib-2.68.0:2
- >=x11-libs/gdk-pixbuf-2.42.4:2
- >=x11-libs/pango-1.48.3
- >=x11-libs/gtk+-3.24.27:3[cups?]
- >=dev-libs/atk-2.36.0
- >=gnome-base/librsvg-2.50.3
- >=gnome-base/gnome-desktop-${PV}:3
-
- >=gnome-base/gvfs-1.48.0
- >=gnome-base/dconf-0.40.0
-
- >=media-libs/gstreamer-1.16.2:1.0
- >=media-libs/gst-plugins-base-1.16.2:1.0
- >=media-libs/gst-plugins-good-1.16.2:1.0
-
- python? ( >=dev-python/pygobject-3.40.0:3 )
-"
-DEPEND=""
-BDEPEND=""
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-45.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-45.2.ebuild
new file mode 100644
index 000000000000..a689a9e9155b
--- /dev/null
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-45.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sub-meta package for the core libraries of GNOME"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="cups python"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+
+# Note to developers:
+# This is a wrapper for the core libraries used by GNOME
+RDEPEND="
+ >=dev-libs/glib-2.78.1:2
+ >=x11-libs/gdk-pixbuf-2.42.10:2
+ >=x11-libs/pango-1.51.0
+ >=x11-libs/gtk+-3.24.38:3[cups?]
+ >=gui-libs/gtk-4.12.4:4[cups?]
+ >=gui-libs/libadwaita-1.4.2:1
+ >=app-accessibility/at-spi2-core-2.50.0:2
+ >=gnome-base/librsvg-2.57.0
+ >=gnome-base/gnome-desktop-44.0:4
+
+ >=gnome-base/gvfs-1.52.1
+ >=gnome-base/dconf-0.40.0
+
+ >=media-libs/gstreamer-1.22.3:1.0
+ >=media-libs/gst-plugins-base-1.22.3:1.0
+ >=media-libs/gst-plugins-good-1.22.3:1.0
+
+ python? ( >=dev-python/pygobject-3.46.0:3 )
+"
+DEPEND=""
+BDEPEND=""
+
+S="${WORKDIR}"
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 08ca434122ad..b6d37d7b0af8 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1,3 +1 @@
-DIST gnome-desktop-40.2.tar.xz 721852 BLAKE2B a7258d0465b17c5c9c78a066acd72571c002054f196d847e07b10055b1d72900d6efc80ac623f118ff11a87a4d5042ac9902f7f3f9d5a181ad3d80429cf9f904 SHA512 2fd3ba5eb0263aecc43978d84070619c16af4de998b344bc2aaac16aa0e734d93235aa218c2684ad993b471136434b97dffae52f183798daaa4ec47574cc51b3
-DIST gnome-desktop-40.3.tar.xz 721788 BLAKE2B bfdb77995d8cb392805a9d4a7a1276608aa53ea7c73604b12817c1660176c4e0274ba6954523cd0bec067230520c2736ed77885726696e463c97d09992186243 SHA512 96f2069ec3eb1bd1f6c2056c73d268eed5521398818cc05c22cdedfd1c09805fe5abc7f450abc7752690e809f3bdca502dfc107564236bbb03e262531418804f
-DIST gnome-desktop-40.4.tar.xz 721840 BLAKE2B f663460ce6a2b2d03543e92eab9e2f127da4a7c8e800149842f5f30e4f885c104786806be8e8f32e0783003b18015d39b4501f3ceccdee0ab94206031bf671b4 SHA512 4e91438c17faa2d12e7d6a9914fe4308543bbd5f8821e94dee9052f087110e2a3776109c203de6ef7bf66ae1825fc5e890d969ce2ebab2654cc157e9629fe6fc
+DIST gnome-desktop-44.0.tar.xz 765764 BLAKE2B 3859b95c7cae0a46190335e707b07b0f9ca47238f9ebe2109c260d04627e8034ddaa7408b8bfb91d258d608279c32fd09a1477f860ccaf324f5a63da4b18a214 SHA512 707e96ffe1bbe27c448dd007b5a005e06ea3bba945c1c6708c61b8cec204cef6f5ed540f8ba0f5e566c2fdbc825fc6f9f0440706e0aea132490ca6d48823e180
diff --git a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch b/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
deleted file mode 100644
index 7471a3e6a2dc..000000000000
--- a/gnome-base/gnome-desktop/files/3.32.2-optional-introspection.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1b8fb6b0fd155975f64b5e2ef03bece96a5e3340 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Wed, 18 Sep 2019 22:28:21 +0300
-Subject: [PATCH] build: Add optionality for introspection
-
----
- libgnome-desktop/meson.build | 2 ++
- meson_options.txt | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
-index c365b448..a7355f31 100644
---- a/libgnome-desktop/meson.build
-+++ b/libgnome-desktop/meson.build
-@@ -96,6 +96,7 @@ libgnome_desktop_dep = declare_dependency(
- link_with: libgnome_desktop
- )
-
-+if get_option('introspection')
- gnome.generate_gir(libgnome_desktop,
- sources: introspection_sources + libgnome_desktop_headers,
- export_packages: 'gnome-desktop-3.0',
-@@ -107,6 +108,7 @@ gnome.generate_gir(libgnome_desktop,
- symbol_prefix: 'gnome',
- install: true
- )
-+endif
-
- desktop_pc = pkg.generate(
- libraries: libgnome_desktop,
-diff --git a/meson_options.txt b/meson_options.txt
-index e3402a11..7efe43ce 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -17,6 +17,10 @@ option('debug_tools',
- type: 'boolean', value: true, description: 'Build debug tools'
- )
-
-+option('introspection',
-+ type: 'boolean', value: true, description: 'Whether to build introspection files'
-+)
-+
- option('udev',
- type: 'feature', description: 'Udev support'
- )
---
-2.20.1
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild b/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild
deleted file mode 100644
index 2df7a40bf2c3..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-40.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Library with common API for various GNOME modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
- >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[X,introspection?]
- >=dev-libs/glib-2.53.0:2
- >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
- x11-misc/xkeyboard-config
- x11-libs/libxkbcommon
- app-text/iso-codes
- systemd? ( sys-apps/systemd:= )
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
- seccomp? ( sys-libs/libseccomp )
-
- x11-libs/cairo:=
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${COMMON_DEPEND}
- media-libs/fontconfig
-"
-RDEPEND="${COMMON_DEPEND}
- seccomp? ( sys-apps/bubblewrap )
-"
-BDEPEND="
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gdbus-codegen
- gtk-doc? ( >=dev-util/gtk-doc-1.14 )
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
- "${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
-
-src_prepare() {
- # Don't build manual test programs that will never get run
- sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- -Dgnome_distributor=Gentoo
- -Ddate_in_gnome_version=true
- -Ddesktop_docs=true
- $(meson_use debug debug_tools)
- $(meson_use introspection)
- $(meson_feature udev)
- $(meson_feature systemd)
- $(meson_use gtk-doc gtk_doc)
- -Dinstalled_tests=false
- )
- meson_src_configure
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-44.0-r300.ebuild
index e42379bab2e0..1a2cd0d51521 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.3.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-44.0-r300.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+EAPI=8
+inherit gnome.org meson xdg
DESCRIPTION="Library with common API for various GNOME modules"
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="3/20" # subslot = libgnome-desktop-3 soname version
+IUSE="debug +introspection seccomp systemd udev"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[X,introspection?]
+ >=x11-libs/gtk+-3.3.6:3[introspection?]
>=dev-libs/glib-2.53.0:2
>=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
x11-misc/xkeyboard-config
x11-libs/libxkbcommon
app-text/iso-codes
systemd? ( sys-apps/systemd:= )
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
+ udev? ( virtual/libudev:= )
seccomp? ( sys-libs/libseccomp )
- x11-libs/cairo:=
+ x11-libs/cairo
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
"
DEPEND="${COMMON_DEPEND}
@@ -34,39 +32,43 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
seccomp? ( sys-apps/bubblewrap )
+ !<gnome-base/gnome-desktop-${PV}:4
"
BDEPEND="
app-text/docbook-xml-dtd:4.1.2
dev-util/gdbus-codegen
- gtk-doc? ( >=dev-util/gtk-doc-1.14 )
dev-util/itstool
>=sys-devel/gettext-0.19.8
- x11-base/xorg-proto
virtual/pkgconfig
"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
- "${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
src_prepare() {
+ default
+ xdg_environment_reset
+
# Don't build manual test programs that will never get run
sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
- xdg_src_prepare
}
src_configure() {
local emesonargs=(
- -Dgnome_distributor=Gentoo
- -Ddate_in_gnome_version=true
- -Ddesktop_docs=true
+ -Ddesktop_docs=false
$(meson_use debug debug_tools)
$(meson_use introspection)
$(meson_feature udev)
$(meson_feature systemd)
- $(meson_use gtk-doc gtk_doc)
+ -Dgtk_doc=false
-Dinstalled_tests=false
+ -Dbuild_gtk4=false
+ -Dlegacy_library=true
)
meson_src_configure
}
+
+src_install() {
+ meson_src_install
+
+ rm -r \
+ "${ED}"/usr/share/locale \
+ || die
+}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-44.0-r400.ebuild
index e42379bab2e0..2d7da7e47dab 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-44.0-r400.ebuild
@@ -1,39 +1,38 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+EAPI=8
+inherit gnome.org meson xdg
DESCRIPTION="Library with common API for various GNOME modules"
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
-SLOT="3/19" # subslot = libgnome-desktop-3 soname version
-IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4/2" # subslot = libgnome-desktop-4 soname version
+IUSE="debug gtk-doc seccomp systemd udev"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
- >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
- >=x11-libs/gtk+-3.3.6:3[X,introspection?]
+ >=x11-libs/gdk-pixbuf-2.36.5:2[introspection]
+ >=gui-libs/gtk-4.4.0:4[introspection]
>=dev-libs/glib-2.53.0:2
- >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
+ >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection]
x11-misc/xkeyboard-config
x11-libs/libxkbcommon
app-text/iso-codes
systemd? ( sys-apps/systemd:= )
- udev? (
- sys-apps/hwids
- virtual/libudev:= )
+ udev? ( virtual/libudev:= )
seccomp? ( sys-libs/libseccomp )
- x11-libs/cairo:=
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ x11-libs/cairo
+ >=dev-libs/gobject-introspection-1.54:=
"
DEPEND="${COMMON_DEPEND}
media-libs/fontconfig
"
RDEPEND="${COMMON_DEPEND}
seccomp? ( sys-apps/bubblewrap )
+ !<gnome-base/gnome-desktop-${PV}:3
"
BDEPEND="
app-text/docbook-xml-dtd:4.1.2
@@ -41,32 +40,28 @@ BDEPEND="
gtk-doc? ( >=dev-util/gtk-doc-1.14 )
dev-util/itstool
>=sys-devel/gettext-0.19.8
- x11-base/xorg-proto
virtual/pkgconfig
"
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xorg-proto
-
-PATCHES=(
- "${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection meson option
-)
src_prepare() {
+ default
+ xdg_environment_reset
+
# Don't build manual test programs that will never get run
sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
- xdg_src_prepare
}
src_configure() {
local emesonargs=(
- -Dgnome_distributor=Gentoo
- -Ddate_in_gnome_version=true
-Ddesktop_docs=true
$(meson_use debug debug_tools)
- $(meson_use introspection)
$(meson_feature udev)
$(meson_feature systemd)
$(meson_use gtk-doc gtk_doc)
-Dinstalled_tests=false
+ -Dbuild_gtk4=true
+ -Dlegacy_library=false
+ -Dintrospection=true
)
meson_src_configure
}
diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
index f453528b934f..eb837cfc3900 100644
--- a/gnome-base/gnome-desktop/metadata.xml
+++ b/gnome-base/gnome-desktop/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-desktop</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
deleted file mode 100644
index d0d3c16cdc4f..000000000000
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-40.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Sub-meta package for the applications of GNOME"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+games share +shotwell +tracker"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-# Note to developers:
-# This is a wrapper for the extra apps integrated with GNOME
-# Keep pkg order within a USE flag as upstream releng versions file
-# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer, vinagre; replace gucharmap with gnome-characters?
-# TODO: Add gnome-remote-desktop as replacement for vino that was removed from meta in 3.36?
-# gnome-documents removed for now, as it didn't find a good place upstream and is getting dropped from default sets for distros for 3.30 (and for 3.26 it required newer tracker than we had at the time)
-RDEPEND="
- >=gnome-base/gnome-core-libs-${PV}
-
- >=sys-apps/baobab-40.0
- >=media-video/cheese-3.38.0
- >=www-client/epiphany-40.0
- >=app-arch/file-roller-3.38.0
- >=gnome-extra/gnome-calculator-40.0
- >=gnome-extra/gnome-calendar-40.0
- >=gnome-extra/gnome-characters-40.0
- >=sys-apps/gnome-disk-utility-40.0
- >=media-gfx/gnome-font-viewer-40.0
- >=media-gfx/gnome-screenshot-40.0
- >=gnome-extra/gnome-system-monitor-40.0
- >=gnome-extra/gnome-weather-40.0
- >=gnome-extra/gucharmap-13.0.7:2.90
- >=gnome-extra/sushi-3.38.0
- >=media-sound/sound-juicer-3.38.0
-
- >=gnome-base/dconf-editor-3.38.3
- >=app-dicts/gnome-dictionary-40.0
- >=mail-client/evolution-3.${PV}
- >=gnome-extra/gnome-tweaks-40.0
- >=gnome-extra/nautilus-sendto-3.8.6
- >=net-misc/vinagre-3.22.0
-
- games? (
- >=games-puzzle/five-or-more-3.32.2
- >=games-board/four-in-a-row-3.38.1
- >=games-board/gnome-chess-40.0
- >=games-puzzle/gnome-klotski-3.38.2
- >=games-board/gnome-mahjongg-3.38.3
- >=games-board/gnome-mines-40.0
- >=games-arcade/gnome-nibbles-3.38.2
- >=games-arcade/gnome-robots-40.0
- >=games-puzzle/gnome-sudoku-40.0
- >=games-puzzle/gnome-taquin-3.38.1
- >=games-puzzle/gnome-tetravex-3.38.2
- >=games-puzzle/hitori-3.36.0
- >=games-board/iagno-3.38.1
- >=games-puzzle/lightsoff-40.0
- >=games-puzzle/quadrapassel-3.38.1
- >=games-puzzle/swell-foop-40.0
- >=games-board/tali-40.0
- )
- share? ( >=gnome-extra/gnome-user-share-3.34.0 )
- shotwell? ( >=media-gfx/shotwell-0.30.11 )
- tracker? (
- >=app-misc/tracker-3
- >=app-misc/tracker-miners-3
- >=media-gfx/gnome-photos-40.0
- >=media-sound/gnome-music-40.0
- )
-"
-DEPEND=""
-BDEPEND=""
-S=${WORKDIR}
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-45.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-45.2.ebuild
new file mode 100644
index 000000000000..d151143ce737
--- /dev/null
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-45.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Sub-meta package for the applications of GNOME"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="+games share +shotwell +tracker"
+
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
+
+# Note to developers:
+# This is a wrapper for the extra apps integrated with GNOME
+# Keep pkg order within a USE flag as upstream releng versions file
+# TODO: Should we keep these here: gnome-dictionary, gucharmap, sound-juicer, file-roller, nautilus-sendto, gnome-photos; replace gucharmap with gnome-characters?
+# TODO: Add gnome-remote-desktop as replacement for vino that was removed from meta in 3.36?
+# TODO: Replace cheese with Snapshot once we have it packaged
+# TODO: Update epiphany min dep
+RDEPEND="
+ >=gnome-base/gnome-core-libs-${PV}
+
+ >=sys-apps/baobab-45.0
+ >=media-video/cheese-44.1
+ >=www-client/epiphany-44.6
+ >=app-arch/file-roller-43.1
+ >=gnome-extra/gnome-calculator-45.0.2
+ >=gnome-extra/gnome-calendar-45.1
+ >=gnome-extra/gnome-characters-45.0
+ >=sys-apps/gnome-disk-utility-45.1
+ >=media-gfx/gnome-font-viewer-45.0
+ >=gnome-extra/gnome-system-monitor-45.0.2
+ >=gnome-extra/gnome-weather-45.0
+ >=gnome-extra/sushi-45.0
+
+ >=gnome-base/dconf-editor-45.0.1
+ >=mail-client/evolution-3.50.2
+ >=gnome-extra/gnome-tweaks-45.0
+ >=gnome-extra/nautilus-sendto-3.8.6
+ >=app-crypt/seahorse-43.0
+
+ games? (
+ >=games-puzzle/five-or-more-3.32.3
+ >=games-board/four-in-a-row-3.38.1
+ >=games-board/gnome-chess-43.2
+ >=games-puzzle/gnome-klotski-3.38.2
+ >=games-board/gnome-mahjongg-3.40.0
+ >=games-board/gnome-mines-40.1
+ >=games-arcade/gnome-nibbles-4.0.1
+ >=games-arcade/gnome-robots-40.0
+ >=games-puzzle/gnome-sudoku-45.2
+ >=games-puzzle/gnome-taquin-3.38.1
+ >=games-puzzle/gnome-tetravex-3.38.2
+ >=games-puzzle/hitori-44.0
+ >=games-board/iagno-3.38.1
+ >=games-puzzle/lightsoff-40.0.1
+ >=games-puzzle/quadrapassel-40.2
+ >=games-puzzle/swell-foop-41.1
+ >=games-board/tali-40.9
+ )
+ share? ( >=gnome-extra/gnome-user-share-43.0 )
+ shotwell? ( >=media-gfx/shotwell-0.32.4 )
+ tracker? (
+ >=app-misc/tracker-3.6.0
+ >=app-misc/tracker-miners-3.6.2
+ >=media-gfx/gnome-photos-44.0
+ >=media-sound/gnome-music-45.0
+ )
+"
+DEPEND=""
+BDEPEND=""
+S=${WORKDIR}
diff --git a/gnome-base/gnome-flashback/Manifest b/gnome-base/gnome-flashback/Manifest
index 433946dd177a..6db1ec9266da 100644
--- a/gnome-base/gnome-flashback/Manifest
+++ b/gnome-base/gnome-flashback/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-flashback-3.36.4.tar.xz 826568 BLAKE2B 6625b3a2d90649b9476d6340295b3cf8960f76908c23d75fe7b2a886d1a5c6a587bc8cb31ab866a40f2250b67d154a080f27534aaa11e822d901fc1cac0687af SHA512 6c1b910872530a86d6fb477ad55c8c44cbe5ef958073e2c675d95b9b4dbf9aab0d0a3b3cdae2daebbe3dad8a83c53ffe0604e12282864bfdee33402e119eff32
-DIST gnome-flashback-3.40.0.tar.xz 857104 BLAKE2B 41711edc4687682dd48134e452297bef7d0c4db93532bfd4bd49f19f2f01eab7c887b584f412384057e8a2b65a937446a108df0c4cfd811085c161a212e19355 SHA512 b938d12c437926e64567388b1a97350b76883cf91c009c1f57d4963321497ebdf69b094c7d88a86e5bf805930b88ff2637e522ac4f9981a391206a03d23a521e
+DIST gnome-flashback-3.46.0.tar.xz 892424 BLAKE2B f752687a07d8b5205aebed47e0ece8b77edc32aa9fa934b9e14234119d3bf074b528eb1af8ea5841ca20c2f91511eac40e6a708835542bbdc8ea4e1d364984e8 SHA512 845d9cf3551295bc6dcaeeb141875ddb875e8cf885a2a3b17c4234dd40b37b8ed5279f07414c4cc7590369b394a7270c48d34d767bd0d1ef0189f4b73e73da10
+DIST gnome-flashback-3.50.0.tar.xz 907036 BLAKE2B a995ab42fad19b566ff07c9f745a6a8ba3efab3e9201b72a813a4bc91976d2b5150b84cd1cbeb62e22ccead3d9bb17143ce793a699a0699d5223e021598c0fbc SHA512 1c6b5569f01870f9e55f22b5ba34dd7ba54d5d61fa3a1096e906ea0e0919e0af2f3a6e2dd95c8e0952aead80e207f1319faa4f657a5d3350fd73caddb55c7062
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.40.0.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.46.0.ebuild
index e7af2b142290..27afadfa314c 100644
--- a/gnome-base/gnome-flashback/gnome-flashback-3.40.0.ebuild
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.46.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome2 toolchain-funcs
DESCRIPTION="GNOME Flashback session"
@@ -11,12 +11,12 @@ LICENSE="GPL-3+"
SLOT="0"
IUSE="elogind systemd"
REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~riscv"
RDEPEND="
>=x11-libs/gdk-pixbuf-2.32.2:2
>=x11-libs/gtk+-3.22.0:3[X]
- >=gnome-base/gnome-desktop-3.12.0:3=
+ >=gnome-base/gnome-desktop-43:3=
>=gnome-base/gnome-panel-3.35.2
>=media-libs/libcanberra-0.13[gtk3]
>=dev-libs/glib-2.67.3:2
@@ -26,19 +26,21 @@ RDEPEND="
>=sys-power/upower-0.99.0:=
>=x11-libs/libXrandr-1.5.0
>=x11-libs/libXxf86vm-1.1.4
- x11-libs/libxcb
+
+ x11-libs/libxcb:=
x11-libs/libX11
gnome-base/gdm
elogind? ( >=sys-auth/elogind-230 )
systemd? ( >=sys-apps/systemd-230:= )
- net-wireless/gnome-bluetooth
+ net-wireless/gnome-bluetooth:3=
x11-libs/libXext
>=x11-libs/libXi-1.6.0
x11-libs/pango
x11-libs/libxkbfile
x11-misc/xkeyboard-config
x11-libs/libXfixes
- media-sound/pulseaudio[glib]
+ media-libs/libpulse[glib]
+ media-libs/alsa-lib
sys-libs/pam
"
DEPEND="${RDEPEND}
@@ -66,9 +68,9 @@ src_configure() {
# Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with
# what upstream has each version (libsystemd replaced with libelogind). Explicit
# per-version die to force a manual recheck. Only update the explicit version if the
- # "PKG_CHECK_MODULES([MENU/SCREENSAVER], ...)" blocks did not change; otherwise adjust
+ # "PKG_CHECK_MODULES([DESKTOP/SCREENSAVER], ...)" blocks did not change; otherwise adjust
# elogind conditional block below accordingly first.
- if ver_test ${PV} -ne 3.40.0; then
+ if ver_test ${PV} -ne 3.46.0; then
die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
fi
diff --git a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild b/gnome-base/gnome-flashback/gnome-flashback-3.50.0.ebuild
index b0eb921b5595..b648245ada77 100644
--- a/gnome-base/gnome-flashback/gnome-flashback-3.36.4.ebuild
+++ b/gnome-base/gnome-flashback/gnome-flashback-3.50.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
inherit gnome2 toolchain-funcs
DESCRIPTION="GNOME Flashback session"
@@ -11,41 +11,45 @@ LICENSE="GPL-3+"
SLOT="0"
IUSE="elogind systemd"
REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~riscv"
RDEPEND="
>=x11-libs/gdk-pixbuf-2.32.2:2
>=x11-libs/gtk+-3.22.0:3[X]
- >=gnome-base/gnome-desktop-3.12.0:3=
+ >=gnome-base/gnome-desktop-43:3=
>=gnome-base/gnome-panel-3.35.2
>=media-libs/libcanberra-0.13[gtk3]
- >=dev-libs/glib-2.44.0:2
+ >=dev-libs/glib-2.67.3:2
>=gnome-base/gsettings-desktop-schemas-3.31.0
>=sys-auth/polkit-0.97
>=app-i18n/ibus-1.5.2
>=sys-power/upower-0.99.0:=
>=x11-libs/libXrandr-1.5.0
>=x11-libs/libXxf86vm-1.1.4
- x11-libs/libxcb
+
+ x11-libs/libxcb:=
x11-libs/libX11
gnome-base/gdm
elogind? ( >=sys-auth/elogind-230 )
systemd? ( >=sys-apps/systemd-230:= )
- net-wireless/gnome-bluetooth
+ net-wireless/gnome-bluetooth:3=
x11-libs/libXext
>=x11-libs/libXi-1.6.0
x11-libs/pango
x11-libs/libxkbfile
x11-misc/xkeyboard-config
x11-libs/libXfixes
- media-sound/pulseaudio[glib]
+ media-libs/libpulse[glib]
+ media-libs/alsa-lib
sys-libs/pam
"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
dev-util/gdbus-codegen
dev-util/glib-utils
>=sys-devel/gettext-0.19.8
- x11-base/xorg-proto
virtual/pkgconfig
" # autoconf-archive for eautoreconf
RDEPEND="${RDEPEND}
@@ -64,9 +68,9 @@ src_configure() {
# Below elogind DESKTOP_* and SCREENSAVER_* pkg-config calls need to match up with
# what upstream has each version (libsystemd replaced with libelogind). Explicit
# per-version die to force a manual recheck. Only update the explicit version if the
- # "PKG_CHECK_MODULES([MENU/SCREENSAVER], ...)" blocks did not change; otherwise adjust
+ # "PKG_CHECK_MODULES([DESKTOP/SCREENSAVER], ...)" blocks did not change; otherwise adjust
# elogind conditional block below accordingly first.
- if ver_test ${PV} -ne 3.36.4; then
+ if ver_test ${PV} -ne 3.50.0; then
die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
fi
diff --git a/gnome-base/gnome-flashback/metadata.xml b/gnome-base/gnome-flashback/metadata.xml
index 7b343b06be8a..68dd054fcefe 100644
--- a/gnome-base/gnome-flashback/metadata.xml
+++ b/gnome-base/gnome-flashback/metadata.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>flow@gentoo.org</email>
+ <name>Florian Schmaus</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-flashback</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index c2dc4f46b753..d554a568c123 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1 +1 @@
-DIST gnome-keyring-40.0.tar.xz 1333440 BLAKE2B 4ef74d982d85766e8d7f28b97ddf295ca546f48b980518be7e586bda607344bdb72c124f92b5c34310aeb2f3903cb39092ae7ca6e1b3baf34ab6a9c58d26aeef SHA512 c9cb0dca8c46ee712200c96c20663a8d5cd39f07801a04e1afca26550a04af6cb369b53a1f29638bf4c8a29f418a69f565befcf4d08df5b0d30fb31894ecf95e
+DIST gnome-keyring-42.1.tar.xz 1346284 BLAKE2B ff6093cc16c649cda1e6cc2848c2198a502d8aa20a56f0a4dca00550e99f18820028427a7ec3979b6871648a7931da19fced3210558d5ca3de47983b7c94452d SHA512 560dc409c21768dcbdf42151986a5bbbfb9a092d2c36295cf76bd603cdf9650fa80670631c7fb8b3e1822bed6a1f55c34b2170a1419ce45fbe8ca08c7eaf3a57
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch b/gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch
new file mode 100644
index 000000000000..3dfd578b7407
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-42.1-c99.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/922630
+https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/f298c87e14e89656992ccfd17b133f4f2ab9c5ea
+
+From f298c87e14e89656992ccfd17b133f4f2ab9c5ea Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Wed, 24 Jan 2024 14:01:06 -0500
+Subject: [PATCH] gkm: fix test-sexp with GCC 14
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+pkcs11/gkm/test-sexp.c: In function ‘test_sign_verify’:
+pkcs11/gkm/test-sexp.c:231:92: error: passing argument 6 of ‘gkm_crypto_sign_xsa’ from incompatible pointer type [-Wincompatible-pointer-types]
+In file included from pkcs11/gkm/test-sexp.c:31:
+./pkcs11/gkm/gkm-crypto.h:92:86: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘gsize *’ {aka ‘unsigned int *’}
+pkcs11/gkm/test-sexp.c:251:87: error: passing argument 6 of ‘gkm_crypto_sign_xsa’ from incompatible pointer type [-Wincompatible-pointer-types]
+./pkcs11/gkm/gkm-crypto.h:92:86: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘gsize *’ {aka ‘unsigned int *’}
+pkcs11/gkm/test-sexp.c:271:91: error: passing argument 6 of ‘gkm_crypto_sign_xsa’ from incompatible pointer type [-Wincompatible-pointer-types]
+./pkcs11/gkm/gkm-crypto.h:92:86: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘gsize *’ {aka ‘unsigned int *’}
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+--- a/pkcs11/gkm/test-sexp.c
++++ b/pkcs11/gkm/test-sexp.c
+@@ -221,10 +221,10 @@ test_sign_verify (Test *test, gconstpointer unused)
+ {
+ gcry_sexp_t pubkey = NULL;
+ gboolean ret;
+- guchar data[] = TEST_DATA;
+- guchar data_size = TEST_DATA_SIZE;
+- guchar signature[128];
+- gsize signature_size = 128;
++ CK_BYTE data[] = TEST_DATA;
++ CK_ULONG data_size = TEST_DATA_SIZE;
++ CK_BYTE signature[128];
++ CK_ULONG signature_size = 128;
+
+ /* RSA */
+ /* sign some data */
+--
+GitLab
diff --git a/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild
index 3f1a2d876e2b..a2696c83bd79 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-40.0.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-42.1-r2.ebuild
@@ -1,34 +1,36 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..11} )
-inherit fcaps gnome2 pam python-any-r1 virtualx
+inherit gnome2 pam python-any-r1 virtualx
DESCRIPTION="Password and keyring managing daemon"
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="+caps pam selinux +ssh-agent test"
+IUSE="pam selinux +ssh-agent systemd test valgrind"
RESTRICT="!test? ( test )"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
RDEPEND="
- >=app-crypt/gcr-3.27.90:=[gtk]
+ >=app-crypt/gcr-3.27.90:0=[gtk]
>=app-crypt/gnupg-2.0.28:=
>=app-eselect/eselect-pinentry-0.5
app-misc/ca-certificates
>=dev-libs/glib-2.44:2
>=dev-libs/libgcrypt-1.2.2:0=
- caps? ( sys-libs/libcap-ng )
pam? ( sys-libs/pam )
selinux? ( sec-policy/selinux-gnome )
- ssh-agent? ( net-misc/openssh )
+ ssh-agent? ( virtual/openssh )
+"
+DEPEND="
+ ${RDEPEND}
+ valgrind? ( dev-debug/valgrind )
"
-DEPEND="${RDEPEND}"
BDEPEND="
>=app-eselect/eselect-pinentry-0.5
app-text/docbook-xml-dtd:4.3
@@ -38,6 +40,10 @@ BDEPEND="
test? ( ${PYTHON_DEPS} )
"
+PATCHES=(
+ "${FILESDIR}"/gnome-keyring-42.1-c99.patch
+)
+
pkg_setup() {
use test && python-any-r1_pkg_setup
}
@@ -53,11 +59,13 @@ src_prepare() {
src_configure() {
gnome2_src_configure \
- $(use_with caps libcap-ng) \
+ --without-libcap-ng \
$(use_enable pam) \
$(use_with pam pam-dir $(getpam_mod_dir)) \
$(use_enable selinux) \
$(use_enable ssh-agent) \
+ $(use_with systemd) \
+ $(use_enable valgrind) \
--enable-doc
}
@@ -69,9 +77,8 @@ src_test() {
}
pkg_postinst() {
- # cap_ipc_lock only needed if building --with-libcap-ng
+ # cap_ipc_lock only needed if building --with-libcap-ng, but that breaks with glib-2.70
# Never install as suid root, this breaks dbus activation, see bug #513870
- use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
gnome2_pkg_postinst
if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
diff --git a/gnome-base/gnome-keyring/metadata.xml b/gnome-base/gnome-keyring/metadata.xml
index 7a62c211d5f0..2e0522eb0b7f 100644
--- a/gnome-base/gnome-keyring/metadata.xml
+++ b/gnome-base/gnome-keyring/metadata.xml
@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <longdescription lang="en">
- GNOME Keyring is a collection of components in GNOME that store
- secrets, passwords, keys, certificates and make them available to
- applications. It is integrated with the user's login, so that
- their secret storage can be unlocked when the user logins into their
- session. It is based around a standard called PKCS#11, which is a
- standard way for applications to manage certificates and keys on
- smart cards or secure storage.
- </longdescription>
- <use>
- <flag name="ssh-agent">Use GNOME Keyring to unlock SSH keys.
- Recommended unless you are using ECDSA or Ed25519 keys.</flag>
- </use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription lang="en">
+ GNOME Keyring is a collection of components in GNOME that store
+ secrets, passwords, keys, certificates and make them available to
+ applications. It is integrated with the user's login, so that
+ their secret storage can be unlocked when the user logins into their
+ session. It is based around a standard called PKCS#11, which is a
+ standard way for applications to manage certificates and keys on
+ smart cards or secure storage.
+ </longdescription>
+ <use>
+ <flag name="ssh-agent">Use GNOME Keyring to unlock SSH keys. Recommended unless you are using ECDSA or Ed25519 keys.</flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-keyring</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-light/gnome-light-40.0.ebuild b/gnome-base/gnome-light/gnome-light-45.2.ebuild
index ea16fff20336..7e97583d535c 100644
--- a/gnome-base/gnome-light/gnome-light-40.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-45.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-P_RELEASE="$(ver_cut 1-2)"
+P_RELEASE="$(ver_cut 1).0"
DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
HOMEPAGE="https://www.gnome.org/"
@@ -11,7 +11,7 @@ LICENSE="metapackage"
SLOT="2.0"
IUSE="cups +gnome-shell"
-KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
# XXX: Note to developers:
# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
@@ -21,27 +21,29 @@ KEYWORDS="amd64 ~arm ~ppc64 ~riscv x86"
RDEPEND="
>=gnome-base/gnome-core-libs-${PV}[cups?]
- >=gnome-base/gnome-session-40.0
- >=gnome-base/gnome-settings-daemon-40.0[cups?]
- >=gnome-base/gnome-control-center-40.0[cups?]
+ >=gnome-base/gnome-session-45.0
+ >=gnome-base/gnome-settings-daemon-45.0[cups?]
+ >=gnome-base/gnome-control-center-45.1[cups?]
- >=gnome-base/nautilus-40.0
+ >=gnome-base/nautilus-45.2
gnome-shell? (
- >=x11-wm/mutter-${PV}
- >=dev-libs/gjs-1.68.0
- >=gnome-base/gnome-shell-${PV}
- >=media-fonts/cantarell-0.301
+ >=x11-wm/mutter-45.2
+ >=dev-libs/gjs-1.78.1
+ >=gnome-base/gnome-shell-45.2
+ >=media-fonts/cantarell-0.303.1
)
- >=x11-themes/adwaita-icon-theme-40.0
- >=x11-themes/gnome-themes-standard-3.28
+ >=x11-themes/adwaita-icon-theme-${P_RELEASE}
>=x11-themes/gnome-backgrounds-${P_RELEASE}
- >=x11-terms/gnome-terminal-3.40.0
+ || (
+ >=x11-terms/gnome-terminal-3.50.1
+ >=gui-apps/gnome-console-45.0
+ )
"
DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.48.0"
+PDEPEND=">=gnome-base/gvfs-1.52.1"
BDEPEND=""
S="${WORKDIR}"
diff --git a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
index c6e06f47930e..209cab2a56a3 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.36.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.36.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=8
inherit gnome2
@@ -10,8 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-menus"
LICENSE="GPL-2+ LGPL-2+"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="+introspection test"
RESTRICT="!test? ( test )"
@@ -20,17 +19,17 @@ RDEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
"
DEPEND="${RDEPEND}
+ test? ( dev-libs/gjs )
+"
+BDEPEND="
>=sys-devel/gettext-0.19.4
virtual/pkgconfig
- test? ( dev-libs/gjs )
"
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
src_configure() {
# Do NOT compile with --disable-debug/--enable-debug=no
# It disables api usage checks
- gnome2_src_configure \
- $(use_enable introspection) \
- --disable-static
+ gnome2_src_configure $(use_enable introspection)
}
diff --git a/gnome-base/gnome-menus/metadata.xml b/gnome-base/gnome-menus/metadata.xml
index 7b343b06be8a..d55036526afa 100644
--- a/gnome-base/gnome-menus/metadata.xml
+++ b/gnome-base/gnome-menus/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-menus</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-mime-data/Manifest b/gnome-base/gnome-mime-data/Manifest
deleted file mode 100644
index c0089c33399a..000000000000
--- a/gnome-base/gnome-mime-data/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnome-mime-data-2.18.0.tar.bz2 607012 BLAKE2B 6653e11f04f94035e7bf7d12413870b6e425bb32c50cd0776fae93be05eaea6eb4116f8d068e86c39fca9a3f86148934357d5a1c538a7deaae117151b8f1e466 SHA512 132996786254799341eeaa7894749cf4a95e391e31d985b1527b2f3dfeeeb01e7cc000753fc21d559db07fcc92018f4839f170eb149cb457fe06058ad3d986d5
diff --git a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
deleted file mode 100644
index 5ec888316fd8..000000000000
--- a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="MIME data for Gnome"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
- virtual/pkgconfig
- >=dev-util/intltool-0.35
-"
-
-src_prepare() {
- intltoolize --force || die "intltoolize failed"
- gnome2_src_prepare
-}
diff --git a/gnome-base/gnome-mime-data/metadata.xml b/gnome-base/gnome-mime-data/metadata.xml
deleted file mode 100644
index 7b343b06be8a..000000000000
--- a/gnome-base/gnome-mime-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index b244c2a9a8f4..d7cf85b2215f 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,2 +1,2 @@
-DIST gnome-panel-3.36.2.tar.xz 3033016 BLAKE2B faf5b81c07eccca9d78ed56be9e124e8f909bb577739810a059135cd6afc9cd293b5a023a129063c48168029a1f9a2dd6fd9c714f80e0c566f820291dd15217f SHA512 cbd7eaf1778dd3f6751c020540c243b02787feb5781195fd5db008fc66683ea5330d89ab0f2c740020695c4da7856b5678491ec3e711d6ce41e884a0374e937b
-DIST gnome-panel-3.40.0.tar.xz 2924776 BLAKE2B fb7d3b85c0eb7509810b1c3730f27479516b104ded31127c9fb2d2852277e62270b300d238b0e2de944d571c68db9ac2b35ed323ddd709e6a4b669089f09bae2 SHA512 49d8fde009ccf139dcc1412863432e642c11e3c149c6f39ab8f51d8027880654625a997f58efe03234ea2716ad0316f7d5f60fb493e7e6cea366611b975effe6
+DIST gnome-panel-3.46.0.tar.xz 2797164 BLAKE2B 48f4a070df7015a8cca2b5041329f3ebb88474abf42cd21f74514ef557426c260110916eb1e23fafec1f99ec2e339258241484a87a6cd52a293d7df6abfff001 SHA512 a49f3978bd9561973c41083006b831cf4fcb07408048106ef56dae7e0809fb3ec825c8b4a1c09e818255c7995c45a6d33aa4f47e61f778f4b1f29ccc7c9033f7
+DIST gnome-panel-3.50.0.tar.xz 2769200 BLAKE2B a386ccf11408772939af434d9f69c00a3bc22c0c104acd2e88e105c3f0d8ea3cfcd9145e6fc5d6e802d02740bcc89a86af403a9ade86271eddb7d8325fecadad SHA512 29e5eb22feec1b2d57fc0cd4c307012bbad50b15d49dc0fc7e2c0a1090a744ca9f1857ee74f2f0a7f77943ebe6ecf4f71c577adaeb19633f34ba93aad26e3c74
diff --git a/gnome-base/gnome-panel/gnome-panel-3.40.0.ebuild b/gnome-base/gnome-panel/gnome-panel-3.46.0.ebuild
index 6b723efd785c..6d2e01c4b9d3 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.40.0.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.46.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome2 toolchain-funcs
DESCRIPTION="The GNOME Flashback Panel"
@@ -11,7 +11,7 @@ LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
SLOT="0"
IUSE="eds elogind systemd"
REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~riscv"
RDEPEND="
>=gnome-base/gnome-desktop-2.91.0:3=
@@ -19,20 +19,20 @@ RDEPEND="
>=x11-libs/pango-1.15.4
>=dev-libs/glib-2.67.1:2
>=x11-libs/gtk+-3.22.0:3[X]
- >=x11-libs/libwnck-3.4.6:3
+ >=x11-libs/libwnck-43.0:3
>=gnome-base/gnome-menus-3.7.90:3
- eds? ( >=gnome-extra/evolution-data-server-3.33.2:= )
+ eds? ( >=gnome-extra/evolution-data-server-3.46.0:= )
elogind? ( >=sys-auth/elogind-230 )
systemd? ( >=sys-apps/systemd-230:= )
>=x11-libs/cairo-1.0.0[X,glib]
- >=dev-libs/libgweather-40.0:2=
+ >=dev-libs/libgweather-4.2.0:4=
>=gnome-base/dconf-0.13.4
>=x11-libs/libXrandr-1.3.0
gnome-base/gdm
x11-libs/libX11
x11-libs/libXi
+ sci-geosciences/geocode-glib:2
sys-auth/polkit
- x11-libs/libXi
"
DEPEND="${RDEPEND}
x11-base/xorg-proto
@@ -57,13 +57,19 @@ src_configure() {
# to force a manual recheck. Only update the explicit version if the
# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
# elogind conditional block below accordingly first.
- if ver_test ${PV} -ne 3.40.0; then
+ # DO NOT just change the version, look in configure.ac in which PKG_CHECK_MODULES-sections
+ # libsystemd is used and check if there are new sections where it is used!
+ if ver_test ${PV} -ne 3.46.0; then
die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
fi
if use elogind; then
local pkgconfig="$(tc-getPKG_CONFIG)"
myconf+=(
+ ACTION_BUTTON_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libelogind x11)"
+ ACTION_BUTTON_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libelogind x11)"
+ LAUNCHER_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+ LAUNCHER_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
)
diff --git a/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild b/gnome-base/gnome-panel/gnome-panel-3.50.0.ebuild
index c33ffe3fbb7c..f65a44120055 100644
--- a/gnome-base/gnome-panel/gnome-panel-3.36.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-3.50.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit eapi7-ver gnome2 toolchain-funcs
+EAPI=8
+inherit gnome2 toolchain-funcs
DESCRIPTION="The GNOME Flashback Panel"
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-panel/"
@@ -11,38 +11,39 @@ LICENSE="GPL-2+ FDL-1.1 LGPL-2.1+"
SLOT="0"
IUSE="eds elogind systemd"
REQUIRED_USE="^^ ( elogind systemd )"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~riscv"
RDEPEND="
>=gnome-base/gnome-desktop-2.91.0:3=
>=x11-libs/gdk-pixbuf-2.26.0:2
>=x11-libs/pango-1.15.4
- >=dev-libs/glib-2.45.3:2
+ >=dev-libs/glib-2.67.1:2
>=x11-libs/gtk+-3.22.0:3[X]
- >=x11-libs/libwnck-3.4.6:3
+ >=x11-libs/libwnck-43.0:3
>=gnome-base/gnome-menus-3.7.90:3
- eds? ( >=gnome-extra/evolution-data-server-3.33.2:=
- )
+ eds? ( >=gnome-extra/evolution-data-server-3.46.0:= )
elogind? ( >=sys-auth/elogind-230 )
systemd? ( >=sys-apps/systemd-230:= )
>=x11-libs/cairo-1.0.0[X,glib]
- >=dev-libs/libgweather-3.28.0:2=
+ >=dev-libs/libgweather-4.2.0:4=
>=gnome-base/dconf-0.13.4
>=x11-libs/libXrandr-1.3.0
gnome-base/gdm
x11-libs/libX11
x11-libs/libXi
+ sci-geosciences/geocode-glib:2
sys-auth/polkit
- x11-libs/libXi
"
DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+"
+BDEPEND="
app-text/docbook-xml-dtd:4.1.2
dev-util/gdbus-codegen
dev-util/glib-utils
dev-util/itstool
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
- x11-base/xorg-proto
" # yelp-tools and autoconf-archive for eautoreconf
src_configure() {
@@ -56,13 +57,19 @@ src_configure() {
# to force a manual recheck. Only update the explicit version if the
# "PKG_CHECK_MODULES([MENU], ...)" block did not change; otherwise adjust
# elogind conditional block below accordingly first.
- if ver_test ${PV} -ne 3.36.2; then
+ # DO NOT just change the version, look in configure.ac in which PKG_CHECK_MODULES-sections
+ # libsystemd is used and check if there are new sections where it is used!
+ if ver_test ${PV} -ne 3.50.0; then
die "Maintainer has not checked over packages MENU pkg-config deps for elogind support"
fi
if use elogind; then
local pkgconfig="$(tc-getPKG_CONFIG)"
myconf+=(
+ ACTION_BUTTON_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libelogind x11)"
+ ACTION_BUTTON_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libelogind x11)"
+ LAUNCHER_CFLAGS="$(${pkgconfig} --cflags gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
+ LAUNCHER_LIBS="$(${pkgconfig} --libs gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
MENU_CFLAGS="$(${pkgconfig} --cflags gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
MENU_LIBS="$(${pkgconfig} --libs gdm gio-unix-2.0 gtk+-3.0 libgnome-menu-3.0 libelogind)"
)
diff --git a/gnome-base/gnome-panel/metadata.xml b/gnome-base/gnome-panel/metadata.xml
index 7b343b06be8a..088b9ec9ec95 100644
--- a/gnome-base/gnome-panel/metadata.xml
+++ b/gnome-base/gnome-panel/metadata.xml
@@ -1,8 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>flow@gentoo.org</email>
+ <name>Florian Schmaus</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-panel</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index b24182613817..a21e381f049d 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -1 +1 @@
-DIST gnome-session-40.1.1.tar.xz 482304 BLAKE2B 9a96f230dc793cc0b810bdaad6ce0103f923fbd2b22ee567316508c79bd6e7afe3961b593d094d0a4766a76f45ba6710f96e03a299f43d08a04aca776a172955 SHA512 91609915366839806729e066e5ca0d42daff0591732cda08c3da7d4951f7e27964d72988c4e61a64045443969b9fb0a9697c7ace82bdd8843310cb4d7e9dfd8c
+DIST gnome-session-45.0.tar.xz 485992 BLAKE2B 473f0b3d94ffa8c1e2bf45884d053c753e5d5ad791b7cd9f889ce7952a273c4631c9867f038edaa6fe8e6ce16b9659c479755ce8028076016a658ad23291eeb7 SHA512 3eb3b4b9fcab2ec35bb61bac6257b254f142167250bbc1eb71d46aed350372f8942601c9d5ca5856e8686b53b70321f914cb55f1639daecfe6c61d84cb6d8aba
diff --git a/gnome-base/gnome-session/files/defaults.list-r5 b/gnome-base/gnome-session/files/defaults.list-r6
index 9ec18d1b8a63..a724700e69cc 100644
--- a/gnome-base/gnome-session/files/defaults.list-r5
+++ b/gnome-base/gnome-session/files/defaults.list-r6
@@ -1,9 +1,9 @@
[Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/rtf=abiword.desktop;libreoffice-writer.desktop;
application/x-abiword=abiword.desktop;
text/abiword=abiword.desktop;
-text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/richtext=abiword.desktop;libreoffice-writer.desktop;
+text/rtf=abiword.desktop;libreoffice-writer.desktop;
text/x-abiword=abiword.desktop;
text/x-xml-abiword=abiword.desktop;
x-content/blank-bd=brasero.desktop;org.gnome.Nautilus.desktop;
@@ -11,27 +11,27 @@ x-content/blank-dvd=brasero.desktop;org.gnome.Nautilus.desktop;
x-content/blank-cd=brasero.desktop;org.gnome.Nautilus.desktop;
x-content/blank-hddvd=brasero.desktop;org.gnome.Nautilus.desktop;
application/x-dia-diagram=dia.desktop;
-image/bmp=org.gnome.eog.desktop;
-image/gif=org.gnome.eog.desktop;
-image/jpeg=org.gnome.eog.desktop;
-image/jpg=org.gnome.eog.desktop;
-image/pjpeg=org.gnome.eog.desktop;
-image/png=org.gnome.eog.desktop;
-image/svg+xml=org.gnome.eog.desktop;
-image/svg+xml-compressed=org.gnome.eog.desktop;
-image/x-bmp=org.gnome.eog.desktop;
-image/x-gray=org.gnome.eog.desktop;
-image/x-icb=org.gnome.eog.desktop;
-image/x-ico=org.gnome.eog.desktop;
-image/x-pcx=org.gnome.eog.desktop;
-image/x-png=org.gnome.eog.desktop;
-image/x-portable-anymap=org.gnome.eog.desktop;
-image/x-portable-bitmap=org.gnome.eog.desktop;
-image/x-portable-graymap=org.gnome.eog.desktop;
-image/x-portable-pixmap=org.gnome.eog.desktop;
-image/x-xbitmap=org.gnome.eog.desktop;
-image/x-xpixmap=org.gnome.eog.desktop;
-image/vnd.wap.wbmp=org.gnome.eog.desktop;
+image/bmp=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/gif=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/jpeg=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/jpg=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/pjpeg=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/png=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/svg+xml=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/svg+xml-compressed=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-bmp=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-gray=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-icb=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-ico=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-pcx=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-png=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-portable-anymap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-portable-bitmap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-portable-graymap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-portable-pixmap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-xbitmap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/x-xpixmap=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
+image/vnd.wap.wbmp=org.gnome.Loupe.desktop;org.gnome.eog.desktop;
image/g3fax=gimp.desktop;zzz-gimp.desktop;
image/x-compressed-xcf=gimp.desktop;zzz-gimp.desktop;
image/x-fits=gimp.desktop;zzz-gimp.desktop;
@@ -105,64 +105,64 @@ application/x-zip-compressed=org.gnome.FileRoller.desktop;
application/x-zoo=org.gnome.FileRoller.desktop;
application/zip=org.gnome.FileRoller.desktop;
multipart/x-zip=org.gnome.FileRoller.desktop;
-text/plain=org.gnome.gedit.desktop;
-text/css=org.gnome.gedit.desktop;
-text/javascript=org.gnome.gedit.desktop;
-text/markdown=org.gnome.gedit.desktop;
-text/mathml=org.gnome.gedit.desktop;
-text/x-csrc=org.gnome.gedit.desktop;
-text/x-chdr=org.gnome.gedit.desktop;
-text/x-dtd=org.gnome.gedit.desktop;
-text/x-java=org.gnome.gedit.desktop;
-text/x-javascript=org.gnome.gedit.desktop;
-text/x-patch=org.gnome.gedit.desktop;
+text/plain=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/css=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/javascript=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/markdown=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/mathml=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-csrc=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-chdr=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-dtd=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-java=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-javascript=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/x-patch=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
text/x-perl=org.gnome.gedit.destkop
text/x-php=org.gnome.gedit.destkop
text/x-python=org.gnome.gedit.destkop
-text/x-sql=org.gnome.gedit.desktop;
-text/xml=org.gnome.gedit.desktop;
-application/javascript=org.gnome.gedit.destkop
-application/x-cgi=org.gnome.gedit.desktop;
-application/x-javascript=org.gnome.gedit.desktop;
-application/x-perl=org.gnome.gedit.desktop;
-application/x-php=org.gnome.gedit.desktop;
-application/x-python=org.gnome.gedit.desktop;
-application/xml=org.gnome.gedit.desktop;
-application/xml-dtd=org.gnome.gedit.desktop;
+text/x-sql=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+text/xml=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/javascript=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop
+application/x-cgi=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/x-javascript=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/x-perl=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/x-php=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/x-python=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/xml=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
+application/xml-dtd=org.gnome.TextEditor.desktop;org.gnome.gedit.desktop;
application/x-font-ttf=org.gnome.font-viewer.desktop;
application/x-font-pcf=org.gnome.font-viewer.desktop;
application/x-font-type1=org.gnome.font-viewer.desktop;
application/x-font-otf=org.gnome.font-viewer.desktop;
-application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/csv=gnumeric.desktop;libreoffice-calc.desktop;
+application/excel=gnumeric.desktop;libreoffice-calc.desktop;
+application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;
+application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;
+application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;
+application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-123=gnumeric.desktop;libreoffice-calc.desktop;
application/x-applix-spreadsheet=gnumeric.desktop;
-application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;
application/x-gnumeric=gnumeric.desktop;
application/x-mps=gnumeric.desktop;
-application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;
+application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;
application/x-oleo=gnumeric.desktop;
application/x-planperfect=gnumeric.desktop;
-application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;
application/x-sc=gnumeric.desktop;
application/x-sylk=gnumeric.desktop;
application/x-xbase=gnumeric.desktop;
application/x-xls=gnumeric.desktop;
application/xls=gnumeric.desktop;
-text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;
+text/csv=gnumeric.desktop;libreoffice-calc.desktop;
+text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;
+text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;
+text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;
+text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;
zz-application/zz-winassoc-xls=gnumeric.desktop;
x-content/software=nautilus-autorun-software.desktop;
x-content/unix-software=nautilus-autorun-software.desktop;
@@ -170,53 +170,53 @@ x-directory/gnome-default-handler=org.gnome.Nautilus.desktop;
x-directory/normal=org.gnome.Nautilus.desktop;
inode/directory=org.gnome.Nautilus.desktop;
application/x-gnome-saved-search=org.gnome.Nautilus.desktop;
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;
+application/vnd.sun.xml.calc=libreoffice-calc.desktop;
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;
+application/vnd.stardivision.calc=libreoffice-calc.desktop;
+application/vnd.stardivision.chart=libreoffice-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;
+application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;
+application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;
+application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;
+application/vnd.sun.xml.draw=libreoffice-draw.desktop;
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;
+application/vnd.stardivision.draw=libreoffice-draw.desktop;
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;
+application/vnd.sun.xml.impress=libreoffice-impress.desktop;
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;
+application/vnd.stardivision.impress=libreoffice-impress.desktop;
+application/mspowerpoint=libreoffice-impress.desktop;
+application/vnd.ms-powerpoint=libreoffice-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;
+application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;
+application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;
+application/vnd.sun.xml.math=libreoffice-math.desktop;
+application/vnd.stardivision.math=libreoffice-math.desktop;
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;
+application/vnd.sun.xml.writer=libreoffice-writer.desktop;
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;
+application/vnd.stardivision.writer=libreoffice-writer.desktop;
+application/msword=libreoffice-writer.desktop;
+application/vnd.ms-word=libreoffice-writer.desktop;
+application/x-doc=libreoffice-writer.desktop;
+application/vnd.wordperfect=libreoffice-writer.desktop;
+application/wordperfect=libreoffice-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;
+application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;
+application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;
x-content/audio-player=rhythmbox.desktop;
x-content/audio-cdda=org.gnome.SoundJuicer.desktop;
application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;firefox-bin.desktop;google-chrome.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-40.1.1.ebuild b/gnome-base/gnome-session/gnome-session-45.0-r1.ebuild
index 996b1fdfbbb0..52e6ea354af3 100644
--- a/gnome-base/gnome-session/gnome-session-40.1.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-45.0-r1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit desktop gnome.org gnome2-utils meson xdg
+EAPI=8
+inherit desktop gnome.org gnome2-utils meson systemd xdg
DESCRIPTION="Gnome session manager"
HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc elogind systemd"
# There is a null backend available, thus ?? not ^^
REQUIRED_USE="?? ( elogind systemd )"
-DEPEND="
+COMMON_DEPEND="
>=dev-libs/glib-2.46.0:2
>=x11-libs/gtk+-3.22.0:3
x11-libs/libICE
@@ -22,7 +22,7 @@ DEPEND="
x11-libs/libX11
>=gnome-base/gnome-desktop-3.34.2:3=
>=dev-libs/json-glib-0.10
- media-libs/mesa[egl,gles2,X(+)]
+ media-libs/libglvnd[X]
media-libs/libepoxy
x11-libs/libXcomposite
@@ -37,7 +37,7 @@ DEPEND="
# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
# sys-apps/dbus[X] is needed for session management.
# Our 90-xcursor-theme-gnome reads a setting from gsettings-desktop-schemas.
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-settings-daemon-3.35.91
>=gnome-base/gsettings-desktop-schemas-0.1.7
sys-apps/dbus[X]
@@ -45,14 +45,18 @@ RDEPEND="${DEPEND}
x11-misc/xdg-user-dirs
x11-misc/xdg-user-dirs-gtk
"
+DEPEND="${COMMON_DEPEND}
+ x11-libs/xtrans
+"
BDEPEND="
dev-libs/libxslt
dev-util/gdbus-codegen
>=sys-devel/gettext-0.19.8
- x11-libs/xtrans
virtual/pkgconfig
- doc? ( app-text/xmlto
- app-text/docbook-xml-dtd:4.1.2 )
+ doc? (
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2
+ )
"
PATCHES=(
@@ -60,7 +64,9 @@ PATCHES=(
)
src_prepare() {
- xdg_src_prepare
+ default
+ xdg_environment_reset
+
# Install USE=doc in ${PF} if enabled
sed -i -e "s:meson\.project_name(), 'dbus':'${PF}', 'dbus':" doc/dbus/meson.build || die
}
@@ -74,6 +80,7 @@ src_configure() {
-Dsystemd_session=$(usex systemd default disable)
$(meson_use systemd systemd_journal)
$(meson_use doc docbook)
+ -Dsystemduserunitdir="$(systemd_get_userunitdir)"
-Dconsolekit=false
-Dman=true
)
@@ -86,7 +93,7 @@ src_install() {
exeinto /etc/X11/Sessions
doexe "${FILESDIR}/Gnome"
- newmenu "${FILESDIR}/defaults.list-r5" gnome-mimeapps.list
+ newmenu "${FILESDIR}/defaults.list-r6" gnome-mimeapps.list
exeinto /etc/X11/xinit/xinitrc.d/
newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
index adea3ebab11b..c61a85d9592f 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="elogind">Support <pkg>sys-auth/elogind</pkg> for session tracking</flag>
-</use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="elogind">Support <pkg>sys-auth/elogind</pkg> for session tracking</flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-session</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 69056205c197..5a3c8ed3a496 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1 +1 @@
-DIST gnome-settings-daemon-40.0.1.tar.xz 1443100 BLAKE2B 2615165e4b33b3ae4f9ceac73fdd298ad5288b5de03424ade70a0dfd64b7349ae759138c0c930ba4c78ff70ed52389b2f0a996333234755f793dc114870d2460 SHA512 d5b7235e097baded66cbbc2c4f05effcac722daa09413f495368555ad97830746415c4c8f1ecfe54dac262f3b75ab1a83863dc4b736b9854dcf86c94c14edd79
+DIST gnome-settings-daemon-45.1.tar.xz 1473256 BLAKE2B 25c114cc1918975247db360f24a9041d019546dd0a0714d19f2409b78ee6e2712d6dc1272eb9a40afb7ed4e973eaa45854322947567b5d54d2761b48a2e812b9 SHA512 ccec193f3f2acdfb5eefda697d6ef2ac0edca18e85d934a83cc34fd5af6c78c56469ffeebbd1c64e8c392462686663c2dd55000bc962beac472580fdfa0717a8
diff --git a/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
new file mode 100644
index 000000000000..3956b7413978
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
@@ -0,0 +1,40 @@
+From 1e07481d4fd989828a7237c365e5420f50196ddd Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 14 Mar 2019 09:43:00 +0200
+Subject: [PATCH] build: Make wacom optional and controllable via meson_options
+
+---
+ meson.build | 4 ++--
+ meson_options.txt | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a8955a49..0ac4f3ba 100644
+--- a/meson.build
++++ b/meson.build
+@@ -154,8 +154,8 @@ if enable_wayland
+ endif
+ config_h.set10('HAVE_WAYLAND', enable_wayland)
+
+-# wacom (disabled for s390/s390x and non Linux platforms)
+-enable_wacom = host_is_linux_not_s390
++# wacom
++enable_wacom = get_option('wacom')
+ if enable_wacom
+ assert(enable_gudev, 'GUDev support is required for wacom support.')
+ libwacom_dep = dependency('libwacom', version: '>= 0.7')
+diff --git a/meson_options.txt b/meson_options.txt
+index 3e04cf64..010053e2 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -9,6 +9,7 @@ option('network_manager', type: 'boolean', value: true, description: 'build with
+ option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)')
+ option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
+ option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
++option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support')
+ option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
+ option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
+ option('colord', type: 'boolean', value: true, description: 'build with colord support')
+--
+2.34.1
+
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
deleted file mode 100644
index 658f4a3f48ee..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-Allow-udev-optional-on-Linux.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 6a44d3a6741da48d769353023c8801d41c969663 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 12 Jul 2020 16:30:59 +0300
-Subject: [PATCH 3/3] Allow udev optional on Linux
-
----
- meson.build | 4 ----
- plugins/power/gsd-backlight.c | 14 +++++++-------
- plugins/power/meson.build | 6 +++---
- 3 files changed, 10 insertions(+), 14 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 21d9341d..0a527513 100644
---- a/meson.build
-+++ b/meson.build
-@@ -138,9 +138,6 @@ if enable_gudev
- gudev_dep = dependency('gudev-1.0')
- endif
- config_h.set10('HAVE_GUDEV', enable_gudev)
--if host_is_linux
-- assert(enable_gudev, 'GUdev is not optional on Linux platforms')
--endif
-
- # Check for colord
- enable_colord = get_option('colord')
-@@ -203,7 +200,6 @@ endif
-
- # Rfkill
- enable_rfkill = get_option('rfkill')
--assert(enable_rfkill or not host_is_linux, 'rfkill is not optional on Linux platforms')
- if enable_rfkill
- assert(cc.has_header('linux/rfkill.h'), 'rfkill support requested but RFKill headers not found')
- assert(enable_gudev, 'GUdev is required for rfkill support')
-diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c
-index ca5f2723..f58f5343 100644
---- a/plugins/power/gsd-backlight.c
-+++ b/plugins/power/gsd-backlight.c
-@@ -25,7 +25,7 @@
- #include "gsd-power-constants.h"
- #include "gsd-power-manager.h"
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
- #include <gudev/gudev.h>
- #endif /* __linux__ */
-
-@@ -39,7 +39,7 @@ struct _GsdBacklight
- gint brightness_target;
- gint brightness_step;
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
- GDBusProxy *logind_proxy;
-
- GUdevClient *udev;
-@@ -77,7 +77,7 @@ G_DEFINE_TYPE_EXTENDED (GsdBacklight, gsd_backlight, G_TYPE_OBJECT, 0,
- G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
- gsd_backlight_initable_iface_init);)
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
- static GUdevDevice*
- gsd_backlight_udev_get_type (GList *devices, const gchar *type)
- {
-@@ -478,7 +478,7 @@ gsd_backlight_set_brightness_val_async (GsdBacklight *backlight,
-
- task = g_task_new (backlight, cancellable, callback, user_data);
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
- if (backlight->udev_device != NULL) {
- BacklightHelperData *task_data;
-
-@@ -831,7 +831,7 @@ gsd_backlight_initable_init (GInitable *initable,
- return FALSE;
- }
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
- backlight->logind_proxy =
- g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
- 0,
-@@ -908,7 +908,7 @@ gsd_backlight_finalize (GObject *object)
- {
- GsdBacklight *backlight = GSD_BACKLIGHT (object);
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
- g_assert (backlight->active_task == NULL);
- g_assert (g_queue_is_empty (&backlight->tasks));
- g_clear_object (&backlight->logind_proxy);
-@@ -961,7 +961,7 @@ gsd_backlight_init (GsdBacklight *backlight)
- backlight->brightness_val = -1;
- backlight->brightness_step = 1;
-
--#ifdef __linux__
-+#if defined(__linux__) && defined(HAVE_GUDEV)
- backlight->active_task = NULL;
- g_queue_init (&backlight->tasks);
- #endif /* __linux__ */
-diff --git a/plugins/power/meson.build b/plugins/power/meson.build
-index 69e619f2..6c6ea939 100644
---- a/plugins/power/meson.build
-+++ b/plugins/power/meson.build
-@@ -24,7 +24,7 @@ native_deps = [
- dependency('gio-2.0', native:true)
- ]
-
--if host_is_linux
-+if host_is_linux and enable_gudev
- deps += gudev_dep
- endif
-
-@@ -66,7 +66,7 @@ gsd_power_enums_update = executable(
- native: true
- )
-
--if host_is_linux
-+if host_is_linux and enable_gudev
- policy = 'org.gnome.settings-daemon.plugins.power.policy'
-
- policy_in = configure_file(
-@@ -130,7 +130,7 @@ envs.set('BUILDDIR', meson.current_build_dir())
- envs.set('TOP_BUILDDIR', meson.build_root())
- envs.set('LD_PRELOAD', 'libumockdev-preload.so.0')
- envs.set('NO_AT_BRIDGE', '1')
--envs.set('HAVE_SYSFS_BACKLIGHT', host_is_linux ? '1' : '0')
-+envs.set('HAVE_SYSFS_BACKLIGHT', (host_is_linux and enable_gudev) ? '1' : '0')
-
- if get_option('b_sanitize').split(',').contains('address')
- # libasan needs to be loaded first; so we need to explicitly preload it
---
-2.26.2
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
deleted file mode 100644
index b48007d29848..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 0cc1c2f5f5d12169acbb965a21b5d9f6fb4a0767 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 14 Mar 2019 09:43:00 +0200
-Subject: [PATCH 1/3] build: Make colord and wacom optional and controllable
- via meson_options
-
----
- meson.build | 10 ++++++++--
- meson_options.txt | 2 ++
- plugins/meson.build | 4 ++++
- 3 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 7dbee64b..dce9bfa1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -142,6 +142,12 @@ if host_is_linux
- assert(enable_gudev, 'GUdev is not optional on Linux platforms')
- endif
-
-+# Check for colord
-+enable_colord = get_option('colord')
-+if enable_colord
-+ colord_dep = dependency('colord', version: '>= 1.3.5')
-+endif
-+
- has_timerfd_create = cc.has_function('timerfd_create')
- config_h.set10('HAVE_TIMERFD', has_timerfd_create)
-
-@@ -154,8 +160,8 @@ if enable_wayland
- endif
- config_h.set10('HAVE_WAYLAND', enable_wayland)
-
--# wacom (disabled for s390/s390x and non Linux platforms)
--enable_wacom = host_is_linux_not_s390
-+# wacom
-+enable_wacom = get_option('wacom')
- if enable_wacom
- assert(enable_gudev, 'GUDev support is required for wacom support.')
- libwacom_dep = dependency('libwacom', version: '>= 0.7')
-diff --git a/meson_options.txt b/meson_options.txt
-index 3e04cf64..6f6eb2fc 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,11 +4,13 @@ option('systemd', type: 'boolean', value: true, description: 'Enable systemd int
-
- option('alsa', type: 'boolean', value: true, description: 'build with ALSA support (not optional on Linux platforms)')
- option('gudev', type: 'boolean', value: true, description: 'build with gudev device support (not optional on Linux platforms)')
-+option('colord', type: 'boolean', value: true, description: 'build with colord support')
- option('cups', type: 'boolean', value: true, description: 'build with CUPS support')
- option('network_manager', type: 'boolean', value: true, description: 'build with NetworkManager support (not optional on Linux platforms)')
- option('rfkill', type: 'boolean', value: true, description: 'build with rfkill support (not optional on Linux platforms)')
- option('smartcard', type: 'boolean', value: true, description: 'build with smartcard support')
- option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
-+option('wacom', type: 'boolean', value: true, description: 'build with Wacom devices support')
- option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
- option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
- option('colord', type: 'boolean', value: true, description: 'build with colord support')
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 83e01885..20ccb26d 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -20,6 +20,10 @@ all_plugins = [
-
- disabled_plugins = []
-
-+if not enable_colord
-+ disabled_plugins += ['color']
-+endif
-+
- if not enable_smartcard
- disabled_plugins += ['smartcard']
- endif
---
-2.26.2
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-45.1.ebuild
index 199826b093c4..15c03544f686 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-40.0.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-45.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
inherit gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
@@ -11,44 +11,38 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-settings-daemon"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland"
+IUSE="+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test wayland"
RESTRICT="!test? ( test )"
-REQUIRED_USE="
- ^^ ( elogind systemd )
- input_devices_wacom? ( udev )
- wayland? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+REQUIRED_USE="^^ ( elogind systemd )"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-DEPEND="
- >=sci-geosciences/geocode-glib-3.10
- >=dev-libs/glib-2.56:2
+COMMON_DEPEND="
+ >=sci-geosciences/geocode-glib-3.10:2
+ >=dev-libs/glib-2.58:2
>=gnome-base/gnome-desktop-3.37.1:3=
- >=gnome-base/gsettings-desktop-schemas-40
+ >=gnome-base/gsettings-desktop-schemas-42
>=x11-libs/gtk+-3.15.3:3[X,wayland?]
- >=dev-libs/libgweather-40:2=
- colord? (
- >=x11-misc/colord-1.4.5:=
- >=media-libs/lcms-2.2:2
- )
+ >=dev-libs/libgweather-4.2.0:4=
+ colord? ( >=x11-misc/colord-1.4.5:= )
media-libs/libcanberra[gtk3]
>=app-misc/geoclue-2.3.1:2.0
>=x11-libs/libnotify-0.7.3
- >=media-sound/pulseaudio-2[glib]
+ >=media-libs/libpulse-16.1[glib]
>=sys-auth/polkit-0.114
- >=sys-power/upower-0.99.8:=
+ >=sys-power/upower-0.99.12:=
x11-libs/libX11
- udev? ( dev-libs/libgudev:= )
+ >=x11-libs/libXfixes-6.0.0
+ dev-libs/libgudev:=
wayland? ( dev-libs/wayland )
input_devices_wacom? (
- >=dev-libs/libwacom-0.7
+ >=dev-libs/libwacom-0.7:=
>=x11-libs/pango-1.20.0
x11-libs/gdk-pixbuf:2
)
- smartcard? ( >=dev-libs/nss-3.11.2 )
+ smartcard? ( app-crypt/gcr:4= )
cups? ( >=net-print/cups-1.4[dbus] )
modemmanager? (
- >=app-crypt/gcr-3.7.5:=
+ >=app-crypt/gcr-3.90.0:4=
>=net-misc/modemmanager-1.0:=
)
networkmanager? ( >=net-misc/networkmanager-1.0 )
@@ -58,27 +52,25 @@ DEPEND="
media-libs/fontconfig
systemd? (
>=sys-apps/systemd-243
- sys-apps/dbus[user-session]
)
"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
# logind needed for power and session management, bug #464944
-# gnome-session-3.33.90/gdm-3.33.90/gnome-shell-extensions-3.34.1/gnome-flashback-3.33.1 adapt to Clipboard and Mouse component removals (moved to mutter)
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
gnome-base/dconf
elogind? ( sys-auth/elogind )
- !<gnome-base/gnome-session-3.33.90
- !<gnome-base/gdm-3.33.90
- !<gnome-extra/gnome-shell-extensions-3.34.1
- !<gnome-base/gnome-flashback-3.33.1
"
-# rfkill requires linux/rfkill.h (and USE=udev), thus linux-headers dep, not os-headers. If this package wants to work on other kernels, we need to make rfkill conditional instead
+# rfkill requires linux/rfkill.h, thus linux-headers dep, not os-headers.
+# If this package wants to work on other kernels, we need to make rfkill conditional instead
BDEPEND="
sys-kernel/linux-headers
dev-util/glib-utils
dev-util/gdbus-codegen
- x11-base/xorg-proto
${PYTHON_DEPS}
test? (
+ dev-util/umockdev
$(python_gen_any_dep '
dev-python/pygobject:3[${PYTHON_USEDEP}]
dev-python/python-dbusmock[${PYTHON_USEDEP}]
@@ -90,15 +82,14 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/${PN}-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch
+ "${FILESDIR}"/42.1-build-Make-wacom-optional-and-controllable-via-meson.patch
"${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch
- "${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch
)
python_check_deps() {
if use test; then
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
- has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+ python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
+ python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
fi
}
@@ -108,15 +99,15 @@ pkg_setup() {
src_configure() {
local emesonargs=(
- #-Dnssdb_dir # TODO: Is the default /etc/pki/nssdb path correct for our nss?
-Dudev_dir="$(get_udevdir)"
$(meson_use systemd)
-Dalsa=true
- $(meson_use udev gudev)
+ -Dgudev=true
+ -Dgcr3=false
$(meson_use colord)
$(meson_use cups)
$(meson_use networkmanager network_manager)
- $(meson_use udev rfkill)
+ -Drfkill=true
$(meson_use smartcard)
$(meson_use input_devices_wacom wacom)
$(meson_use wayland)
@@ -137,11 +128,13 @@ src_test() {
}
pkg_postinst() {
+ udev_reload
xdg_pkg_postinst
gnome2_schemas_update
}
pkg_postrm() {
+ udev_reload
xdg_pkg_postrm
gnome2_schemas_update
}
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
index 8ebd4ac4be21..1f7d624fccf3 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
- <flag name="modemmanager">Enable WWAN support via <pkg>net-misc/modemmanager</pkg></flag>
- <flag name="systemd">Rely on <pkg>sys-apps/systemd</pkg> as runtime logind provider</flag>
- </use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag>
+ <flag name="modemmanager">Enable WWAN support via <pkg>net-misc/modemmanager</pkg></flag>
+ <flag name="systemd">Rely on <pkg>sys-apps/systemd</pkg> as runtime logind provider</flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-settings-daemon</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 7698c830a94f..9ccf31b23d32 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,4 @@
-DIST gnome-shell-40.2.tar.xz 1869600 BLAKE2B 6081930c4fe564980659bfeb7f7f59c5b95ce56e158096f14d8f85b28f4b45b1697eebdd88f7daf331aa1f7d087ec3dab55543d9a82d9d26bc5d8aee7e7c0085 SHA512 0df0a68a0e2440f73dfc147045ac2f003e5f133950cdbec7fb07b92e71aa53e2e4f3ce75510552f1043404850623fc84c08aad215b39ce9d33862994ae35ba87
-DIST gnome-shell-40.3.tar.xz 1869724 BLAKE2B b6a663c97f5ad9239e608e16805074f9695f90b110514d202cc799818321d258417ce4e7841fa3256ae664e2bcba12201ac035737720a37f4eb3e84a26418ad9 SHA512 05d47e1b0f8ec27f0ae7564476012f21dcb2ec8e6da61a589b7fe17df1a23035cb6e261805250a410737502b9bdbb25f56432a618de88881d7e15b6432e52770
-DIST gnome-shell-40.4.tar.xz 1870468 BLAKE2B 78b0a749850e5df18beabd25cc35214b2d1f9a254dd095b9e783b2acdc9bac30edd7ffae3e6b15dd14d5b0877e8453c17548298e29b57642353e80ed505e556d SHA512 305d12cc7273f23e4a0c294f532cbf951816fd2de81959bef769048f4d5717e9e1886b64fe17b2f5ef6ee216ea67a6b913293a8903ec5dc5214bd29fbb1d3b32
+DIST gnome-shell-45.2.tar.xz 2017124 BLAKE2B b1ee0ecb7babadad1b9abed3c9bb2fda4c47e5bff080cfd92db35530b211449a9e3c8db0f63ccf87ae9df05337b9a69546b880c71d7a4a1fca08b773490bbce1 SHA512 d88cb7e385f69416863a5b1299fdd18f228a6f951ee084e0ae79ed668c856e50f19c537d7b40eaf93b9166fa5ef7797b9babc3b8d4f80941e15d53d862734aec
+DIST gnome-shell-45.4.tar.xz 2016708 BLAKE2B 1bbc4bc0d5652a3c9332a2f072437919c2cdb3fdf546913d00b65d5806bd7c7f7d7e8f0886fba1b8a6a776598b358882f6285c55f68ec217eb5ac378b73580a3 SHA512 127031302c4f606353292ab2ca2ab7b4c1000eba11bccd30cefb6a0c4a316aac1203d021d713716ad6036e4519700001d564545978f83b1e24668b166dcd66ba
+DIST gnome-shell-45.5.tar.xz 2016720 BLAKE2B a6c28a698a59724ef2381546110caeafd7d9a4541e8046e1d562bc2762660a979fb3b83d0823690fba912ebd2240df746f83e37b2fd722c9a54e038776afbef7 SHA512 4c463635cff3b640ed88f9ada542c98ea6f803c31bce6f67dca2e054ea8cdc1de764d7695bd9365b97d59bd04ad54043b858f26b4553f7a7eff9943d2ffb995b
+DIST gnome-shell-45.6.tar.xz 2016488 BLAKE2B 6590c160eabae21e1f5a79787113d02950db52b052330beb9b82d4b837ad7f9038c3c5ae2671c6688710d625a348f9b65b360d53e8d635824ce91be47cc73923 SHA512 7e8ce152cc9fa6374d45cb3163ea8a56db7386c924cfc0799c4d5aec6285e50c7fc8555dd2b8d702fc33f3206027aa2711bbbc1a1e782eaa24e9003e69d7a843
diff --git a/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch b/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch
deleted file mode 100644
index dba20fe8c093..000000000000
--- a/gnome-base/gnome-shell/files/40.0-optional-bluetooth.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1ef0033f8148466256b403c9d8c79b9fed1dd343 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 28 Feb 2019 00:50:19 +0200
-Subject: [PATCH 2/2] build: Make bluetooth support optional
-
----
- js/misc/meson.build | 2 +-
- meson.build | 7 ++++++-
- meson_options.txt | 6 ++++++
- 3 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/meson.build b/js/misc/meson.build
-index 2702c3dbc..7a6c831b9 100644
---- a/js/misc/meson.build
-+++ b/js/misc/meson.build
-@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
- jsconf.set('PACKAGE_VERSION', meson.project_version())
- jsconf.set('GETTEXT_PACKAGE', meson.project_name())
- jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
--jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
-+jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
- jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
- jsconf.set('datadir', datadir)
- jsconf.set('libexecdir', libexecdir)
-diff --git a/meson.build b/meson.build
-index 14b75c1c9..8b1c7a380 100644
---- a/meson.build
-+++ b/meson.build
-@@ -94,7 +94,12 @@ x11_dep = dependency('x11')
- schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
- gnome_desktop_dep = dependency('gnome-desktop-3.0', version: gnome_desktop_req)
-
--bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
-+if get_option('bluetooth')
-+ bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req)
-+ have_bluetooth = true
-+else
-+ have_bluetooth = false
-+endif
- gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
- gst_base_dep = dependency('gstreamer-base-1.0', required: false)
- pipewire_dep = dependency('libpipewire-0.3', required: false)
-diff --git a/meson_options.txt b/meson_options.txt
-index ef76b73c3..41cc0ff9d 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,9 @@
-+option('bluetooth',
-+ type: 'boolean',
-+ value: true,
-+ description: 'Enable bluetooth support'
-+)
-+
- option('extensions_tool',
- type: 'boolean',
- value: true,
---
-2.26.2
-
diff --git a/gnome-base/gnome-shell/gnome-shell-40.2.ebuild b/gnome-base/gnome-shell/gnome-shell-40.2.ebuild
deleted file mode 100644
index dfb141f86a4f..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-40.2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-# * gstreamer/pipewire support is currently automagic
-DEPEND="
- >=gnome-extra/evolution-data-server-3.33.1:=
- >=app-crypt/gcr-3.7.5[introspection]
- >=dev-libs/glib-2.57.2:2
- >=dev-libs/gobject-introspection-1.49.1:=
- >=dev-libs/gjs-1.65.1
- >=x11-libs/gtk+-3.15.0:3[introspection]
- >=x11-wm/mutter-40.0:0/8[introspection]
- >=sys-auth/polkit-0.100[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.33.1
- >=x11-libs/startup-notification-0.11
- >=app-i18n/ibus-1.5.2
- >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
- >=media-libs/gstreamer-0.11.92:1.0
- media-libs/gst-plugins-base:1.0
- >=media-video/pipewire-0.3.0:0/0.3
- networkmanager? (
- >=net-misc/networkmanager-1.10.4:=[introspection]
- net-libs/libnma[introspection]
- >=app-crypt/libsecret-0.18
- dev-libs/dbus-glib )
- systemd? ( >=sys-apps/systemd-242
- >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
- elogind? ( >=sys-auth/elogind-237 )
-
- app-arch/gnome-autoar
- dev-libs/json-glib
-
- >=app-accessibility/at-spi2-atk-2.5.3
- x11-libs/gdk-pixbuf:2[introspection]
- dev-libs/libxml2:2
- x11-libs/libX11
-
- >=media-sound/pulseaudio-2[glib]
- >=dev-libs/atk-2[introspection]
- dev-libs/libical:=
- >=x11-libs/libXfixes-5.0
-
- gui-libs/gtk:4[introspection]
-
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
- >=sys-apps/accountsservice-0.6.14[introspection]
- app-accessibility/at-spi2-core:2[introspection]
- app-misc/geoclue[introspection]
- >=dev-libs/libgweather-3.26:2[introspection]
- >=sys-power/upower-0.99:=[introspection]
- x11-libs/pango[introspection]
- gnome-base/librsvg:2[introspection]
-
- >=gnome-base/gnome-session-2.91.91
- >=gnome-base/gnome-settings-daemon-3.8.3
-
- x11-misc/xdg-utils
-
- >=x11-themes/adwaita-icon-theme-3.26
-
- networkmanager? (
- net-misc/mobile-broadband-provider-info
- sys-libs/timezone-data )
- ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
- telepathy? (
- >=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.19[introspection] )
- media-fonts/cantarell
-
- sys-apps/xdg-desktop-portal-gtk
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
- >=gnome-base/gdm-3.5[introspection(+)]
- >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
- browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-BDEPEND="
- dev-lang/sassc
- dev-libs/libxslt
- app-text/asciidoc
- >=dev-util/gdbus-codegen-2.45.3
- dev-util/glib-utils
- gtk-doc? ( >=dev-util/gtk-doc-1.17
- app-text/docbook-xml-dtd:4.3 )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Fix automagic gnome-bluetooth dep, bug #398145
- "${FILESDIR}"/40.0-optional-bluetooth.patch
- # Change favorites defaults, bug #479918
- "${FILESDIR}"/40.0-defaults.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- # Hack in correct python shebang
- sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth)
- -Dextensions_tool=true
- -Dextensions_app=true
- $(meson_use gtk-doc gtk_doc)
- -Dman=true
- $(meson_use networkmanager)
- $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
- # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
- # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
- ewarn "To make use of GNOME Shell's built-in screen recording utility,"
- ewarn "you need to either install media-libs/gst-plugins-good:1.0"
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
- ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
- fi
-
- if ! has_version "media-libs/mesa[llvm]"; then
- elog "llvmpipe is used as fallback when no 3D acceleration"
- elog "is available. You will need to enable llvm USE for"
- elog "media-libs/mesa if you do not have hardware 3D setup."
- fi
-
- # https://bugs.gentoo.org/show_bug.cgi?id=563084
- # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
- if has_version "x11-drivers/nvidia-drivers[-kms]"; then
- ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
- ewarn "otherwise Gnome will fail to start"
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-40.3.ebuild b/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
deleted file mode 100644
index dfb141f86a4f..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-40.3.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- ?? ( elogind systemd )"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-# * gstreamer/pipewire support is currently automagic
-DEPEND="
- >=gnome-extra/evolution-data-server-3.33.1:=
- >=app-crypt/gcr-3.7.5[introspection]
- >=dev-libs/glib-2.57.2:2
- >=dev-libs/gobject-introspection-1.49.1:=
- >=dev-libs/gjs-1.65.1
- >=x11-libs/gtk+-3.15.0:3[introspection]
- >=x11-wm/mutter-40.0:0/8[introspection]
- >=sys-auth/polkit-0.100[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.33.1
- >=x11-libs/startup-notification-0.11
- >=app-i18n/ibus-1.5.2
- >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
- >=media-libs/gstreamer-0.11.92:1.0
- media-libs/gst-plugins-base:1.0
- >=media-video/pipewire-0.3.0:0/0.3
- networkmanager? (
- >=net-misc/networkmanager-1.10.4:=[introspection]
- net-libs/libnma[introspection]
- >=app-crypt/libsecret-0.18
- dev-libs/dbus-glib )
- systemd? ( >=sys-apps/systemd-242
- >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
- elogind? ( >=sys-auth/elogind-237 )
-
- app-arch/gnome-autoar
- dev-libs/json-glib
-
- >=app-accessibility/at-spi2-atk-2.5.3
- x11-libs/gdk-pixbuf:2[introspection]
- dev-libs/libxml2:2
- x11-libs/libX11
-
- >=media-sound/pulseaudio-2[glib]
- >=dev-libs/atk-2[introspection]
- dev-libs/libical:=
- >=x11-libs/libXfixes-5.0
-
- gui-libs/gtk:4[introspection]
-
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- media-libs/mesa[X(+)]
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${DEPEND}
- >=sys-apps/accountsservice-0.6.14[introspection]
- app-accessibility/at-spi2-core:2[introspection]
- app-misc/geoclue[introspection]
- >=dev-libs/libgweather-3.26:2[introspection]
- >=sys-power/upower-0.99:=[introspection]
- x11-libs/pango[introspection]
- gnome-base/librsvg:2[introspection]
-
- >=gnome-base/gnome-session-2.91.91
- >=gnome-base/gnome-settings-daemon-3.8.3
-
- x11-misc/xdg-utils
-
- >=x11-themes/adwaita-icon-theme-3.26
-
- networkmanager? (
- net-misc/mobile-broadband-provider-info
- sys-libs/timezone-data )
- ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
- telepathy? (
- >=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.19[introspection] )
- media-fonts/cantarell
-
- sys-apps/xdg-desktop-portal-gtk
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
- >=gnome-base/gdm-3.5[introspection(+)]
- >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
- browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-BDEPEND="
- dev-lang/sassc
- dev-libs/libxslt
- app-text/asciidoc
- >=dev-util/gdbus-codegen-2.45.3
- dev-util/glib-utils
- gtk-doc? ( >=dev-util/gtk-doc-1.17
- app-text/docbook-xml-dtd:4.3 )
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Fix automagic gnome-bluetooth dep, bug #398145
- "${FILESDIR}"/40.0-optional-bluetooth.patch
- # Change favorites defaults, bug #479918
- "${FILESDIR}"/40.0-defaults.patch
-)
-
-src_prepare() {
- xdg_src_prepare
- # Hack in correct python shebang
- sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth)
- -Dextensions_tool=true
- -Dextensions_app=true
- $(meson_use gtk-doc gtk_doc)
- -Dman=true
- $(meson_use networkmanager)
- $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
- # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
- # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
- ewarn "To make use of GNOME Shell's built-in screen recording utility,"
- ewarn "you need to either install media-libs/gst-plugins-good:1.0"
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
- ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
- fi
-
- if ! has_version "media-libs/mesa[llvm]"; then
- elog "llvmpipe is used as fallback when no 3D acceleration"
- elog "is available. You will need to enable llvm USE for"
- elog "media-libs/mesa if you do not have hardware 3D setup."
- fi
-
- # https://bugs.gentoo.org/show_bug.cgi?id=563084
- # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
- if has_version "x11-drivers/nvidia-drivers[-kms]"; then
- ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
- ewarn "otherwise Gnome will fail to start"
- fi
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-40.4.ebuild b/gnome-base/gnome-shell/gnome-shell-45.2.ebuild
index 9273794623bc..704c07339fef 100644
--- a/gnome-base/gnome-shell/gnome-shell-40.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-45.2.ebuild
@@ -1,61 +1,58 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
-inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
DESCRIPTION="Provides core UI functions for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-# * gstreamer/pipewire support is currently automagic
DEPEND="
- >=gnome-extra/evolution-data-server-3.33.1:=
- >=app-crypt/gcr-3.7.5[introspection]
+ >=gnome-extra/evolution-data-server-3.46.0:=
+ >=app-crypt/gcr-3.90.0:4=[introspection]
>=dev-libs/glib-2.68:2
>=dev-libs/gobject-introspection-1.49.1:=
- >=dev-libs/gjs-1.65.1
- >=x11-libs/gtk+-3.15.0:3[introspection]
- >=x11-wm/mutter-40.0:0/8[introspection]
- >=sys-auth/polkit-0.100[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.33.1[introspection]
+ >=dev-libs/gjs-1.73.1[cairo]
+ >=gui-libs/gtk-4:4[introspection]
+ >=x11-wm/mutter-45.0:0/13[introspection,test?]
+ >=sys-auth/polkit-0.120_p20220509[introspection]
+ >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
>=x11-libs/startup-notification-0.11
- >=app-i18n/ibus-1.5.2
- >=gnome-base/gnome-desktop-3.35.90:3=[introspection]
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
- >=media-libs/gstreamer-0.11.92:1.0
- media-libs/gst-plugins-base:1.0
- >=media-video/pipewire-0.3.0:0/0.3
+ >=app-i18n/ibus-1.5.19
+ >=gnome-base/gnome-desktop-40.0:4=
networkmanager? (
- >=net-misc/networkmanager-1.10.4:=[introspection]
+ >=net-misc/networkmanager-1.10.4[introspection]
net-libs/libnma[introspection]
>=app-crypt/libsecret-0.18
- dev-libs/dbus-glib )
- systemd? ( >=sys-apps/systemd-242
- >=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+ )
+ pipewire? ( >=media-video/pipewire-0.3.49:= )
+ systemd? (
+ >=sys-apps/systemd-246:=
+ >=gnome-base/gnome-desktop-3.34.2:3=[systemd]
+ )
elogind? ( >=sys-auth/elogind-237 )
app-arch/gnome-autoar
dev-libs/json-glib
- >=app-accessibility/at-spi2-atk-2.5.3
+ >=app-accessibility/at-spi2-core-2.46:2[introspection]
x11-libs/gdk-pixbuf:2[introspection]
dev-libs/libxml2:2
x11-libs/libX11
- >=media-sound/pulseaudio-2[glib]
- >=dev-libs/atk-2[introspection]
+ >=media-libs/libpulse-2[glib]
dev-libs/libical:=
>=x11-libs/libXfixes-5.0
@@ -65,14 +62,14 @@ DEPEND="
$(python_gen_cond_dep '
dev-python/pygobject:3[${PYTHON_USEDEP}]
')
- media-libs/mesa[X(+)]
+ media-libs/libglvnd[X]
"
# Runtime-only deps are probably incomplete and approximate.
# Introspection deps generated from inspection of the output of:
# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
# or
# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
-# These will give a lot of unnecessary things due to greey matching (TODO), and `(?s).*?` doesn't seem to work as desired.
+# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
# Each block:
# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
@@ -82,20 +79,19 @@ DEPEND="
# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
# 7. IBus is needed for nls integration
-# 8. Optional telepathy chat integration
-# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632
-# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+# 8. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
+# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
RDEPEND="${DEPEND}
>=sys-apps/accountsservice-0.6.14[introspection]
app-accessibility/at-spi2-core:2[introspection]
- app-misc/geoclue[introspection]
+ app-misc/geoclue:2.0[introspection]
media-libs/graphene[introspection]
- >=dev-libs/libgweather-3.26:2[introspection]
x11-libs/pango[introspection]
- net-libs/libsoup:2.4[introspection]
+ net-libs/libsoup:3.0[introspection]
>=sys-power/upower-0.99:=[introspection]
gnome-base/librsvg:2[introspection]
+ gui-libs/libadwaita:1[introspection]
>=gnome-base/gnome-session-2.91.91
>=gnome-base/gnome-settings-daemon-3.8.3
@@ -106,20 +102,17 @@ RDEPEND="${DEPEND}
networkmanager? (
net-misc/mobile-broadband-provider-info
- sys-libs/timezone-data )
- ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
- telepathy? (
- >=net-im/telepathy-logger-0.2.4[introspection]
- >=net-libs/telepathy-glib-0.19[introspection] )
+ sys-libs/timezone-data
+ )
+ ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
media-fonts/cantarell
- sys-apps/xdg-desktop-portal-gtk
+ sys-apps/xdg-desktop-portal-gnome
"
# avoid circular dependency, see bug #546134
PDEPEND="
>=gnome-base/gdm-3.5[introspection(+)]
- >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
- browser-extension? ( gnome-extra/chrome-gnome-shell )
+ >=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
"
BDEPEND="
dev-libs/libxslt
@@ -129,31 +122,35 @@ BDEPEND="
app-text/docbook-xml-dtd:4.5 )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
+ test? (
+ sys-apps/dbus
+ x11-wm/mutter[test]
+ )
"
# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
# dev-lang/sassc
# app-text/asciidoc
PATCHES=(
- # Fix automagic gnome-bluetooth dep, bug #398145
- "${FILESDIR}"/40.0-optional-bluetooth.patch
# Change favorites defaults, bug #479918
"${FILESDIR}"/40.0-defaults.patch
)
src_prepare() {
- xdg_src_prepare
+ default
+ xdg_environment_reset
# Hack in correct python shebang
- sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+ sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
}
src_configure() {
local emesonargs=(
- $(meson_use bluetooth)
+ $(meson_use pipewire camera_monitor)
-Dextensions_tool=true
-Dextensions_app=true
$(meson_use gtk-doc gtk_doc)
-Dman=true
+ $(meson_use test tests)
$(meson_use networkmanager)
$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
@@ -163,33 +160,26 @@ src_configure() {
}
src_test() {
- virtx meson_src_test
+ # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS
+ gnome2_environment_reset
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+ virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
}
pkg_postinst() {
xdg_pkg_postinst
gnome2_schemas_update
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
- ewarn "To make use of GNOME Shell's built-in screen recording utility,"
- ewarn "you need to either install media-libs/gst-plugins-good:1.0"
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
- ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
- fi
-
if ! has_version "media-libs/mesa[llvm]"; then
elog "llvmpipe is used as fallback when no 3D acceleration"
elog "is available. You will need to enable llvm USE for"
elog "media-libs/mesa if you do not have hardware 3D setup."
fi
- # https://bugs.gentoo.org/show_bug.cgi?id=563084
- # TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
- if has_version "x11-drivers/nvidia-drivers[-kms]"; then
- ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
- ewarn "otherwise Gnome will fail to start"
- fi
+ optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
+ optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
+ optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
+ optfeature "Weather support" dev-libs/libgweather:4[introspection]
}
pkg_postrm() {
diff --git a/gnome-base/gnome-shell/gnome-shell-45.4.ebuild b/gnome-base/gnome-shell/gnome-shell-45.4.ebuild
new file mode 100644
index 000000000000..92b6670d0970
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-45.4.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+DEPEND="
+ >=gnome-extra/evolution-data-server-3.46.0:=
+ >=app-crypt/gcr-3.90.0:4=[introspection]
+ >=dev-libs/glib-2.68:2
+ >=dev-libs/gobject-introspection-1.49.1:=
+ >=dev-libs/gjs-1.73.1[cairo]
+ >=gui-libs/gtk-4:4[introspection]
+ >=x11-wm/mutter-45.0:0/13[introspection,test?]
+ >=sys-auth/polkit-0.120_p20220509[introspection]
+ >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+ >=x11-libs/startup-notification-0.11
+ >=app-i18n/ibus-1.5.19
+ >=gnome-base/gnome-desktop-40.0:4=
+ networkmanager? (
+ >=net-misc/networkmanager-1.10.4[introspection]
+ net-libs/libnma[introspection]
+ >=app-crypt/libsecret-0.18
+ )
+ pipewire? ( >=media-video/pipewire-0.3.49:= )
+ systemd? (
+ >=sys-apps/systemd-246:=
+ >=gnome-base/gnome-desktop-3.34.2:3=[systemd]
+ )
+ elogind? ( >=sys-auth/elogind-237 )
+
+ app-arch/gnome-autoar
+ dev-libs/json-glib
+
+ >=app-accessibility/at-spi2-core-2.46:2[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ dev-libs/libxml2:2
+ x11-libs/libX11
+
+ >=media-libs/libpulse-2[glib]
+ dev-libs/libical:=
+ >=x11-libs/libXfixes-5.0
+
+ gui-libs/gtk:4[introspection]
+
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ media-libs/libglvnd[X]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated from inspection of the output of:
+# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
+# or
+# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
+# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
+# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
+# Each block:
+# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. xdg-utils needed for xdg-open, used by extension tool
+# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
+# 7. IBus is needed for nls integration
+# 8. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
+# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+ >=sys-apps/accountsservice-0.6.14[introspection]
+ app-accessibility/at-spi2-core:2[introspection]
+ app-misc/geoclue:2.0[introspection]
+ media-libs/graphene[introspection]
+ x11-libs/pango[introspection]
+ net-libs/libsoup:3.0[introspection]
+ >=sys-power/upower-0.99:=[introspection]
+ gnome-base/librsvg:2[introspection]
+ gui-libs/libadwaita:1[introspection]
+
+ >=gnome-base/gnome-session-2.91.91
+ >=gnome-base/gnome-settings-daemon-3.8.3
+
+ x11-misc/xdg-utils
+
+ >=x11-themes/adwaita-icon-theme-3.26
+
+ networkmanager? (
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data
+ )
+ ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
+ media-fonts/cantarell
+
+ sys-apps/xdg-desktop-portal-gnome
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+ >=gnome-base/gdm-3.5[introspection(+)]
+ >=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
+"
+BDEPEND="
+ dev-libs/libxslt
+ >=dev-util/gdbus-codegen-2.45.3
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.17
+ app-text/docbook-xml-dtd:4.5 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? (
+ sys-apps/dbus
+ x11-wm/mutter[test]
+ )
+"
+# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
+# dev-lang/sassc
+# app-text/asciidoc
+
+PATCHES=(
+ # Change favorites defaults, bug #479918
+ "${FILESDIR}"/40.0-defaults.patch
+)
+
+src_prepare() {
+ default
+ xdg_environment_reset
+ # Hack in correct python shebang
+ sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use pipewire camera_monitor)
+ -Dextensions_tool=true
+ -Dextensions_app=true
+ $(meson_use gtk-doc gtk_doc)
+ -Dman=true
+ $(meson_use test tests)
+ $(meson_use networkmanager)
+ $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+ # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+ )
+ meson_src_configure
+}
+
+src_test() {
+ # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS
+ gnome2_environment_reset
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+ virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version "media-libs/mesa[llvm]"; then
+ elog "llvmpipe is used as fallback when no 3D acceleration"
+ elog "is available. You will need to enable llvm USE for"
+ elog "media-libs/mesa if you do not have hardware 3D setup."
+ fi
+
+ optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
+ optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
+ optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
+ optfeature "Weather support" dev-libs/libgweather:4[introspection]
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-shell/gnome-shell-45.5.ebuild b/gnome-base/gnome-shell/gnome-shell-45.5.ebuild
new file mode 100644
index 000000000000..cb942e8cc4ab
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-45.5.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+DEPEND="
+ >=gnome-extra/evolution-data-server-3.46.0:=
+ >=app-crypt/gcr-3.90.0:4=[introspection]
+ >=dev-libs/glib-2.68:2
+ >=dev-libs/gobject-introspection-1.49.1:=
+ >=dev-libs/gjs-1.73.1[cairo]
+ >=gui-libs/gtk-4:4[introspection]
+ >=x11-wm/mutter-45.0:0/13[introspection,test?]
+ >=sys-auth/polkit-0.120_p20220509[introspection]
+ >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+ >=x11-libs/startup-notification-0.11
+ >=app-i18n/ibus-1.5.19
+ >=gnome-base/gnome-desktop-40.0:4=
+ networkmanager? (
+ >=net-misc/networkmanager-1.10.4[introspection]
+ net-libs/libnma[introspection]
+ >=app-crypt/libsecret-0.18
+ )
+ pipewire? ( >=media-video/pipewire-0.3.49:= )
+ systemd? (
+ >=sys-apps/systemd-246:=
+ >=gnome-base/gnome-desktop-3.34.2:3=[systemd]
+ )
+ elogind? ( >=sys-auth/elogind-237 )
+
+ app-arch/gnome-autoar
+ dev-libs/json-glib
+
+ >=app-accessibility/at-spi2-core-2.46:2[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ dev-libs/libxml2:2
+ x11-libs/libX11
+
+ >=media-libs/libpulse-2[glib]
+ dev-libs/libical:=
+ >=x11-libs/libXfixes-5.0
+
+ gui-libs/gtk:4[introspection]
+
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ media-libs/libglvnd[X]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated from inspection of the output of:
+# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
+# or
+# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
+# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
+# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
+# Each block:
+# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. xdg-utils needed for xdg-open, used by extension tool
+# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
+# 7. IBus is needed for nls integration
+# 8. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
+# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+ >=sys-apps/accountsservice-0.6.14[introspection]
+ app-accessibility/at-spi2-core:2[introspection]
+ app-misc/geoclue:2.0[introspection]
+ media-libs/graphene[introspection]
+ x11-libs/pango[introspection]
+ net-libs/libsoup:3.0[introspection]
+ >=sys-power/upower-0.99:=[introspection]
+ gnome-base/librsvg:2[introspection]
+ gui-libs/libadwaita:1[introspection]
+
+ >=gnome-base/gnome-session-2.91.91
+ >=gnome-base/gnome-settings-daemon-3.8.3
+
+ x11-misc/xdg-utils
+
+ >=x11-themes/adwaita-icon-theme-3.26
+
+ networkmanager? (
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data
+ )
+ ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
+ media-fonts/cantarell
+
+ sys-apps/xdg-desktop-portal-gnome
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+ >=gnome-base/gdm-3.5[introspection(+)]
+ >=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
+"
+BDEPEND="
+ dev-libs/libxslt
+ >=dev-util/gdbus-codegen-2.45.3
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.17
+ app-text/docbook-xml-dtd:4.5 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? (
+ sys-apps/dbus
+ x11-wm/mutter[test]
+ )
+"
+# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
+# dev-lang/sassc
+# app-text/asciidoc
+
+PATCHES=(
+ # Change favorites defaults, bug #479918
+ "${FILESDIR}"/40.0-defaults.patch
+)
+
+src_prepare() {
+ default
+ xdg_environment_reset
+ # Hack in correct python shebang
+ sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use pipewire camera_monitor)
+ -Dextensions_tool=true
+ -Dextensions_app=true
+ $(meson_use gtk-doc gtk_doc)
+ -Dman=true
+ $(meson_use test tests)
+ $(meson_use networkmanager)
+ $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+ # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+ )
+ meson_src_configure
+}
+
+src_test() {
+ # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS
+ gnome2_environment_reset
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+ virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version "media-libs/mesa[llvm]"; then
+ elog "llvmpipe is used as fallback when no 3D acceleration"
+ elog "is available. You will need to enable llvm USE for"
+ elog "media-libs/mesa if you do not have hardware 3D setup."
+ fi
+
+ optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
+ optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
+ optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
+ optfeature "Weather support" dev-libs/libgweather:4[introspection]
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-shell/gnome-shell-45.6.ebuild b/gnome-base/gnome-shell/gnome-shell-45.6.ebuild
new file mode 100644
index 000000000000..92b6670d0970
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-45.6.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit gnome.org gnome2-utils meson optfeature python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell https://gitlab.gnome.org/GNOME/gnome-shell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="elogind gtk-doc +ibus +networkmanager pipewire systemd test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ ?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+DEPEND="
+ >=gnome-extra/evolution-data-server-3.46.0:=
+ >=app-crypt/gcr-3.90.0:4=[introspection]
+ >=dev-libs/glib-2.68:2
+ >=dev-libs/gobject-introspection-1.49.1:=
+ >=dev-libs/gjs-1.73.1[cairo]
+ >=gui-libs/gtk-4:4[introspection]
+ >=x11-wm/mutter-45.0:0/13[introspection,test?]
+ >=sys-auth/polkit-0.120_p20220509[introspection]
+ >=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+ >=x11-libs/startup-notification-0.11
+ >=app-i18n/ibus-1.5.19
+ >=gnome-base/gnome-desktop-40.0:4=
+ networkmanager? (
+ >=net-misc/networkmanager-1.10.4[introspection]
+ net-libs/libnma[introspection]
+ >=app-crypt/libsecret-0.18
+ )
+ pipewire? ( >=media-video/pipewire-0.3.49:= )
+ systemd? (
+ >=sys-apps/systemd-246:=
+ >=gnome-base/gnome-desktop-3.34.2:3=[systemd]
+ )
+ elogind? ( >=sys-auth/elogind-237 )
+
+ app-arch/gnome-autoar
+ dev-libs/json-glib
+
+ >=app-accessibility/at-spi2-core-2.46:2[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ dev-libs/libxml2:2
+ x11-libs/libX11
+
+ >=media-libs/libpulse-2[glib]
+ dev-libs/libical:=
+ >=x11-libs/libXfixes-5.0
+
+ gui-libs/gtk:4[introspection]
+
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ ')
+ media-libs/libglvnd[X]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated from inspection of the output of:
+# for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
+# or
+# rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
+# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
+# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
+# Each block:
+# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. xdg-utils needed for xdg-open, used by extension tool
+# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c # TODO: Review
+# 7. IBus is needed for nls integration
+# 8. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 9. xdg-desktop-portal-gtk for various integration, e.g. #764632
+# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+ >=sys-apps/accountsservice-0.6.14[introspection]
+ app-accessibility/at-spi2-core:2[introspection]
+ app-misc/geoclue:2.0[introspection]
+ media-libs/graphene[introspection]
+ x11-libs/pango[introspection]
+ net-libs/libsoup:3.0[introspection]
+ >=sys-power/upower-0.99:=[introspection]
+ gnome-base/librsvg:2[introspection]
+ gui-libs/libadwaita:1[introspection]
+
+ >=gnome-base/gnome-session-2.91.91
+ >=gnome-base/gnome-settings-daemon-3.8.3
+
+ x11-misc/xdg-utils
+
+ >=x11-themes/adwaita-icon-theme-3.26
+
+ networkmanager? (
+ net-misc/mobile-broadband-provider-info
+ sys-libs/timezone-data
+ )
+ ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
+ media-fonts/cantarell
+
+ sys-apps/xdg-desktop-portal-gnome
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+ >=gnome-base/gdm-3.5[introspection(+)]
+ >=gnome-base/gnome-control-center-3.26[networkmanager(+)?]
+"
+BDEPEND="
+ dev-libs/libxslt
+ >=dev-util/gdbus-codegen-2.45.3
+ dev-util/glib-utils
+ gtk-doc? ( >=dev-util/gtk-doc-1.17
+ app-text/docbook-xml-dtd:4.5 )
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ test? (
+ sys-apps/dbus
+ x11-wm/mutter[test]
+ )
+"
+# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
+# dev-lang/sassc
+# app-text/asciidoc
+
+PATCHES=(
+ # Change favorites defaults, bug #479918
+ "${FILESDIR}"/40.0-defaults.patch
+)
+
+src_prepare() {
+ default
+ xdg_environment_reset
+ # Hack in correct python shebang
+ sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use pipewire camera_monitor)
+ -Dextensions_tool=true
+ -Dextensions_app=true
+ $(meson_use gtk-doc gtk_doc)
+ -Dman=true
+ $(meson_use test tests)
+ $(meson_use networkmanager)
+ $(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+ # (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+ # suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+ )
+ meson_src_configure
+}
+
+src_test() {
+ # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file modifying XDG_DATA_DIRS
+ gnome2_environment_reset
+ export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+ virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+
+ if ! has_version "media-libs/mesa[llvm]"; then
+ elog "llvmpipe is used as fallback when no 3D acceleration"
+ elog "is available. You will need to enable llvm USE for"
+ elog "media-libs/mesa if you do not have hardware 3D setup."
+ fi
+
+ optfeature "Bluetooth integration" gnome-base/gnome-control-center[bluetooth] net-wireless/gnome-bluetooth:3[introspection]
+ optfeature "Browser extension integration" gnome-extra/gnome-browser-connector
+ optfeature "Screencast/capture support" media-video/pipewire media-libs/gstreamer[introspection] media-libs/gst-plugins-base[introspection] media-libs/gst-plugins-good media-plugins/gst-plugins-vpx
+ optfeature "Weather support" dev-libs/libgweather:4[introspection]
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
index d018015fff8a..15eeaba9eda9 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/metadata.xml
@@ -1,24 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription>
- GNOME Shell provides core user interface functions for the GNOME 3
- desktop, like switching to windows and launching applications.
- GNOME Shell takes advantage of the capabilities of modern graphics
- hardware and introduces innovative user interface concepts to
- provide a visually attractive and easy to use experience.
-</longdescription>
-<use>
- <flag name="browser-extension">Ensure the presence of extensions.gnome.org
- native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking
- and suspend support.</flag>
- <flag name="ibus">Enable support for enhanced input methods through
- <pkg>app-i18n/ibus</pkg></flag>
- <flag name="telepathy">Ensure presence of telepathy chat integration</flag>
-</use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription>
+ GNOME Shell provides core user interface functions for the GNOME 3
+ desktop, like switching to windows and launching applications.
+ GNOME Shell takes advantage of the capabilities of modern graphics
+ hardware and introduces innovative user interface concepts to
+ provide a visually attractive and easy to use experience.
+ </longdescription>
+ <use>
+ <flag name="pipewire">Use pipewire to enable the camera monitor</flag>
+ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking and suspend support.</flag>
+ <flag name="ibus">Enable support for enhanced input methods through <pkg>app-i18n/ibus</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gnome-shell</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
deleted file mode 100644
index 66d8544c7d33..000000000000
--- a/gnome-base/gnome-vfs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
deleted file mode 100644
index cdc88c24b6a3..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c
---- gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c 2005-08-23 01:34:36.000000000 +0800
-+++ gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c 2005-09-18 20:30:47.000000000 +0800
-@@ -35,7 +35,7 @@
-
- static struct FSInfo fs_data[] = {
- { "affs" , N_("AFFS Volume"), 0},
-- { "afs" , N_("AFS Network Volume"), 0 },
-+ { "afs" , N_("AFS Network Volume"), 1 },
- { "auto" , N_("Auto-detected Volume"), 0 },
- { "cd9660" , N_("CD-ROM Drive"), 0 },
- { "cdda" , N_("CD Digital Audio"), 0 },
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
deleted file mode 100644
index 9d6e9978242f..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -191,6 +191,16 @@
-
- AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)
-
-+AC_CHECK_HEADERS([pwd.h])
-+if test "$ac_cv_header_pwd_h" = "yes"; then
-+ AC_DEFINE(HAVE_PWD_H, [1], [pwd.h present])
-+fi
-+
-+AC_CHECK_HEADERS([grp.h])
-+if test "$ac_cv_header_grp_h" = "yes"; then
-+ AC_DEFINE(HAVE_GRP_H, [1], [grp.h present])
-+fi
-+
- dnl
- dnl file system type member in statfs struct
- dnl
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
deleted file mode 100644
index 6905060a4f71..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c
---- gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c 2006-07-07 04:46:39.000000000 -0400
-+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c 2006-09-21 11:22:49.000000000 -0400
-@@ -236,6 +236,8 @@
- gnome_vfs_volume_monitor_client_init (GnomeVFSVolumeMonitorClient *volume_monitor_client)
- {
- setup_dbus_connection (volume_monitor_client);
-+ if (!volume_monitor_client->dbus_conn)
-+ return;
- read_drives_from_daemon (volume_monitor_client);
- read_volumes_from_daemon (volume_monitor_client);
- }
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
deleted file mode 100644
index 18d900ac12cd..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -448,9 +448,13 @@
- dnl GSSAPI
- dnl Check for Kerberos installation
- have_gssapi=no
-+
-+AC_ARG_ENABLE(krb5,
-+ AS_HELP_STRING([--enable-krb5],[Enable Kerberos 5 support]),
-+ [],[enable_krb5=yes])
- AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
--
--if test "x$KRB5_CONFIG" != "xnone"; then
-+
-+if test "x$KRB5_CONFIG" != "xnone" -a "x$enable_krb5" = "xyes"; then
- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
-
-@@ -481,8 +485,12 @@
- break
- ])
- LIBS="$saved_LIBS"
-- CPPFLAGS="$saved_CPPFLAGS"
--fi
-+ CPPFLAGS="$saved_CPPFLAGS"
-+fi
-+
-+if test "x$KRB5_CONFIG" = "xnone" -a "x$enable_krb5" = "xyes"; then
-+ AC_MSG_ERROR([*** kerberos 5 support enabled but krb5-config not found ***])
-+fi
- AC_SUBST(GSSAPI_LIBS)
- AC_SUBST(GSSAPI_CFLAGS)
-
-@@ -1077,9 +1085,13 @@
- dnl =====================
- dnl ACL checks
- dnl =====================
--acl_backends=""
-+acl_backends="none"
- ACL_LIBS=""
-
-+AC_ARG_ENABLE(acl,
-+ AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
-+ [],[enable_acl=yes])
-+
- AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
- AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
- AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
-@@ -1102,7 +1114,7 @@
- gvfs_cv_HAVE_POSIX_ACLS=yes, gvfs_cv_HAVE_POSIX_ACLS=no)
- LIBS=$acl_LIBS])
-
--if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" ; then
-+if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
- have_solaris_acl_support=yes
- acl_backends="solaris"
-
-@@ -1110,7 +1122,7 @@
- AC_CHECK_HEADERS([pwd.h grp.h])
- fi
-
--if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" ; then
-+if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
- have_posix_acl_support=yes
- acl_backends="posix"
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
deleted file mode 100644
index 63be9f95b9dc..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1102,6 +1102,7 @@
- AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
- [],[enable_acl=yes])
-
-+if test "x$enable_acl" = "xyes"; then
- AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
- AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
- AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
-@@ -1189,6 +1190,8 @@
- fi
-
-+fi
- AC_SUBST(ACL_LIBS)
-+
- AM_CONDITIONAL(HAVE_POSIX_ACL, test x"$have_posix_acl_support" = x"yes")
- AM_CONDITIONAL(HAVE_SOLARIS_ACL, test x"$have_solaris_acl_support" = x"yes")
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
deleted file mode 100644
index e76a9837136a..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 8427c2daf543353f42b932b5137b6ec590f6589b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 00:42:31 +0200
-Subject: [PATCH 7/9] Prevent duplicated volumes, bug #193083
-
----
- libgnomevfs/gnome-vfs-unix-mounts.c | 39 +++++++++++++++++++++++++++++++++-
- 1 files changed, 37 insertions(+), 2 deletions(-)
-
-diff --git a/libgnomevfs/gnome-vfs-unix-mounts.c b/libgnomevfs/gnome-vfs-unix-mounts.c
-index 51a009b..3eee305 100644
---- a/libgnomevfs/gnome-vfs-unix-mounts.c
-+++ b/libgnomevfs/gnome-vfs-unix-mounts.c
-@@ -40,6 +40,10 @@
- #ifdef HAVE_POLL_H
- #include <poll.h>
- #endif
-+
-+#include <limits.h>
-+#include <stdlib.h>
-+
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/time.h>
-@@ -290,6 +294,15 @@ _gnome_vfs_get_current_unix_mounts (GList **return_list)
-
- mount_entry->mount_path = g_strdup (mntent->mnt_dir);
- mount_entry->device_path = g_strdup (mntent->mnt_fsname);
-+
-+ if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) {
-+ char rpath[PATH_MAX];
-+ if (realpath (mntent->mnt_fsname, rpath)) {
-+ g_free (mount_entry->device_path);
-+ mount_entry->device_path = g_strdup (rpath);
-+ }
-+ }
-+
- mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
-
- g_hash_table_insert (mounts_hash,
-@@ -571,9 +584,31 @@ _gnome_vfs_get_unix_mount_table (GList **return_list)
- }
-
- mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
--
-+
-+ if(strlen(mntent->mnt_fsname) >= 5 && !strncmp (mntent->mnt_fsname, "UUID=", 5)) {
-+ mount_entry->device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mntent->mnt_fsname+5);
-+ }
-+ else if(strlen(mntent->mnt_fsname) >= 6 && !strncmp (mntent->mnt_fsname, "LABEL=", 6)) {
-+ mount_entry->device_path = g_strdup_printf ("/dev/disk/by-label/%s", mntent->mnt_fsname+6);
-+ }
-+ else {
-+ mount_entry->device_path = g_strdup (mntent->mnt_fsname);
-+ }
-+
-+ if (g_file_test (mount_entry->device_path, G_FILE_TEST_IS_SYMLINK)) {
-+ char rpath[PATH_MAX];
-+ if (realpath (mount_entry->device_path, rpath)) {
-+ g_free (mount_entry->device_path);
-+ mount_entry->device_path = g_strdup (rpath);
-+ }
-+ else {
-+ g_free (mount_entry->device_path);
-+ g_free (mount_entry);
-+ continue;
-+ }
-+ }
-+
- mount_entry->mount_path = g_strdup (mntent->mnt_dir);
-- mount_entry->device_path = g_strdup (mntent->mnt_fsname);
- mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
-
- #ifdef HAVE_HASMNTOPT
---
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
deleted file mode 100644
index 69f470a396a9..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- configure.in | 2 +-
- test/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 7335451..7817998 100644
---- a/configure.in
-+++ b/configure.in
-@@ -33,7 +33,7 @@ AC_SUBST(LIBGNOMEVFS_REVISION)
- AC_SUBST(LIBGNOMEVFS_AGE)
- AC_SUBST(LIBGNOMEVFS_VERSION)
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE(gnome-vfs, $LIBGNOMEVFS_VERSION)
-
- dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 5b0992e..626bdec 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -65,7 +65,7 @@ TESTS = test-acl \
- test-async-cancel \
- test-escape \
- test-uri \
-- $(srcdir)/auto-test
-+ auto-test
-
- libraries = \
- $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch
deleted file mode 100644
index 45ca015573f0..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b7dabab33e00bdbd8b566ca058a1bce7dec2b77d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 01:45:21 +0200
-Subject: [PATCH 8/9] Do not build tests unless required
-
----
- test/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 5b0992e..a1aefa0 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -14,7 +14,7 @@ else
- platform_only_programs = test-dns-sd test-symlinks test-parse-ls-lga
- endif
-
--noinst_PROGRAMS = \
-+check_PROGRAMS = \
- test-acl \
- test-address \
- test-async \
---
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch
deleted file mode 100644
index 2684c92ec098..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 390c1f6c06917f54cfacd5f85834d02c231cc2ea Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 01:46:31 +0200
-Subject: [PATCH 9/9] Disable broken test, bug #285706, upstream #618089
-
----
- test/Makefile.am | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index a1aefa0..c18f2e4 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -62,7 +62,6 @@ TESTS_ENVIRONMENT = GNOME_VFS_MODULE_PATH=$(top_builddir)/modules/.libs \
- SRCDIR=$(srcdir)
- TESTS = test-acl \
- test-address \
-- test-async-cancel \
- test-escape \
- test-uri \
- $(srcdir)/auto-test
---
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
deleted file mode 100644
index 93ebd17c7eff..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Debian #529827
-GNOME #574589
-Gentoo #253729
-Patch by Gilles Dartiguelongue, fixed for correctly setting have_ssl
-
-Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
-Use pkg-config in place of gnutls own macro since it's not present anymore.
-
-As gnome-vfs-ssl.c also directly uses libgcrypt, we need to make sure that
-configure checks for it. Use AM_PATH_LIBGCRYPT macro for that.
-
-
-Index: gnome-vfs-2.24.4/configure.in
-===================================================================
---- gnome-vfs-2.24.4.orig/configure.in 2011-03-16 14:07:18.901009688 +0100
-+++ gnome-vfs-2.24.4/configure.in 2011-03-16 14:16:19.317009687 +0100
-@@ -667,15 +667,14 @@
- if test "x${OPENSSL_LIBS}" != "x"; then
- AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
- else
-- AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
-- AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-- have_ssl=true])
--
-+ AM_PATH_LIBGCRYPT
-+ if test "x${LIBGCRYPT_LIBS}" = "x"; then
-+ AC_MSG_ERROR([Unable to find LIBGRYPT])
-+ fi
-+ PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+ have_ssl=true])
- if test "x${LIBGNUTLS_LIBS}" = "x"; then
-- AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-- AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
-- have_ssl=true],
-- AC_MSG_ERROR([Unable to find GNUTLS]))
-+ AC_MSG_ERROR([Unable to find GNUTLS])
- fi
- fi
- fi
-@@ -1045,8 +1044,8 @@
- dnl ==============================================================================
-
- PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
--LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
--LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
-+LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $LIBGCRYPT_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
-+LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
- AC_SUBST(LIBGNOMEVFS_CFLAGS)
- AC_SUBST(LIBGNOMEVFS_LIBS)
-
-Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
-===================================================================
---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2011-03-16 14:07:18.861009688 +0100
-+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2011-03-16 14:09:17.517009687 +0100
-@@ -61,13 +61,6 @@
- #endif
- #endif
-
--#if defined GNUTLS_COMPAT
--#define gnutls_certificate_credentials GNUTLS_CERTIFICATE_CREDENTIALS
--#define gnutls_session GNUTLS_STATE
--#define gnutls_certificate_free_credentials gnutls_certificate_free_sc
--#define gnutls_certificate_allocate_credentials gnutls_certificate_allocate_sc
--#endif
--
- typedef struct {
- #ifdef HAVE_OPENSSL
- int sockfd;
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
deleted file mode 100644
index 78942f06ea11..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2010-02-09 14:16:14.000000000 +0200
-+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2015-04-14 00:01:51.272451668 +0300
-@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand
- #endif
- }
-
--#ifdef HAVE_GNUTLS
--static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
--static const int cipher_priority[] =
-- {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
-- GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
--static const int comp_priority[] =
-- {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0};
--static const int kx_priority[] =
-- {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0};
--static const int mac_priority[] =
-- {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
--
--#endif
--
--
- /**
- * gnome_vfs_ssl_create_from_fd:
- * @handle_return: pointer to a #GnomeVFSSSL struct, which will
-@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
- gnutls_transport_set_ptr (ssl->private->tlsstate,
- GINT_TO_POINTER (fd));
-
-- gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority);
-- gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority);
-- gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority);
-- gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority);
-- gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority);
-+ gnutls_set_default_priority (ssl->private->tlsstate);
-
- gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE,
- ssl->private->xcred);
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch
deleted file mode 100644
index 991286aa4de6..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 01dba45f0d15b7e23f21d19776d64f69879cd27a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 00:41:01 +0200
-Subject: [PATCH 5/9] Fix to identify ${HOME} (#200897)
-
-Thanks to debian folks.
----
- libgnomevfs/gnome-vfs-application-registry.c | 2 +-
- libgnomevfs/gnome-vfs-init.c | 3 +-
- libgnomevfs/gnome-vfs-private-utils.c | 52 ++++++++++++++++++++++++++
- libgnomevfs/gnome-vfs-private-utils.h | 2 +
- modules/file-method.c | 6 +-
- 5 files changed, 60 insertions(+), 5 deletions(-)
-
-diff --git a/libgnomevfs/gnome-vfs-application-registry.c b/libgnomevfs/gnome-vfs-application-registry.c
-index 0b11cc5..051ea44 100644
---- a/libgnomevfs/gnome-vfs-application-registry.c
-+++ b/libgnomevfs/gnome-vfs-application-registry.c
-@@ -965,7 +965,7 @@ gnome_vfs_application_registry_init (void)
- NULL);
- gnome_registry_dir.system_dir = TRUE;
-
-- user_registry_dir.dirname = g_build_filename (g_get_home_dir(),
-+ user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(),
- ".gnome",
- "application-info",
- NULL);
-diff --git a/libgnomevfs/gnome-vfs-init.c b/libgnomevfs/gnome-vfs-init.c
-index e3fd5d9..c07cf06 100644
---- a/libgnomevfs/gnome-vfs-init.c
-+++ b/libgnomevfs/gnome-vfs-init.c
-@@ -118,7 +118,8 @@ gnome_vfs_init (void)
- char *bogus_argv[2] = { "dummy", NULL };
- */
-
-- if (!ensure_dot_gnome_exists ()) {
-+ /* The first call also checks that ~/.gnome2 is writable. */
-+ if (!gnome_vfs_get_home_dir ()) {
- return FALSE;
- }
-
-diff --git a/libgnomevfs/gnome-vfs-private-utils.c b/libgnomevfs/gnome-vfs-private-utils.c
-index 7fafde3..7ad8fbc 100644
---- a/libgnomevfs/gnome-vfs-private-utils.c
-+++ b/libgnomevfs/gnome-vfs-private-utils.c
-@@ -34,6 +34,7 @@
- #include "gnome-vfs-uri.h"
- #include <errno.h>
- #include <glib.h>
-+#include <glib/gstdio.h>
- #include <gconf/gconf-client.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -1085,3 +1086,54 @@ _gnome_vfs_winsock_strerror (int error)
- }
- #endif
-
-+static gboolean
-+ensure_dot_gnome_exists (gchar *home_dir)
-+{
-+ gboolean retval = TRUE;
-+ gchar *dirname;
-+
-+ dirname = g_build_filename (home_dir, ".gnome2", NULL);
-+
-+ if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
-+ if (g_mkdir (dirname, S_IRWXU) != 0) {
-+ g_warning ("Unable to create ~/.gnome2 directory: %s",
-+ g_strerror (errno));
-+ retval = FALSE;
-+ }
-+ } else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
-+ g_warning ("Error: ~/.gnome2 must be a directory.");
-+ retval = FALSE;
-+ }
-+
-+ g_free (dirname);
-+ return retval;
-+}
-+
-+/**
-+ * gnome_vfs_get_home_dir:
-+ *
-+ * If ~/.gnome2 is writable, return the home directory
-+ * Otherwise, return the contents of the HOME environment variable
-+ *
-+ * Return value: home directory if successful, NULL otherwise.
-+ * Do not free the value returned.
-+ */
-+const gchar *
-+gnome_vfs_get_home_dir (void)
-+{
-+ static gchar *home = NULL;
-+
-+ if (home == NULL) {
-+ gchar *tmp = g_get_home_dir ();
-+ if (ensure_dot_gnome_exists (tmp)) {
-+ home = g_strdup (tmp);
-+ } else {
-+ gchar *tmp2 = g_getenv ("HOME");
-+ if (!g_str_equal (tmp, tmp2) && ensure_dot_gnome_exists (tmp2)) {
-+ home = g_strdup (tmp2);
-+ }
-+ }
-+ }
-+
-+ return home;
-+}
-diff --git a/libgnomevfs/gnome-vfs-private-utils.h b/libgnomevfs/gnome-vfs-private-utils.h
-index 981c6d9..fe282a2 100644
---- a/libgnomevfs/gnome-vfs-private-utils.h
-+++ b/libgnomevfs/gnome-vfs-private-utils.h
-@@ -124,6 +124,8 @@ const char *_gnome_vfs_winsock_strerror (int error);
-
- #endif
-
-+const gchar *gnome_vfs_get_home_dir (void);
-+
- G_END_DECLS
-
- #endif /* _GNOME_VFS_PRIVATE_UTILS_H */
-diff --git a/modules/file-method.c b/modules/file-method.c
-index 37e4853..7265e58 100644
---- a/modules/file-method.c
-+++ b/modules/file-method.c
-@@ -1531,7 +1531,7 @@ save_trash_entry_cache (void)
- GList *p;
- char *buffer, *escaped_path, *escaped_mount_point;
-
-- cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
-+ cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
- cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME);
-
- if (mkdir_recursive (cache_file_parent, 0777) != 0) {
-@@ -1670,7 +1670,7 @@ read_saved_cached_trash_entries (void)
- cached_trash_directories = NULL;
-
- /* read in the entries from disk */
-- cache_file_path = g_build_filename (g_get_home_dir (),
-+ cache_file_path = g_build_filename (gnome_vfs_get_home_dir (),
- TRASH_ENTRY_CACHE_PARENT,
- TRASH_ENTRY_CACHE_NAME,
- NULL);
-@@ -1942,7 +1942,7 @@ do_find_directory (GnomeVFSMethod *method,
- return GNOME_VFS_ERROR_INVALID_URI;
-
- /* We will need the URI and the stat structure for the home directory. */
-- home_directory = g_get_home_dir ();
-+ home_directory = gnome_vfs_get_home_dir ();
-
- if (gnome_vfs_context_check_cancellation (context)) {
- g_free (full_name_near);
---
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
deleted file mode 100644
index cb1886ef4a29..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
-
-struct SSL is opaque in openssl-1.1; and the SSL_free() man page
-says that one should not free members of it manually (in both
-the openssl-1.0 and openssl-1.1 man pages).
-
---- a/libgnomevfs/gnome-vfs-ssl.c
-+++ b/libgnomevfs/gnome-vfs-ssl.c
-@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
- }
- }
-
-- if (ssl->private->ssl->ctx)
-- SSL_CTX_free (ssl->private->ssl->ctx);
--
- SSL_free (ssl->private->ssl);
- g_free (ssl->private);
- g_free (ssl);
-@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
- }
- }
-
-- SSL_CTX_free (ssl->private->ssl->ctx);
- SSL_free (ssl->private->ssl);
- close (ssl->private->sockfd);
- if (ssl->private->timeout)
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
deleted file mode 100644
index 896aa98ef1fe..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
-
-RDEPEND="
- >=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
- >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
- gnome-base/gnome-mime-data
- >=x11-misc/shared-mime-info-0.14
- >=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
- acl? (
- >=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
- >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
- ssl? (
- gnutls? (
- >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
- !gnome-extra/gnome-vfs-sftp )
- !gnutls? (
- >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
- !gnome-extra/gnome-vfs-sftp ) )
- zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- sys-devel/gettext
- gnome-base/gnome-common
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- >=dev-util/gtk-doc-am-1.13
-"
-
-DOCS=( "${S}"/{AUTHORS,ChangeLog,HACKING,NEWS,README,TODO} )
-
-PATCHES=(
- # Allow the Trash on afs filesystems (#106118)
- "${FILESDIR}"/${PN}-2.12.0-afs.patch
-
- # Fix compiling with headers missing
- "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
-
- # Fix for crashes running programs via sudo
- "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
-
- # Fix automagic dependencies, upstream bug #493475
- "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
- "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
-
- # Fix to identify ${HOME} (#200897)
- # thanks to debian folks
- "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
-
- # Configure with gnutls-2.7, bug #253729
- # Fix building with gnutls-2.12, bug #388895
- "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
-
- # Prevent duplicated volumes, bug #193083
- "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
-
- # Do not build tests with FEATURES="-test", bug #226221
- "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
-
- # Disable broken test, bug #285706
- "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
-
- # Fix for automake-1.13 compatibility, #466944
- "${FILESDIR}"/${P}-automake-1.13.patch
-
- # Fix gnutls-3.4+ compatibility, #560084
- # always use system defaults (patch from Arch Linux)
- "${FILESDIR}"/${P}-gnutls34.patch
-
- # Fix build with openssl-1.1 #592540
- "${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
-)
-
-multilib_src_configure() {
- local myconf=(
- --disable-schemas-install
- --disable-static
- --disable-cdda
- --disable-fam
- --disable-hal
- --disable-howl
- $(use_enable acl)
- $(use_enable gnutls)
- $(use_enable ipv6)
- $(use_enable kerberos krb5)
- $(use_enable samba)
- $(use_enable ssl openssl)
- $(use_enable zeroconf avahi)
- # Useless ? --enable-http-neon
-
- # fix path to krb5-config
- KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
- )
-
- # this works because of the order of configure parsing
- # so should always be behind the use_enable options
- # foser <foser@gentoo.org 19 Apr 2004
- use gnutls && use ssl && myconf+=( --disable-openssl )
-
- #bug #519060
- #configure script is so messed up on res_init on Darwin
- [[ ${CHOST} == *-darwin* ]] && export LIBS="${LIBS} -lresolv"
-
- ECONF_SOURCE=${S} \
- gnome2_src_configure "${myconf[@]}"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/html doc/html || die
- fi
-}
-
-multilib_src_test() {
- unset DISPLAY
- # Fix bug #285706
- unset XAUTHORITY
- virtx emake check
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
diff --git a/gnome-base/gnome-vfs/metadata.xml b/gnome-base/gnome-vfs/metadata.xml
deleted file mode 100644
index 7b343b06be8a..000000000000
--- a/gnome-base/gnome-vfs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gnome/gnome-40.0.ebuild b/gnome-base/gnome/gnome-45.2.ebuild
index 6e8e07da5399..450642dbd76b 100644
--- a/gnome-base/gnome/gnome-40.0.ebuild
+++ b/gnome-base/gnome/gnome-45.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="Meta package for GNOME, merge this package to install"
HOMEPAGE="https://www.gnome.org/"
@@ -11,7 +11,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
IUSE="accessibility +bluetooth +classic cups +extras"
@@ -22,25 +22,24 @@ RDEPEND="
>=gnome-base/gnome-core-libs-${PV}[cups?]
>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?]
- >=gnome-base/gdm-40.0
+ >=gnome-base/gdm-45.0.1
- >=x11-wm/mutter-${PV}
- >=gnome-base/gnome-shell-${PV}[bluetooth?]
- >=media-fonts/cantarell-0.301
+ >=x11-wm/mutter-45.2
+ >=gnome-base/gnome-shell-45.2
+ >=media-fonts/cantarell-0.303.1
- >=x11-themes/gnome-backgrounds-40.0
+ >=x11-themes/gnome-backgrounds-45.0
x11-themes/sound-theme-freedesktop
accessibility? (
- >=app-accessibility/at-spi2-atk-2.38.0
- >=app-accessibility/at-spi2-core-2.40.0
- >=app-accessibility/orca-40.0
+ >=app-accessibility/at-spi2-core-2.50.0
+ >=app-accessibility/orca-45.1
>=gnome-extra/mousetweaks-3.32.0
)
- classic? ( >=gnome-extra/gnome-shell-extensions-40.0 )
+ classic? ( >=gnome-extra/gnome-shell-extensions-45.2 )
extras? ( >=gnome-base/gnome-extra-apps-${PV} )
"
-PDEPEND=">=gnome-base/gvfs-1.48.0[udisks]"
+PDEPEND=">=gnome-base/gvfs-1.52.1[udisks]"
DEPEND=""
BDEPEND=""
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 3e57fe8a1758..ca7d7178a1f7 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -1,2 +1 @@
-DIST gsettings-desktop-schemas-3.38.0.tar.xz 685868 BLAKE2B a5fe8baf6d7178cfba74c82974dfb854fbc2accfb9c98db2edbf46271b54626150a570fb3b578cdd86acfd1b21b432da0947e273c3ab94ec3f416c4a51b44e4a SHA512 5af7da90b8e7eec1c98e9e44653955f2882961dd9b5e2bf00e4eeb9f4f1149ae5171c600d457c6ab9c7482471c1a0e98f92f645a7ee7298e1b843c608f660756
-DIST gsettings-desktop-schemas-40.0.tar.xz 700672 BLAKE2B 5cc19d23e31a8ca7bd2344fa9392f11588b84c2641a6c0c2f184e733248d22c5603978408ccb13e58efac241beac8780c4a4f8c527b59fa3646cc18a18b09b90 SHA512 6b7f9b3095706b287254bd21d54311d6048e87340462e75848f05f7d7ded09da766cec7159fb6d889405ecfb4fdfe2243197989afeb21678fe4048783ae16424
+DIST gsettings-desktop-schemas-45.0.tar.xz 750056 BLAKE2B b65c846654fac5a104ad9a7d67546c6fb3d54aada178d58c575d22a8c2adc0057c1f1dc177562740f7ae94d0e17743789ca902db7c2fcc42c844bb66e401eaec SHA512 b3e00164aa47cf19b53bf8fd9cd9526c0a4f3d770e8c77953dba0bdf49b85d56f87f45254d18260e7a7b0ec7e24fc049fde503a1ea93e87946dbbd53b5dfc0f2
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild
deleted file mode 100644
index 052a81d34d50..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-40.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{6..9})
-inherit gnome.org gnome2-utils meson python-any-r1 xdg
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-BDEPEND="
- introspection? ( >=dev-libs/gobject-introspection-1.54:= )
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- ${PYTHON_DEPS}
-"
-
-PATCHES=(
- # Revert change to 'Source Code Pro 10' and 'Cantarell 11' fonts back to generic sans and monospace aliases
- "${FILESDIR}"/3.32.0-default-fonts.patch
-)
-
-src_prepare() {
- default
-
- python_fix_shebang build-aux/meson/post-install.py
-}
-
-src_configure() {
- meson_src_configure $(meson_use introspection)
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-45.0.ebuild
index a4ff85ce3d26..b546f73c86da 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.38.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-45.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
inherit gnome.org gnome2-utils meson xdg
DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
@@ -10,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="+introspection"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
BDEPEND="
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
@@ -25,7 +26,10 @@ PATCHES=(
)
src_configure() {
- meson_src_configure $(meson_use introspection)
+ local emesonargs=(
+ $(meson_use introspection)
+ )
+ meson_src_configure
}
pkg_postinst() {
diff --git a/gnome-base/gsettings-desktop-schemas/metadata.xml b/gnome-base/gsettings-desktop-schemas/metadata.xml
index 7b343b06be8a..cfe0d16763c4 100644
--- a/gnome-base/gsettings-desktop-schemas/metadata.xml
+++ b/gnome-base/gsettings-desktop-schemas/metadata.xml
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <stabilize-allarches/>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gsettings-desktop-schemas</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index daf8cfd86ae4..c59ecd9f9c94 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1 +1 @@
-DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c
+DIST gvfs-1.52.2.tar.xz 1232776 BLAKE2B 70d17e849f2741da299f363b6b4ec7607b3c30e92efbc05f68ad8445dc18615e4e6c584e3cc595a42d12cd899502fde62e1ebb7ba7fe0681b5d5c2e9d45b7314 SHA512 85684625822a1dcaa2258b7e8389ef53769850d05b7b2538a1335c9e16b882a08a5a33131779a132a2bf7ed23875f16791238fcdebc9cf3e543050d64aee8331
diff --git a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.52.2.ebuild
index f4b50cffc64b..6766ed301cc7 100644
--- a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.52.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
TMPFILES_OPTIONAL=1
inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
LICENSE="LGPL-2+"
SLOT="0"
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+IUSE="afp archive bluray cdda elogind fuse google keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
RESTRICT="!test? ( test )"
# elogind/systemd only relevant to udisks (in v1.38.1)
REQUIRED_USE="
@@ -23,21 +23,21 @@ REQUIRED_USE="
mtp? ( udev )
udisks? ( udev )
"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
- >=dev-libs/glib-2.65.1:2
+ >=dev-libs/glib-2.70.0:2
>=gnome-base/gsettings-desktop-schemas-3.33.0
afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
sys-apps/dbus
- app-crypt/gcr:=
+ app-crypt/gcr:0=
policykit? (
>=sys-auth/polkit-0.114
sys-libs/libcap
)
http? (
dev-libs/libxml2:2
- >=net-libs/libsoup-2.58.0:2.4
+ >=net-libs/libsoup-3.0.0:3.0
)
zeroconf? ( >=net-dns/avahi-0.6[dbus] )
udev? ( >=dev-libs/libgudev-147:= )
@@ -53,22 +53,22 @@ RDEPEND="
>=app-pda/libplist-1:=
)
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
- gnome-keyring? ( app-crypt/libsecret )
+ keyring? ( app-crypt/libsecret )
bluray? ( media-libs/libbluray:= )
mtp? (
virtual/libusb:1
- >=media-libs/libmtp-1.1.15
+ >=media-libs/libmtp-1.1.15:=
)
samba? ( >=net-fs/samba-4[client] )
archive? ( app-arch/libarchive:= )
cdda? (
dev-libs/libcdio:0=
- >=dev-libs/libcdio-paranoia-0.78.2
+ >=dev-libs/libcdio-paranoia-0.78.2:=
)
google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
- nfs? ( >=net-fs/libnfs-1.9.8 )
- net-misc/openssh
+ nfs? ( >=net-fs/libnfs-1.9.8:= )
+ virtual/openssh
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -88,13 +88,17 @@ src_configure() {
enable_logind="true"
fi
+ # currently HAVE_GCRYPT and linkage only used with afp; check it on big
+ # bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
local enable_gcrypt="false"
- if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
+ if use afp; then
enable_gcrypt="true"
fi
+ # currently HAVE_LIBUSB and linkage only used with mtp; check it on big
+ # bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
local enable_libusb="false"
- if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
+ if use mtp; then
enable_libusb="true"
fi
@@ -121,12 +125,15 @@ src_configure() {
-Dgcr=true
-Dgcrypt=${enable_gcrypt}
$(meson_use udev gudev)
- $(meson_use gnome-keyring keyring)
+ $(meson_use keyring keyring)
-Dlogind=${enable_logind}
-Dlibusb=${enable_libusb}
- -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
+ # wouldn't install any of it as of 1.38.1; some tests need it,
+ # but they aren't automated tests in 1.38.1
+ -Ddevel_utils=false
-Dinstalled_tests=false
-Dman=true
+ -Dprivileged_group=wheel
)
meson_src_configure
}
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index d8620ab596f3..0e61567481be 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -1,28 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">
-GVfs is a userspace virtual filesystem implementation for GIO (a library
-available in GLib). GVfs comes with a set of backends, including trash
-support, SFTP, SMB, HTTP, DAV, and many others. GVfs also contains modules
-for GIO that implement volume monitors and persistent metadata storage.
-There is also FUSE support that provides limited access to the GVfs
-filesystems for applications not using GIO.
-</longdescription>
-<use>
- <flag name="afp">Enables support for accessing AFP (Apple Filing Protocol) network shares</flag>
- <flag name="archive">Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag>
- <flag name="bluray">Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
- <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
- <flag name="fuse">Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
- <flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
- <flag name="google">Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag>
- <flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup</pkg></flag>
- <flag name="nfs">Enable NFS client support via <pkg>net-fs/libnfs</pkg>.</flag>
- <flag name="udev">Enable udev base replacement code for cdda feature</flag>
-</use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription lang="en">
+ GVfs is a userspace virtual filesystem implementation for GIO (a library
+ available in GLib). GVfs comes with a set of backends, including trash
+ support, SFTP, SMB, HTTP, DAV, and many others. GVfs also contains modules
+ for GIO that implement volume monitors and persistent metadata storage.
+ There is also FUSE support that provides limited access to the GVfs
+ filesystems for applications not using GIO.
+ </longdescription>
+ <use>
+ <flag name="afp">Enables support for accessing AFP (Apple Filing Protocol) network shares</flag>
+ <flag name="archive">Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag>
+ <flag name="bluray">Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
+ <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
+ <flag name="fuse">Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
+ <flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+ <flag name="google">Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag>
+ <flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup</pkg></flag>
+ <flag name="nfs">Enable NFS client support via <pkg>net-fs/libnfs</pkg>.</flag>
+ <flag name="udev">Enable udev base replacement code for cdda feature</flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/gvfs</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/libglade/libglade-2.6.4-r3.ebuild b/gnome-base/libglade/libglade-2.6.4-r4.ebuild
index a287de2c2511..3bedf59b4859 100644
--- a/gnome-base/libglade/libglade-2.6.4-r3.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
GNOME_TARBALL_SUFFIX="bz2"
GNOME2_LA_PUNT="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
LICENSE="LGPL-2"
SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="static-libs test"
RESTRICT="!test? ( test )"
@@ -23,29 +23,36 @@ RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
>=dev-libs/atk-2.10.0[${MULTILIB_USEDEP}]
>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-build/gtk-doc-am
+ virtual/pkgconfig
+"
-src_prepare() {
+PATCHES=(
# patch to stop make install installing the xml catalog
# because we do it ourselves in postinst()
- eapply "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch
+ "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch
# patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort
- eapply "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch"
+ "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch"
# Fails with gold due to recent changes in glib-2.32's pkg-config files
- eapply "${FILESDIR}/${P}-gold-glib-2.32.patch"
+ "${FILESDIR}/${P}-gold-glib-2.32.patch"
# Needed for solaris, else gcc finds a syntax error in /usr/include/signal.h
- eapply "${FILESDIR}/${P}-enable-extensions.patch"
+ "${FILESDIR}/${P}-enable-extensions.patch"
+)
+src_prepare() {
if ! use test; then
sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed"
fi
- mv configure.in configure.ac || die
+ # Deprecated macro that does nothing. Provided by gnome-base/gnome-common
+ # but adding an additional bdep for this is silly.
+ sed -i '/GNOME_COMMON_INIT/d' configure.in || die
+
gnome2_src_prepare
}
diff --git a/gnome-base/libglade/metadata.xml b/gnome-base/libglade/metadata.xml
index f453528b934f..cf009c08d381 100644
--- a/gnome-base/libglade/metadata.xml
+++ b/gnome-base/libglade/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">Archive/libglade</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
index 5a262441623f..7d922efb3cd6 100644
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://library.gnome.org/devel/libgnomecanvas/stable/"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE="glade"
RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/gnome-base/libgnomecanvas/metadata.xml b/gnome-base/libgnomecanvas/metadata.xml
index 90e203d040d1..aa4efd00e326 100644
--- a/gnome-base/libgnomecanvas/metadata.xml
+++ b/gnome-base/libgnomecanvas/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="glade">Enable glade support</flag>
-</use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="glade">Enable glade support</flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">Archive/libgnomecanvas</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
index 18bf1ff82664..e36771a8aea6 100644
--- a/gnome-base/libgnomekbd/Manifest
+++ b/gnome-base/libgnomekbd/Manifest
@@ -1 +1 @@
-DIST libgnomekbd-3.26.1.tar.xz 450636 BLAKE2B 241f2f9af95696600f82ab3a1f53f80c6e76f6e81636419407957f172a2758ee16f5c6d419ab1c1c37d2e054c42b65404062471eceabc0fba45099481eb7b214 SHA512 8e83522f4d96001f9635278a001e0208d6d37e74b19a8c1702ec6de651036ad37a03385e66adbd3bae01d845a9a6181bb76f45bffec31eac98d600b49ab4360c
+DIST libgnomekbd-3.28.1.tar.xz 154800 BLAKE2B 803ef97d5d9cd31d762be1f57cbe967a93097ee724bf8e6bcb11aea414947d27c78b06b02e7843f48c505e4eea7c88e79d1d3b6d0090641c7d8ebf363bc90845 SHA512 ffcabfe19289057dd3d7489170093ff1614c3344103ba8ebc6c69f5668d01fea652b7be6c7d5c66291df3a319f975df5cf5167168cd0f60cede022b76bb57cb5
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
deleted file mode 100644
index 2915ac7e9125..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="https://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+introspection test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/glib-2.18:2
- >=x11-libs/gtk+-2.91.7:3[X,introspection?]
- >=x11-libs/libxklavier-5.2[introspection?]
-
- introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.4
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable test tests)
-}
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.28.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.28.1.ebuild
new file mode 100644
index 000000000000..2c7feaee3521
--- /dev/null
+++ b/gnome-base/libgnomekbd/libgnomekbd-3.28.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson
+
+DESCRIPTION="Gnome keyboard configuration library"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnomekbd"
+
+LICENSE="LGPL-2+"
+SLOT="0/8"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="+introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.44.0:2
+ >=x11-libs/gtk+-2.91.7:3[X,introspection?]
+ x11-libs/libX11
+ >=x11-libs/libxklavier-5.2:=[introspection?]
+
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.6
+ virtual/pkgconfig
+"
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use introspection)
+ -Dvapi=false # will add USE=vala if there's a reverse dependency
+ -Dtests=false # Controls building test programs that are not installed
+ )
+ meson_src_configure
+}
diff --git a/gnome-base/libgnomekbd/metadata.xml b/gnome-base/libgnomekbd/metadata.xml
index 7b343b06be8a..78278d04c2ad 100644
--- a/gnome-base/libgnomekbd/metadata.xml
+++ b/gnome-base/libgnomekbd/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/libgnomekbd</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/libgtop/files/2.40.0-clang.patch b/gnome-base/libgtop/files/2.40.0-clang.patch
new file mode 100644
index 000000000000..f36783e98d65
--- /dev/null
+++ b/gnome-base/libgtop/files/2.40.0-clang.patch
@@ -0,0 +1,135 @@
+https://bugs.gentoo.org/871051
+https://gitlab.gnome.org/GNOME/libgtop/-/commit/7e9fed1513a7937b62bae641b76cee405c6add5a
+https://gitlab.gnome.org/GNOME/libgtop/-/commit/df6393ac0cd785727329a97f731a4067334c0ace
+
+From 7e9fed1513a7937b62bae641b76cee405c6add5a Mon Sep 17 00:00:00 2001
+From: Avinash Sonawane <rootkea@gmail.com>
+Date: Mon, 20 Dec 2021 13:16:44 +0530
+Subject: [PATCH] Use correct format specifiers
+
+--- a/src/daemon/io.c
++++ b/src/daemon/io.c
+@@ -27,7 +27,7 @@ void
+ do_output (int s, glibtop_response *resp, off_t offset,
+ size_t data_size, const void *data)
+ {
+- glibtop_debug ("Really writing %d bytes at offset %lu.",
++ glibtop_debug ("Really writing %zu bytes at offset %lu.",
+ sizeof (glibtop_response), offset);
+
+ resp->offset = offset;
+@@ -42,7 +42,7 @@ do_output (int s, glibtop_response *resp, off_t offset,
+ }
+
+ if (resp->data_size) {
+- glibtop_debug ("Writing %d bytes of data.", resp->data_size);
++ glibtop_debug ("Writing %lu bytes of data.", resp->data_size);
+
+ if (s == 0) {
+ if (write (1, data, resp->data_size) < 0)
+@@ -84,7 +84,7 @@ do_read (int s, void *ptr, size_t total_size)
+ tmp_ptr += nread;
+ ptr = tmp_ptr;
+
+- glibtop_debug ("READ (%d): %d - %d - %d",
++ glibtop_debug ("READ (%d): %zu - %zu - %zu",
+ nread, already_read, remaining, total_size);
+ }
+
+--- a/src/daemon/main.c
++++ b/src/daemon/main.c
+@@ -49,7 +49,7 @@ handle_parent_connection (int s)
+ glibtop_server_features);
+
+ if (enable_debug)
+- syslog_message (LOG_DEBUG, "SIZEOF: %u - %u - %u - %u - %u - %u",
++ syslog_message (LOG_DEBUG, "SIZEOF: %zu - %zu - %zu - %zu - %zu - %zu",
+ sizeof (glibtop_command), sizeof (glibtop_response),
+ sizeof (glibtop_mountentry), sizeof (glibtop_union),
+ sizeof (glibtop_sysdeps),
+@@ -58,12 +58,12 @@ handle_parent_connection (int s)
+ while (do_read (s, cmnd, sizeof (glibtop_command))) {
+ if (enable_debug)
+ syslog_message (LOG_DEBUG,
+- "Parent (%d) received command %llu from client.",
++ "Parent (%d) received command %lu from client.",
+ getpid (), cmnd->command);
+
+ if (cmnd->data_size >= BUFSIZ) {
+ syslog_message (LOG_WARNING,
+- "Client sent %llu bytes, but buffer is %lu",
++ "Client sent %lu bytes, but buffer is %lu",
+ cmnd->data_size, (unsigned long)BUFSIZ);
+ return;
+ }
+@@ -74,7 +74,7 @@ handle_parent_connection (int s)
+
+ if (cmnd->data_size) {
+ if (enable_debug)
+- syslog_message (LOG_DEBUG, "Client has %llu bytes of data.",
++ syslog_message (LOG_DEBUG, "Client has %lu bytes of data.",
+ cmnd->data_size);
+
+ do_read (s, parameter, cmnd->data_size);
+@@ -244,7 +244,7 @@ handle_parent_connection (int s)
+ 0, NULL);
+ break;
+ default:
+- syslog_message (LOG_ERR, "Parent received unknown command %llu.",
++ syslog_message (LOG_ERR, "Parent received unknown command %lu.",
+ cmnd->command);
+ break;
+ }
+--- a/src/daemon/slave.c
++++ b/src/daemon/slave.c
+@@ -42,10 +42,10 @@ handle_slave_connection (int input, int output)
+
+ while (do_read (input, cmnd, sizeof (glibtop_command))) {
+ glibtop_debug ("Slave %d received command "
+- "%llu from client.", getpid (), cmnd->command);
++ "%lu from client.", getpid (), cmnd->command);
+
+ if (cmnd->data_size >= BUFSIZ)
+- glibtop_error ("Client sent %llu bytes, "
++ glibtop_error ("Client sent %lu bytes, "
+ "but buffer is %lu",
+ cmnd->size, (unsigned long)BUFSIZ);
+
+@@ -54,7 +54,7 @@ handle_slave_connection (int input, int output)
+ memset (parameter, 0, sizeof (parameter));
+
+ if (cmnd->data_size) {
+- glibtop_debug ("Client has %llu bytes of data.",
++ glibtop_debug ("Client has %lu bytes of data.",
+ cmnd->data_size);
+
+ do_read (input, parameter, cmnd->data_size);
+@@ -261,7 +261,7 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
+ break;
+ #endif
+ default:
+- glibtop_error ("Child received unknown command %llu",
++ glibtop_error ("Child received unknown command %lu",
+ cmnd->command);
+ break;
+ }
+GitLab
+From df6393ac0cd785727329a97f731a4067334c0ace Mon Sep 17 00:00:00 2001
+From: Avinash Sonawane <rootkea@gmail.com>
+Date: Mon, 20 Dec 2021 13:33:42 +0530
+Subject: [PATCH] Pass correct parameter
+
+--- a/src/daemon/main.c
++++ b/src/daemon/main.c
+@@ -226,8 +226,9 @@ handle_parent_connection (int s)
+ 0, NULL);
+ break;
+ case GLIBTOP_CMND_PROC_IO:
++ memcpy (&pid, parameter, sizeof (pid_t));
+ glibtop_get_proc_io_l
+- (server, &resp->u.data.proc_io, parameter);
++ (server, &resp->u.data.proc_io, pid);
+ do_output (s, resp, _offset_data (proc_io),
+ 0, NULL);
+ break;
+GitLab
diff --git a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild b/gnome-base/libgtop/libgtop-2.40.0-r2.ebuild
index dc57dc6714f5..55c80bb69cc4 100644
--- a/gnome-base/libgtop/libgtop-2.40.0-r1.ebuild
+++ b/gnome-base/libgtop/libgtop-2.40.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
LICENSE="GPL-2+"
SLOT="2/11" # libgtop soname version
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
IUSE="+introspection"
RDEPEND="
@@ -20,7 +20,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
- >=dev-util/gtk-doc-am-1.4
+ >=dev-build/gtk-doc-am-1.4
>=sys-devel/gettext-0.19.6
virtual/pkgconfig
"
@@ -28,6 +28,7 @@ BDEPEND="
PATCHES=(
"${WORKDIR}"/patches # patches from master (not stable branch) that seem safe and fix potential eautoreconf problems
"${FILESDIR}"/${PV}-sandbox-workaround.patch # requires suid handling in ebuild - https://gitlab.gnome.org/GNOME/libgtop/issues/48
+ "${FILESDIR}"/${PV}-clang.patch
)
src_configure() {
diff --git a/gnome-base/libgtop/metadata.xml b/gnome-base/libgtop/metadata.xml
index 7b343b06be8a..6363c3b98f09 100644
--- a/gnome-base/libgtop/metadata.xml
+++ b/gnome-base/libgtop/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/libgtop</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index ca774f6fc5d5..6d790a23cd75 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,2 +1,381 @@
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
+DIST aho-corasick-1.0.5.crate 172064 BLAKE2B bab7767070b959e8e4c054bf505b9423d7fc8b02dc682b559f54db986abe72ddf83a069b4bb585d71b47de92d2fce66a1c151a0d29c4aae99378ca05c3d5eb50 SHA512 6b0a64dbfe0c166341a34cd169bc46d28e40f72db4d599a1aff5327a6e891408f39e8e92e983cf9396a8e8135f93e41550237ff3e5c8c05a5325688746fd814b
+DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
+DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077
+DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191
+DIST anes-0.1.6.crate 23857 BLAKE2B 9ef464a964709b408c7d7846b9b1e54e52d6ae8f21f22ccfe509ef7197d4694f439084dbdb01fdf88829d181965ea9d1452253789a46fdf6d0520e3413c50d61 SHA512 f9dfaaca9ca327881ec30efaf24e208daae668b1e9d6963c8b0ca9f9fd13be777c793076a87980429f0dfa4db28ef5331ce6652a76da4d5a87485b23fc2fde29
+DIST anstream-0.5.0.crate 19646 BLAKE2B 770dc99092e1c48ad5c1658e83abff3b8c9e0915e360048bfe0fe04faf61991e01e88ca4adca23533bf11fe078066e351778661128d69381756688341022f29d SHA512 8e285cc8f92708cf9482e7b4dc84dd891e5ec0bd8c57894c6bb368eede1127b7b903adb4c40b37287e3644535cc60c92662951c2c8fb5b92e10f49ff5374d359
+DIST anstream-0.6.5.crate 30004 BLAKE2B 5ad0b0096a4cf199cc1b958657a69a81d8e12f3d9590049123043d005389f0eabcf69da7fe1e01b1b36eb04e66076699d2020a5d6e9d441ade2062b830e6df09 SHA512 98206c568d8f2204bddcbbd915ed22d214410aa26dc74ef56799c9237681877a7447effdb9ef97cfabef0afd7a1b73e27d82c7e976f1216ac502d625089c6fdc
+DIST anstyle-1.0.3.crate 13986 BLAKE2B 9e9fa894da78a6c0933c423524827ead33aa4e384e04771ccccaa179f1e8a6459a5094db7f61714457b919d2e713d09df4429b83793d807821bfdb226ff115a5 SHA512 f1ac506814e1ce1df537ea8a88ed75f3f897aa9e559ba7eb5a8acfd043641dada12953669153d1f719da28f935a9651a07b5ae1e351139f0f03b58a67bc28477
+DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3
+DIST anstyle-parse-0.2.1.crate 24802 BLAKE2B 6304a56c6a9fbaf1bb4d1d177b2315684345dc9d71c35836f9544145364f8d6eb56e25c03076690c594ab7db5914501acb569f6c136952e59c93179ced527fb2 SHA512 5c8fc7d88ffc3a6e78340ffe0f3c2d72e865512030ade4509de9c673eba955c536bb1873dac11f6ba11cc8367fb30c67451ed65d19f81507c9e917c702bfd176
+DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399
+DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a
+DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc
+DIST anstyle-wincon-2.1.0.crate 11757 BLAKE2B b7c1071da1ab24accc33d7af70f09ace8edb2dcbb53936ed5ac13552c6082c0f16ce501f041d2c1792cee7dd9cc3877d29505e12a65022bec44285f13e1f422f SHA512 6c379c46f791b6b1367f3d6f3531dcd16589cc2e12f6f5ce52a3fa32d42e62b719d2277699d1bc8526099a6f791f2e7d5b1068e1295cbcd2997841f0eafc4eeb
+DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931
+DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40
+DIST approx-0.5.1.crate 15100 BLAKE2B 8fe84d52263521c0b72a1d1e82ed283828f680b8b56f532df2c14ea86ca09e793686d823c5d58ecfd7a829948543bb375e85223c866cf036e9432be5d6aa7399 SHA512 c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407
+DIST assert_cmd-2.0.12.crate 25347 BLAKE2B 7ff952782a86203c1dd06611f1c644d8eaa6d85c8aa635bb2cac0423050f0af3c3687dcc82235041fb44e748ed06db16ed7c413d0f31305b6e3d208880494fac SHA512 d14783933521ffbcc0bcad8e52e7e0e4fb58cb609123b2a50e20dbee10d7f2df4eb020cdfde386c8cde6b7e0696a3f98e0dbd698c82c99a2c6903c437ec907e4
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bit-set-0.5.3.crate 14470 BLAKE2B f6525500a494236103df2b27e964bae0b2caf718156879f972b9972fa509794bcc663c2130e3d872ecadb7ead0982b415dfa4468ef12523ee248fb1bbec2559e SHA512 c5ce7ef71559706d996505e138ce95d9f008ac3375928012a36339bfec48986ad935b384e2d21fa0d505d4cf98bd3e93be15955ecd9607d253b8a276351334c6
+DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c
+DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b
+DIST block-0.1.6.crate 4077 BLAKE2B a2c11873b8cb1a1ea399ecc99ed45e5d0b9399bd88435cdea346910b8707b7da94eeef522dafa5cdb09929534472b2a096c03c373744a789962d4175fd1b110e SHA512 c278e3c0346cae423b533a8f5d6b822e788ec450c92ef0f5f559d5705764a0a11df49f0f66bb1c8af7e89bec8ec802934676b969e43f92255a38b210d0fbd710
+DIST bstr-1.6.2.crate 380096 BLAKE2B b061853059d26e076e2ca8f76d39fb0a5e401c5e191b75f44936a0e708877176e5357bd1f8febf2b295b72b1a93db91c1f17b9a4840a05ffb3a55ec7a47fa5e1 SHA512 2661f453d3b529fa90a52da26b0c373df7e077b5503ff9e8dc4ac17ae546817a41b7353d3517a94d89b3b0bc4409740c6fe14b7dc78fd1aaa2a3f5888ce10057
+DIST bstr-1.8.0.crate 380176 BLAKE2B 017ba2818bd636297cfb16fa975b34aa83367aef6df2cc321443754e5fbf4a9afa8ec9e99328e0cb0e5929268d6a4c2301e55aa2a6516e43e87280789c8d159f SHA512 9b8828790f3e342e69bb92cb9231c7134188c168a9b67a8705dc2e3370b86885f99e4d47f21ff68afc9147968b0fbf5a293307b09f132dddc550d8cd576f1048
+DIST bumpalo-3.13.0.crate 82114 BLAKE2B 62a930b165e853aeeb40558079f570c75ed13ff5e8436d99309dc6252aa28ae69d327c4b438913d6c7543bc156f2714f0c1e80d759ea0d44babe24ef0f268ac0 SHA512 419368d6ca37474c2867751fe5706d0c747326bebce323d571cfc07ee0f022d8e8a7ef5692091b0fa804995b081998dafc55da19a53e51135a767bc0afdb9605
+DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b
+DIST bytemuck-1.14.0.crate 44933 BLAKE2B afd34f2becc41484e7bf71fb4a9f0925870a4f2d9d59daff9e91bada000462baeced4314e469a508d4413a8f2442d83a5f3082193653403fbee1340ab5c3f6c5 SHA512 f072a97e5de93228435bb362363ac1af0738b7927832b02a837f44eb21b0b089589b61e73004a06c5e4d4601e66bb42e67b9f707bbf13429a40b6250a0f05ae5
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
+DIST byteorder-1.5.0.crate 23288 BLAKE2B 7f85a7948406844070a2c8202e0bd52f73b3dfc7c666a97046128044eb9352195afb80e2bf894c0742ad109e4473339de1365d09591de70dfec6c8c02a8e1453 SHA512 96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f
+DIST cairo-rs-0.18.0.crate 54153 BLAKE2B 37452643d0466d8f9b8c236158c0408d0d9ea6b34b151263211834439a716a051e98349cd437a5f4ff22ad232f63362cc5db623325a588d453f42edcfaef121a SHA512 b3e778aa275c510989dad43684293f60758e0770c7eaf0c12c1c641bbca1e410b011cd90e6b5f76ac1f8c3f1f18dae7643336b3ca316a191d1a3601163ceb9e6
+DIST cairo-rs-0.18.3.crate 54190 BLAKE2B cdd1136972174462334142c0ecada99fab75a20883fd8ed99295d6f2196b35e75f7c44463a587beb1310e4aaaec64f23ccf82125617bcec5a71fdabb5bf547bd SHA512 14164ac540f69fb685004be09e30a68e7d5af6ad4e553e720cb975cfc2a8e7c86df9446dd811f8ce0993be1dab838e14a60f2737457939a93f81ab58e1ec6b63
+DIST cairo-sys-rs-0.18.0.crate 11803 BLAKE2B b7358bfb19b846e619dc57544f342e5f8a5a5a5d2d0b19368e6d03375141176961c6a8780906c2a218970513525a7f7eab71348b5f09578d3c509f5f5f1038fc SHA512 e5d86d1c2d9825f3c69b194bd8068b8db61a125a9c8646d7b56859417176692188a1f9f40228ff7ac2836b16e49bac5ce5ea762928c872cd4c3aa14ec8029568
+DIST cairo-sys-rs-0.18.2.crate 11855 BLAKE2B da237a944a6eed675b6812bf8a71f99354c0c41302d222cc0ddf38e47d612d6c49754cb8854c92dbc62d32de5f716bc869cc874949b62c2ac4736104c5996144 SHA512 b101f7a2543793fbc1a1cf86c62a8fa404ce171160603e72f9aae3592736e4d68ae53b8ad91aa8d70e21965d263dc740f96fe001bb049674b4efee1039d3d68a
+DIST cast-0.3.0.crate 11452 BLAKE2B fe6edddd0589fa436cda32342d7beaabe4003afdbdf1d7c5db7e8748adf23b1b2cdcdd286235837c735d2143f29e692c152a5d56fb0458a54961e4dea303b2cb SHA512 4a3e19bc1e9e5ecc03aaef9bcdce01624ac0e6858c065fa1c41693db0ac172b9735ce872064561347cd9e79f00a274129011f6e4ccf9e61d960c8bb684b6d396
+DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7
+DIST cfg-expr-0.15.5.crate 41639 BLAKE2B 8dce19ca74027fd284086797829caad8202ccd4c774f918f47384988a4b5ac20053054d5b656e8ab67575b7075a819fedd2f09f0b2d46198581883bc61bfd620 SHA512 13e9c47e66d74da94a742af01716655dde119d7928fcc519a52720f3d9c27ccdee9b3de231617c3f5739775c251e695e892bd1b7511d4bfca65e93447d86dd76
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
+DIST chrono-0.4.30.crate 212084 BLAKE2B 27d9ce4aae3ce0278f2c9f4883b6d3a123ae428a14c03f4fa0d90c077e827387df9b2221712e44bb47478de9207d908115d115df967585544dc0cd3aa239e225 SHA512 886f064e935220848f966ec2e1e3271849ed20235137836f31ae2aaa8408eaeb657b54b074bdf316914c95ffab9a8c7f53330046e761ef4bfe6ee958d1c7a598
+DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089
+DIST ciborium-0.2.1.crate 34974 BLAKE2B 370f4228aa63075cd7a0d41dd83f15211fc69267235905e7f5607f6e6c0baf64db0f6203c97990604de2ae683ca1937acf284c6444702414fe1a685ccfdc12a4 SHA512 4403239badcdb5ea6e754e706472e25c4593a1fbdfc5a07e46409ea3dac41151020204167102dbf401a2e5f31b3731267bc3759be59a73880a022e5f4a3064fc
+DIST ciborium-io-0.2.1.crate 6679 BLAKE2B 1835b1002c2e5f6fb1cc36a6a1f1e3ee10423760646b00a75e5ee5e66dfd2892914705e4456ec440cde27dda04e28329febfbd5c640ec7f86e7c013a9a9d748d SHA512 8860de0a72f07d0d0bb84af3c24635193540c574cc87367c7379222bf97ed68648330511866810265b68076bd1146e0ddb41c269e62db669b1c3390aca679c50
+DIST ciborium-ll-0.2.1.crate 14649 BLAKE2B 02f5ddca41141e426492afe237ef439acca518c448a6f8daea650ceb925f6a13517819df88c93c979ed1ad9e8411cde400ff39ca288d2de8577ec870531453f3 SHA512 214550780734dcb0bb5dc999ecf22283850bf52ee4a9cfb58d86bdac9d4b80db32f0664eef71e8197e7e56a6643ff45d2974b9a36945db2c754a98df42adf9f8
+DIST clap-4.4.11.crate 54782 BLAKE2B 293721f850d5a5ddce6b26610ef47316d5914e9281312068c26e45d23cb568c1ce2da7e0546accdd0cd4cc703ddb9fad98b0c772907f52dcdc31e6ec463d2b27 SHA512 9da3f445523183e16f4c104a2f4029ee9f3fa70e6c8e579aadad0607293ff5963417d8534aa1f3cef6ef8f8a7529a898c01630d3eff42330ec369cf0f760929b
+DIST clap-4.4.2.crate 54441 BLAKE2B 878b7808985e0cec0de249fb35c3a81b3a583b08e56c159395b0a915ef0d4a555531cd5e280f8c78b11a5f4883a02df65770733bc610ae61dfe820a2b0361bc0 SHA512 7ab5d9f320779e7f249d1f6c5b4fa351e6476fe114ce5975a70f21a19e2ba5ffd3867d383242506c0f86917ba7f271b7e31afdbb087cb590fb6ef9b1466f62dd
+DIST clap_builder-4.4.11.crate 163317 BLAKE2B d2d998c4eff422436f36f71d681132b2545b561433ee733a8a64a640b97ebe8e35e97abc91d820189918d5fe9fa9496c89b02959aada1d55692957a86c8e14a0 SHA512 b601fd313e65dbf2b723f3ae5d2d3bfdfa1ec184962883503df9b31a7d43f4967ad5f81b0bc2fc8614e06d67ce52d399221df6f4fc9da311cca1c9134784d7c4
+DIST clap_builder-4.4.2.crate 162358 BLAKE2B afe7a9e1f62553a4c25617305b4060152e8a74b8ea8ba37fdb399ee1e4c4c8ae8d387fa81ffd6e9faa1f903da6add42b4711919c9b398770a41ddd9c60a4f4fa SHA512 58f211803ffcc9007aee856f2491b9ab823bea281d35a1f2f177beb8efb5419ea7fa6fe4bb6790f134c288194837bac13b695311b2521fba9f1d0f90608a8336
+DIST clap_complete-4.4.1.crate 37345 BLAKE2B ad9012990b1f83ac91eb6c56417cb7da6c3105c03a65cad80931efb0bd9f6c6a329ec34562f5c13c901e848bb62770f7fa3178b96fc16464d6ef5e5023661be9 SHA512 87651f68ca4887bc739025eb9cf82bc2dcd02242376f2d1cd83540931a29c7306613a32e7dc84bcc99a01e2985fad794dfb1bd36cc80ff330db7d927cf0b77b3
+DIST clap_complete-4.4.4.crate 37405 BLAKE2B fd43c668a29b8e8329f94153a5e5ce19e27437f60d88ea0a59573456c50a475e6dca659588d137909659a05b04ba5b4b412fd33d3daca20ee317a9890eadc8e8 SHA512 880b3022105d4ca68846e35e359a1613e177ce0be2b5f75b15bb3c4630bba93f8ebb4c7832205783f8bbe84dcd49d756468ac10c48d0e803d644a158f1163991
+DIST clap_derive-4.4.2.crate 29019 BLAKE2B 9f3dc6f3249566c49b7a169b7b5735493cd3eb1d8211b0e7d35db656716866ed9a82911bbc0e6699eabad6cbd8e28b5e833541444a40f55a87387dc49447f62f SHA512 a111ee62021b3b5176ea4db5d3a30b7b0ce00f074b6a9bcefd1d70bbd147a779c9adb491424013ab021792a5253c33d9e38c0fe9deeb414def7ebeb9e40c2ce7
+DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167
+DIST clap_lex-0.5.1.crate 11793 BLAKE2B 8e3d2dc120401fdd0cf0bf069119c8b7eafa13e5f682c56499062fc09acc05f443caafa6fca791ea53e693a83de69e98fd0488726a4170db037c37118ce0edf1 SHA512 ea5e49e9a8536093f7de89be30add7c3d880b232b0ce393b0429fd4402db2518036998689817bdfd472b6400224fd3c42fec1b5f8538dc433c31dadeb6281e80
+DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e
+DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551
+DIST const-cstr-0.3.0.crate 7497 BLAKE2B 75abc2f328fbbc2337e75a877f78d6c42fa58afadc14552f44e46d3c4a64586c7ccc8a6b70fc975f3b98dce32fffec6ccb9c385a9a79928d18a66d19f9b8013c SHA512 5d142210a95bf0271a4fa59686b31d8281f9cae16231223397f31cf16228d0b376e54bc13ea4b1c05ddeba0d14bda91d83140738f4f3950b41448ea3f8aec142
+DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6
+DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100
+DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST criterion-0.5.1.crate 110088 BLAKE2B b99018b6a6f97fe47d90a2135e3d483ee624d43088d7881bafb2c35ba385629f1a4353110bf190c04903abc4ee99ad1735bc9c5afc6c2854a1aa9221fd714617 SHA512 6a1a32437bdb95f8472bafb5b04bb5999a6ff6fee4ca5965028ec53b4867d01b529241d01809a003722ec7d5710c323274b6f3b50ca0935919a9dee693f4d3b0
+DIST criterion-plot-0.5.0.crate 22706 BLAKE2B 28a50375f2871ce6f168aafabff46f4368bf55cac379c67a2b4396403259372759dba3355786e695b566b1cddee9091a469755a04c06ee949f00aee8e9a28699 SHA512 971e96dcc64a5afa7488f1a99475f0f5639c0ef63f9eeebcada351868697cbff397e99827cc07c0a52e7d7d1a87856fe1fc48c22075776b3bc9c94af62d79f14
+DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4
+DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672
+DIST crossbeam-deque-0.8.4.crate 21752 BLAKE2B 1813e2c0916ac990c5ce54aadd13f309dc4d2cb651995261cf591900a5c820712de7dd730116e8b4cf78bcef19626889fc0658d7f1020cb2c1d7fab41718a31a SHA512 cc036613727a3aa8933bec419ba8a5fd2f506770ad2cf874ff757b048e0d29ea3f1b0e2b72d2d5352ed4b62c6764c7bbb10d0d4e217176da26bf5ae4bca0b68b
+DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde
+DIST crossbeam-epoch-0.9.16.crate 47037 BLAKE2B ca8d326fad43bfb172158686e394ac986388cf1cfac6a80bb062e350f30e3733760d6de5ec6e1a73886c35881402be61e2e7724f25aaaacc64d1fe2d78e0921c SHA512 716276d9ecb4d8f630eb28cd5fd299a25ccec80e1f84255fe548935b48b5bd7e003c8e160edc0e6c5ef0b1e508f09ba6021b122b54973cc417146305dbc59524
+DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831
+DIST crossbeam-utils-0.8.17.crate 42324 BLAKE2B 971cdfc2a0e259e40c1e990d33688801ffa67e12392a56507f7e76f10b1b200dcca514fcdd4199910074615cbeb8c0cc0a250dffc1126a25ae8b8df8c818c079 SHA512 d3f9cbee56991c9435de1947743dd7f0c5456e4c56991b73fc9fa984f03416abb42da78c3cd907bcb3af0fa2122612e0fcf76bb2dc8f2b56c2745ab9842c648b
+DIST cssparser-0.31.2.crate 60602 BLAKE2B fd919c3691b47bc05e19f83ffa5fd195c68ee0c374522744fad0500b3d17b0dc04a6ff16a5dee8e5afd3316e19d73886ba7c2fd1a0042bad8f25352ba4b27752 SHA512 e1547bd14aa1febb23f03fa6c1ab711bb8483c6a212952d5a129a85aadbcce8c0069b7025fb294c889cc42b3e5e7c6882ab918b6d55fef9b788b63663f5b086c
+DIST cssparser-macros-0.6.1.crate 7914 BLAKE2B e754cdabbf678d3f9efab469e72cacd05e2635352c4a3f4c40971772550c3bd48315a65cd121a79542ffcea642cc0868c41cef1c7ad5a31da92ba21a02c41530 SHA512 21d2f8bcaad0a8fff865b23bb2b59dcc5165f8861c4b9d7d70e9f302b58e2cc5ef8555bcab97889bfe81889a2b27863c755494baa64a52c65cd74687fe58b124
+DIST cstr-0.2.11.crate 5867 BLAKE2B 54821b9a54b46670f4cf5c95ac3b8abe45e4219d5762e98292c968cc79f563fcedd367a6f6c302e4cc1636c5fc911476541b82cc9b94290c67db3112c198984d SHA512 ac6fff31c02a4649be0a273f36172427695c7421cc5482edbfe7c6e7912e895c1901fa9ad3bfe767da1cc1e34275592dc1815516f68d46c2436fc485dea5c314
+DIST data-url-0.3.0.crate 20750 BLAKE2B 3abdea4bcc43634ae8c16ed9a889205552235e815d90a3b5b51f201301891af030c63e9f7de0a780790029d1026129b62fbe9480f4336df0938afb84ab63b5ae SHA512 841b2e12219d9fdb0a576af456112d5c7486b9ff35cc3ed7aafc21526fe4f7f901602971627101fe1304da06ee315b0d543c2969ebc81f3e7666ae9c4f7e7301
+DIST data-url-0.3.1.crate 21109 BLAKE2B 70c8616c6b3cf16da70a8fe3e8c6752bff3dc7d9e1aaf593617ddf191f31b1187b41ba6491581488b4dc9db1e2fc944035af9fb1acb6320de0ccb2ae7f13373f SHA512 cd13b3da27b20d5b16dff797b67323bb09f12f8582724ce9dbe18dc668a5c77b429ac9d9563be2112368f7067e7694653cbb2aae1c3aa897892c404822a079bb
+DIST deranged-0.3.10.crate 17803 BLAKE2B 58ba49e09051bf6c5e13b66724bbb3577df766a0dcd4a6754c3771f70e0cb7173174ad3fd44861e58b0e186e387c52983262dbb0e70a89b4b406d948e522e355 SHA512 35082ee648132f586594715e04492cc56b9894c95506efb0247c9be2c5d03ec92cfaf0d815297adf3423172b90a0e327aa6edc894a8386730a2eaedc29d9ef82
+DIST deranged-0.3.8.crate 15314 BLAKE2B 5452dd7309e64f52f06f0b4159a87678c95f5453516d9e29956806a8bce3e8aac717a094ba3f2b418336b6bcc611901d2b4c08abd7d838915e88c37d75896f9b SHA512 81577e7371b6850da0abec985f1268735169a4e9272a6bef2e1e46753457260b54ad76fedaa36280102daa0030f70dabd16d2b99fe9c67b2690e469df3c3154e
+DIST derive_more-0.99.17.crate 55771 BLAKE2B b290bfbf06119018206be0f8ad4c92508be4cbc443f1a937c38961e207fc3f433d8a87b2b5a17e72aa1735520799540557d9dd9e49e26b8eb7cc80289afd44bd SHA512 0bb5a94e56d35a17ff4deed61c437ba75c9063694032ba98b58be1b072d33f2fb170d51bd262a17ff1beed2110b334528de75d5315ac627202ccb13d8c490baf
+DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
+DIST dlib-0.5.2.crate 5806 BLAKE2B 2a8be2d76c44c95d5b1b9a5439a99a75daa703a341980d8af1c050d6096d45fb748f0acee7f7de2f9433f97ec19faec9e028f57c8149229eecb1827a1ef8eb60 SHA512 4a8f1c09007ecce1d7c829899aafb90081fe4fd89cfac3550638018760e24f63985e3060c4056b55bf58cf4622b1b31595e1c524a75b1b4354b8f3c35fc267ae
+DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
+DIST dtoa-1.0.9.crate 17002 BLAKE2B 0b658c6af9a82f7b6ddfeec4f7c2fe21b8ae65e25674c4bb15d5c39c62a0afd9461e37d01074a0e3cef9085732c95cc1c12a09e2f91e508be80f2b22743413a2 SHA512 996814e68f67c77d68a0e3195241f7034575453401370a1842c94232a35aa41c832f788720ee68947662ae0e8c7595df736810a2b392871f57e6ccb47f55a4b9
+DIST dtoa-short-0.3.4.crate 8276 BLAKE2B a0642c3016a22d7737fd664480b13015549cfbea01e0dd3b58883e02cf4da68b6ba271062fab2d890ce82c69392905e1fcb39a32cad67f3d1f6c4f4f0a223ab0 SHA512 1df9db497daf36af46444d55b3d9b1d9607afba56fdf7e959fdd3b41be7c3c190522ff1cabbba20a896eee4cbd54c84be22a0fe4a7ebcd5ac7141fff1ad86035
+DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177
+DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc
+DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140
+DIST errno-0.3.3.crate 10543 BLAKE2B 958e9d12766533ae9e84a60b121794929b9b3b1a8111aca9a2e914beee5784b64c946e143cd8031335ac9cb51069e51dbc9a6b61073a2ccfd3ff60612a20b619 SHA512 9524db39d0c9be287e0d2aed3358a86e961b2868717037212a2e9dc408bc73198ab23196d7923a9ba7e0e9357276075148f582e0325ad36ae1b212a8c674173e
+DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d
+DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916
+DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc
+DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9
+DIST fdeflate-0.3.0.crate 21790 BLAKE2B 3c96f6395fc42f66e436fbf6b747c2f3c2dfd8c38729bd0eb88be872ad55e5d964ba322b703fae122907d51892619687ac9b7a5e7546f8fe6eb7d80a91c1f398 SHA512 1a1862460745780407892c835b4e3431267044285fdd718dc6b316dbce9520d2955bf36e5e28257f2f758ba7bc3051b446e786d11ace83deec492e4c161664bc
+DIST fdeflate-0.3.1.crate 26143 BLAKE2B 9decfc50a0d2961960f80e3c7e640c2f4a9c916fed3810031906548d60dc6edae4d32419b5fc7cb5ec9b6e9cadcb71cc723c6fdc6f94ac81e0272739b79277da SHA512 16aae554c5c629266c6b1d628076a7d67d9214988355a76c669152f1981ed12c35959cb1a81cc46a9fd000fe4c25266bcd0486931e8e4d91c47ff7001211fb39
+DIST flate2-1.0.27.crate 73460 BLAKE2B 5603848098ac02c9c83893df79ea9d9ad3df5b7e02ffa155ac74602bda7e28e14e6b7de2ff321b38d24fa3741ccea8a4c811abb47690cc295f90d4cf2bdd0bbf SHA512 e76e76444686433acabd16513e6e5860d4d6fa53a810f37266f36900f154acacac6dcd77b0373599a6d33a09175f5f02146d84726b982c59a78926950e19ff09
+DIST flate2-1.0.28.crate 73690 BLAKE2B c9f141bde0eda6b9c42da0a3ed69322c12c6c29bc522131f51ad56f6e2758646aa5585382407409257a8301f5f07a1825d150838bbb55822f2d49037f6279aa8 SHA512 9db6f3ddc4e1e91960b07c08712beabd911b297d93db8be3ecb97a392a4262e608c75ed8e9e34d87d58c3e67d1b7987734e14ab3d45fd837a2767e8016380284
+DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
+DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104
+DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1
+DIST futf-0.1.5.crate 11344 BLAKE2B 2cc5e5f5d4ace47e9273546e46c500432da47f246cee18f24607432305dec9481ec3d02b8a9bff4724efe05ea1d235294c52ee4eeb2f5f285ce56c2987b62d24 SHA512 4cee071c067c879742839d3d32192ca94ee2f9241468656357c3aed116cb7c656bf81722f32b67d60214b7db66858dca6443f0d52f0ff2114fc70971bdddd2d3
+DIST futures-channel-0.3.28.crate 32281 BLAKE2B 128709ed9c3f275ee9365135426b626dab7d34a706cb9435a6ee45e2a28f7d2e6702b7bcd8b0788f7171ccc75917f287834a18c8af58b73ec07f46425aecdd97 SHA512 21bcae42859687538a3bbd4a4328b1a176bf8eec3b03f9d341f8ec08e796ada1638c0c3011246995d742e392a3ecf4446ccd2e92ea5426fe658c5f5ad8303b99
+DIST futures-channel-0.3.29.crate 32432 BLAKE2B fa89fb7bb14e5d23e19636de6116fcad23668e320a4c75409ef232f83d473e3c6db89a44b640cae969a0a7210df6ad6e5f7886e284481e0c2a816ef01e0c3d93 SHA512 f04574f9e88b5d56570ae0aeab082c6c1e4382e1594d83646c1899416e7403bdd7537282bdb20146b5df4fe24b550dcf35c497af04c2210575413d6c8018dff0
+DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0
+DIST futures-core-0.3.29.crate 14808 BLAKE2B f1ebfc7c1c7a8a212ed7e6c5c72d973f7dafe8b4635c8d42070d6842bd4920fd39775195571dec2f6395c5002d8ac02af889581fdbf878a45e0eb27dc6c5f0b9 SHA512 ae10dc9c1473e4625bee4db902ab3833bb047bd159a40e4fc4cfdc3a266d1ab99e85aa3db4f8dd867e08926d8dc733760b3258884ab890db1fd69f1520715592
+DIST futures-executor-0.3.28.crate 17743 BLAKE2B b192025f0838c924783090e7b0bd7806edae0502172e5f961d4cab5a4a5c074050ab6a707a50baa0ac2f505deb1e3ace4259349570beab0bff34b7bf6849e9ef SHA512 1404717a512f1968e3ac6c53bb6c428fa049b0f6c61565ddc4859407cf16c56735cddf7a2931b2816c6c8dc8809f76e7f98ff05d4f80e4567488c2aa7b424a50
+DIST futures-executor-0.3.29.crate 17745 BLAKE2B 4bc4ee76b767285ea121f6edd3d5230f5de12724b9bd9f80341249b1feda6ff845ca6e847639906565c17f7dedb8bd726c0e531071fbadeae91e4a1a7d42c8a4 SHA512 df3220201247d4ae085a970c34e4c3dc7f546f4ff38fa817e4eef55743127a5ca6bcdfc35dd7f5f47c5e2dff32120483e14dee466080db04e93244fb5a5024ae
+DIST futures-io-0.3.28.crate 8910 BLAKE2B 5554e9dd8548be47e7195ae8b223288cc2e765dc9feb703092972ec9e19ade825bc9d7093625a77c7dd2213df59e2c70ada84a84446b5a940c3e62daeb9dd57d SHA512 805177f2677a09d94ce5f010af9244e0e0dc285937e355a836179297c4c912a762f8d96bce57af388502810dcb67a772b7a522f5c6b21be3aa4b7ee46372d402
+DIST futures-io-0.3.29.crate 8908 BLAKE2B 909bd5dadadbf726dba3943dcec930c7409e20d8d324a52444f4145f5972e30ee4b1e48b7c2d9982fbea62ed5f3288e68e8920e99cf83d7cb81b9de1e8d81246 SHA512 869862f8728d94f0f0e71f9b24d0bd26b8bcafe70a80dd1dde4cefce73d91dc0cca80fb22e891f66024a77dcf28e8858e815bd436eb17d4c3119a7e68fefbaec
+DIST futures-macro-0.3.28.crate 11272 BLAKE2B 3f6bd63f402ab3348e1eae96897b4c18aad01b99a1f9ff555496fc6f3114cfb3334b1949604c21af251fdc4923c09e4412f40031ed92646a06ee05f6bee9a0d9 SHA512 accbe4f434b3704fea440e1fa7492c438068ac89798e3b2c85a2b251c55663ef2c65480f6da0884c8e80a9c5f5203aa6ae623059235f4a480a54d91bc5e9426a
+DIST futures-macro-0.3.29.crate 11278 BLAKE2B 025cca67a95da0399592b0b2cbb5e47ef3685cfe21c074b4fb807f13dc4644fbd9984b92e6a240deabd7de9074cae6cf3a0b64b37045974ed9d223dfeb24a726 SHA512 0134430d604bffc5066ad826cd14656fba24a9e412f65b4053412103bf3df7934474a0eb63e773b3de0cca8b57b6dd196229f57fb665241b583c961b79129560
+DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82
+DIST futures-task-0.3.29.crate 11853 BLAKE2B 050df023d7942207ea11cbe5e1cb5316a255763948b0c07d479828a3245ca34b82a71d1854ddbb13e01e853bd4ce424b319b2182346c36122d0246649390961e SHA512 6f8da7141899cceaa498c857a81c69330c093cf518e101dc53ee1e37123fae918536fcb1dde038e06c08f05c5f378a50970265a35229fb31c2377146cf94be39
+DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4
+DIST futures-util-0.3.29.crate 160207 BLAKE2B 2f545d3387d5ca21c13bc157eb219ef767b7b0c9957329f3ccf247e6402295f5384e01121a1e1ed062223568f6d7db13602b38878a280f19d26c26cf184508d7 SHA512 48fae22d9b5f38aa85b423ade3022dc693775aad5c3e6988d35e4d529b9395c0f35ceeb394492e0f3ec96719cc3f3fe4ed3811df045b840b63231921e42fd65a
+DIST fxhash-0.2.1.crate 4102 BLAKE2B efade6722efed1cff0bcf307ababd9c9031af297baf410367212758411a21d61a473456c7f9b5cb15e444d115a62120f140c082e70dd360a3ae83f2f71bec9e6 SHA512 638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38
+DIST gdk-pixbuf-0.18.0.crate 18173 BLAKE2B 44367c346398bc670321b30019fe557e1a84210ba531094297cf925b672f663f58f45e46850e5d2104e6ce00902af4df579783a3440d27d78d7c1bdd4c4a4350 SHA512 20ef7a417ff80434c1354199e0e19ee9db7be5d56f1810e0f8b4e82ce9fe5f4ecbdc53a4bb9d2e51a4f8c47710877bd513e8fc058cb6286fbbe3b69b2e56d176
+DIST gdk-pixbuf-0.18.3.crate 18174 BLAKE2B 5c2cf7883566a310e8fbb14fbba85d2d5211e6ebb506774780920cefe4c54f443fe66d738e330babade19cdb4ac1af8dde69694f80c0d51c37dfad236c2a275d SHA512 18c032936c6125406d84c45989590039f7e605ca1eadb164d441f3fd0187743590f0815c700f363360b99823c98a50824332426cb09b07177bf0186f89e06ebd
+DIST gdk-pixbuf-sys-0.18.0.crate 9674 BLAKE2B f9c224988cc2d46181a5d3dde212988785c5cd8fd411ca5d4a55156307ee5895465c5185d761b246a7ebfff81a60ef7c5973ecbe5704b5e0ad77ec72b55025e2 SHA512 ef757be6df8f6ffbe8a0276ccac2b3d4c46b7acc6580876635a10b6782d5afb9ae6e8b11c7dccb0933b6d8767c57bc89b0ab117470f33b73f7a4a141f44fb121
+DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
+DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345
+DIST gio-0.18.1.crate 204998 BLAKE2B 36e3f697db478cb5b1da3c5136ea158713eab2ab126126b4fe22f9b5c6093b623b8efbb72cecf672df107bdca0f651fff40d2985c4a9f2cf9e5f2a9ca8d0809b SHA512 f489a0f0223a68673eecabfce71d494973d46fcd19c385e2bf219adcc612997fdbe542a36cc5fcf539120d5177325dc297fb1120b72fc172fd458d50b87e2e52
+DIST gio-0.18.4.crate 206027 BLAKE2B 6fc7b587e5195d0230491b61440d7f0f9aeb87dc0835c5af8c6a95ea19c4803d56b1528cfceb5b7d006b4de65b92d3cefa3b2727a647af44c6dcf1c107fda7c4 SHA512 d4e5de6c4600883217a98331b9c0d6836a04fbe446dc5fb70e7eed6c7af8469defa01f246ceb962b4b6f905d08782e3f169d7237c032f4b9b699f087b50beca8
+DIST gio-sys-0.18.1.crate 81369 BLAKE2B 40b7425735f49cab5748130a3edde01713472cb75c2e3f1612ac1699ff2488abcd17addc8b9de1704328f7656e660f90cf33502f8567c22565f15d9f80aa4079 SHA512 f02e9766754d48407e955fc81bb27820a357a1f6cf7b1e89464c0399cd39d4adfb8586d7d7a2a12e98792fcf6e4fe2807816185824967906d45ff936ba3d911c
+DIST glib-0.18.1.crate 261969 BLAKE2B 8b6e43772952c25c422ba970022f57dfb2e38437a2743ea380c146f4aaab7af8e3275082299a9000f41025ae497b8fdb50aa06d1fd13e8d773817fa95b1f47f9 SHA512 86b761f034151d0f4aedcc313f06430460f3c8fcce5d423c9deaacc6e8d89307e670b5aba09ac687786e31f8ae82b45e5966b97f9350224ef2a43a356430a1f3
+DIST glib-0.18.4.crate 267653 BLAKE2B 09f5d47045325aaf95b53d6d3301a9fd2749f98780113686035bb023c9d5b989064e0222b31deb84ab1324538aaeb8da230ea456e5e128c309df9b0f94fd2fe9 SHA512 45b2e14c95d3643585c0198fe2ab0c21455196d116324775b0407778d8ce29a702a2f6fb57a87e479a2ed6bd8d689a3829a3c7d801f7a3fd631c07b0479bb4b6
+DIST glib-macros-0.18.0.crate 49938 BLAKE2B 6f5cc6a9e20c3de82954520b4c7e437de8db082492c12ac26a6262e3d36d25a0e14d188882c3c7d03513d6761b4968e2cd736f27fc4e1a5ddfdddb673f396817 SHA512 e907f3f4dec6511ff20dba71048b80402d3110ab213bbf1e693b16de1a712d403aa4ec6b4cdadc537b0850534f8965916b5ebe23183c2d52b4d6a28a84c0a110
+DIST glib-macros-0.18.3.crate 50850 BLAKE2B d784496296d90e50998e9b4fdd84a2b1fe4f53fa044e85ce288bfac1f304a8bc055f92dc92db7516642d2e28e4e2d13754445118fa3d63d31aa3e4109cfcc8e9 SHA512 14c210285e75cd3e7de151287263c626e050a3dbfc7e357aa7beb07abea3b52f0296736312ff646b3e2256cd84500ec68b38bd2066987623903d485a3310c445
+DIST glib-sys-0.18.1.crate 60464 BLAKE2B a68df8198874339988cb60ff45b9904607a7852d224e5efa487f22f3bda8d3eb54f7e30f6e2c30bb20dd6e5d48c205b65b7f8c3787915d3a436666d6fbfb797c SHA512 46583979de6d58cb863e522f9f11f9fd2e16ed5d1ec098f9f9511a7a124029671107beba01d5a19dcb082e57c53a2714ad3f75b0ae47c65985c2ab947d3f2c15
+DIST gobject-sys-0.18.0.crate 18699 BLAKE2B c5578c791f40ebece8210473bb363174ebf6d41db6a7ce64f4a86a2ab5337c45c5b10ff9093712a846cd2cd9bec99e135b4db556a4d18d6d4758a1a66aac08ed SHA512 7b274a6a4c4f38a4c1a5abf6410151d5ecd669c9a2c3ca874faadb0cf31c94b000c7439e1c1d409cf66ba41d8157dc9bd931de5bac58e50bc2ea9cbab13b3f00
+DIST half-1.8.2.crate 41874 BLAKE2B c3c5c01771f05b7af652abb8e5490dde7afd04de130537e67845fe7ed58904e7ad66c7286a4e7deca3641876a6d12c5b6e95883fee2809c8e685d2f79cf96610 SHA512 5eb128e41b8b7f9769a669834b2f8380b115395bf2a2a181732bf6c71234d978dbc4c527fddadaa7bd7fae9add77958b27616bfa1767fd123d3cfb887663292e
+DIST hashbrown-0.14.0.crate 116103 BLAKE2B 24bab03e8a8cb7623b92282c83bf8acaf0752c696ee1c010249e3ebb3646e7549d8d6d798b02c9d5b621afbebba7320f8a859d9a1af1523dbd46377b857dbb5f SHA512 f0fbdf81517f59a0b67f792a4097f1131d346b2b4cbda93590749cef7f9f1c9029e0e182f58c23b74d3028f7502c30b9593c1eb4da37f95388d74b14582b8959
+DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356
+DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8
+DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6
+DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1
+DIST iana-time-zone-0.1.57.crate 19785 BLAKE2B 2304a63e4d3a477125ed07fccd5a84832f775c4a0fbd60a995e6f1850aaf3f5047c6f70975c9f6334f96def12770d470677e1f536e9817f8ab1df8a312622cfe SHA512 79bc0fe559dce022cd3c15ffc3b6f870c14a40de6d5a61b4a5a6ad28fe7efce82a16ac5102073a3510f3ba683843475f7fb8a4029bbafbc1cc25e48b98ce2fe8
+DIST iana-time-zone-0.1.58.crate 27020 BLAKE2B 3e62ae3876e181e6ce4be1ca2417363298c0b83fe7d66d1e1dcb5ec308e9342871306387ca0c5fb3aa7ebf8f16968094d4c7b4a497fb792171fd400fe23e6a50 SHA512 9e55f17e08f371c476394ac2db9b447ff7f2a5e37e2cd3e84ec3e2b77980bd9de7eb81e8618695367d708e69156628a2e4ed80c4b7343aa71ce0d75a41e24b75
+DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2
+DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb
+DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c
+DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a01295a9a4db66f10e6c0502f8970982fb808581472e840cc34dc70e7938b89408799ed0d91aa50d3dd0b4807995 SHA512 59bc19653436389e1408e21b0933e5ca6f9fe228f0f5fbe9a7e4fb461b9712ba82983cbf22c0581eaf7913298b9ef5842702946152b493c1dc651381d6bce1a3
+DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600
+DIST is-terminal-0.4.9.crate 8109 BLAKE2B 0fa495da123f6fe5e3ba5f643f1ee097fc4f8e8aa54d9525b6108855a6a2e58556534a5e8dbfe7b5f8e2f1932003ac63f6aa3384317de7b385cf724bee294468 SHA512 0803ea53945715333d9b5fb18feec7230a49cb1a5f7308e2ea8d06a650e376794dd372be111e85622fd21320228706dd589423510dd010cd6ea112f185c46966
+DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
+DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8
+DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
+DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d
+DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64
+DIST js-sys-0.3.66.crate 80765 BLAKE2B 366f2741a1f7bc76f78068e183080bc221d45fb9adca257da61fd05a3f9044b7c6dd9d1c317e29af30effb28fb969bee2f766ff348f14d9d036f1a7e6bc2e599 SHA512 7244c856b2455d441e02eb12227517a101af28596d676797ae45098512052c09650612a93d912378d27254c5ac64dba9b37057c7493c1e3d3e0d52b2169340ac
+DIST language-tags-0.3.2.crate 53420 BLAKE2B 7c6d6f6db5c79b00d9e2b70f1a33769b83ec6d75a3e282f61db459146cbd05cec855a9979e3f229d43439f045ee3e9eafd1255c8b7167e623c2d990b2fd0c110 SHA512 1257bef56efd927db15d98dd6d40d5607408d08fb352d6dc0323fe2bbd0367625bc045fcddbf308387d71b9cecdda3b9f8c785683b6988fbb49c87daf4cb3c3f
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
+DIST libc-0.2.151.crate 736640 BLAKE2B ba8ea6d22b0eefdc5c1c5ee9fab960b6ea0eb7098a21b032563ec78b5d6e2a8f1d7ca4d5bb721c71de2c5de28e105029f229b9b03cd5168c78a65c7164e6d07d SHA512 2039bdfd704c5a876ff7d609622bb968260d6e0fd264ca457e92b75660503eca10e1ff21864b3c919d2656de521f03ef443895f5c0150271ae2502857742b0ec
+DIST libloading-0.8.0.crate 27845 BLAKE2B c98317a94f297d56c547bd136eeaa03c34a238d86c98d19f4c2651a324839ac691de0cd732845dec9ddb39a237dc8ccc1de655807e9e4663bf65bab1dabd8e13 SHA512 dc6de5b5eefdc93532be4b5604836a8cda2a50b663d10ad06d3b51697fdd2339e040418f151c73bf5a85d184429da060dbdaaed52716fff0b01e3088e64b52f8
+DIST libloading-0.8.1.crate 27893 BLAKE2B afabb6e07ecd390918344388b5fa63e5aa9223bf3ce513d1ed94cf02b1defe9909d94f0fa05e1516a39dfe4f41636834d3de0386b3c58212103263f2b1423f76 SHA512 f17ca367ef8e62fe80f43e5f3e2d1585be7b78b0fe4a733d80acdde38c20f9f72e710cff082442de6afa323aaafa17eda4491c4430b2d12f398d420e057cadab
+DIST libm-0.2.7.crate 115688 BLAKE2B e180347d10847c40a88e43d321e08561df053e6fea0cea2cac480c4162c2f31d8697b4572a384edae323d43781d3c6462b2d77220dd71b2fd0da3a2757487db1 SHA512 b7adbf657be812451fc50cd5e5f92b7a71d43b4e48761bd2738d65498c9abad851f8e86d3be06ae75cf39c7798c23cafe767bc5fd40f596774e858f69fcb46d9
+DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
DIST librsvg-2.40.21.tar.xz 1655860 BLAKE2B a3fd7915d39984057e860da90115d9d95cef97e61d3f5e4c3aaaf399c4b3bfe781e6a7b969958ae84a3b7f2c788576fe26f56b037ca0a6a2e059b53f2bd1b9fc SHA512 db0563d8e0edaae642a6b2bcd239cf54191495058ac8c7ff614ebaf88c0e30bd58dbcd41f58d82a9d5ed200ced45fc5bae22f2ed3cf3826e9348a497009e1280
-DIST librsvg-2.50.7.tar.xz 22224148 BLAKE2B 323d8125d73c9e72fefe7a868783f16332fb9e047963ccc0c36af280dc5ca4e1f6df3eee8b28b2380140634f51c1acf5b71fc496dd584ed9abf6ca3ebbb9f4c7 SHA512 064df9440802088f4414ffb70e5115809028858065739443444e5eaf6f809da47c697d31f9423e3ce9efcdeea02ff41ec39f5acf5882f2d35f433b7565be3c16
+DIST librsvg-2.57.0.tar.xz 5679056 BLAKE2B 02737f07c8f767a8d916691cda8e27742a591462349c8c122901525cf1a13566d278fa61d7e0e99e0182d257f5ecd7fdd0a06744dbb31329d73848ce389ac8f4 SHA512 a80ac5e9207b50d35d9114ccd39cffbe1194a496b8375efba874b440b03b1312c5a660b4e423b48321ad5f94d581569ee2633786f1ae32aeaa7a4b213d3a27fa
+DIST librsvg-2.57.2.tar.xz 5688148 BLAKE2B 4692e42835c06458fabdca903ecf35aeb813d592eed525906140697e86031a55b68646d61e0146ca13f8ba3e0fc3c5f9b48a4a2556b340d44d795a1a86c1c088 SHA512 cee79ee7e7e44a5b77870db4d6e03a4e435260f52da1c8649f2b27fa6f18c1ad7ae1c62ffe03a80342ec151ffa5704d6fe3ee8b3dc46d7163a57f555afd0c6d4
+DIST librsvg-2.57.3.tar.xz 5688408 BLAKE2B cf7a56874c235fed8ddd32cb49573bd73ca5f875891b37a7ba029e92133eb698d896a18e62b66f8f56cb62840302a78a27977c95b3809853399e418c6973340b SHA512 d85e085fe7546812aaa58670fa9690aad81736394b69c8c3050bd2f215727430b29055204fc721b4514c000cf8dad0e7785d6d5b57623ce0528900b8ad0cdde7
+DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707
+DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9
+DIST linux-raw-sys-0.4.7.crate 1350647 BLAKE2B 7489b530d59c2b1c32dfa77b260fa9892ec3ce9b15bbac90b0b7565806798d7580145321e0a2206d7a1f50b6cb7684dcd85f30a11dc330f071aa2f6042f941bc SHA512 df36f3f188767080f118aac32138233209a1f0cd11682425fc101cb054e138cf0582ad044d0f326a20ce517f425665ea1ad9ac5eda147712a994884101974d48
+DIST locale_config-0.3.0.crate 20808 BLAKE2B 68b0519639c816af82b941a417d4a74896033e9c5110081d495e1cc3a3e7613ddaf2a665770c6199749b89be131a35592dc4cd7cc2789928199b22205300aa9d SHA512 c7d77156e957559172f589f90405b2e9f5306041887990a60a31630af2de81c00fbba2bcdf52bd163fe431f85694dc6d2d380671f38f2724d7e4d178d89998da
+DIST lock_api-0.4.10.crate 26713 BLAKE2B 113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c SHA512 ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
+DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3
+DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e
+DIST lopdf-0.31.0.crate 6983532 BLAKE2B 7b056208e04fcf5cacd691b4c60bda25642fd94915707c1c48088919ec6d170c00f2c84d8af8baf37d7d22454bac953f2f6f9bd78fff5d201f7b45ca98744c34 SHA512 b682530660265522f38379ab6893474fea18051b461d5c36a17f9e7b2b60a54fe6ef91e555c677ee96a45e7ac048a271e258b20307d7e5ee254c697bcc3ee801
+DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a
+DIST malloc_buf-0.0.6.crate 1239 BLAKE2B baa59345fd372db162773adbb441caff1f6bad965c3681f244161deaee76282fa09b9af0d0642cd39ef35689f85f5bd7c2efb7ba8119a58e86c7cd12d81b2c6b SHA512 463b3d7666cdd7de618abf0cc4e488060c84d6d93c56d4e922169511a0b03de380ea988cd998f5a162b244088902198763351ac16dea3762f0fa0840fc29d6ed
+DIST markup5ever-0.11.0.crate 34667 BLAKE2B 7a4e9c860949296912616fab105b688fc5ad86df012f064efb3e5125aae57869b4e63f4a551fc787e65987e5bb8c0dc26e2ff99651a2e56fa67237796f5967e8 SHA512 c9e9452f5bd43a7e578434467ce324a857ad600965fe37a24650f0f3e968fe1dc603ac8c7b9c4ebe2f624511cbdbc592ca0072b04ae094738670e199df9ad05e
+DIST matches-0.1.10.crate 2592 BLAKE2B 6e9e8ce8ade3fa0f144a1befae104f63764f8346fe864395be44f99d40ff0fbaeb45b6f2fafb2e7822d1ca72f1cbeaee4c5f9bc3e2485cfef2b8de2a4183ec04 SHA512 2248c6192238a8eda2dc389a5c27357555607b726d195c36c4cf647f793a4a9e17ecdf5145b5a4d8fe6eba7f9b23c7b2db1cbd553f5610d25976e3709bc2fe4d
+DIST matrixmultiply-0.3.7.crate 57046 BLAKE2B 7ba1abb8602370e8780c8401a4197653998af1d0aa0976a6710fd316cc057b4d6ef71d009ce71da85ebb2d2867c597e02ca2df721bcb28ab1c175ea4b7ac48b9 SHA512 40d68362bfe3ada4b8674bde0f5b0bc34e88590b8a0bb442cf1dd55de1d6dc696533221cf373da898bbf5aee83a12eac564e7fb8b2bd451e62c827b7fbc81c21
+DIST matrixmultiply-0.3.8.crate 57530 BLAKE2B 3a97130168de9dd18fcc0ed33df126f25f47a919e9f74289f809f33c2a290bc41626a743e6c446d3ed0a22fb5eecadbf29c11082704970ba9e465fdc5ce18332 SHA512 c2d31d5764cdec868fddf018b3e51b936e8bb18b131bb9899a5747ad5a4cbe892c0d62265f99077137308ea11f32254c8a8b64da07855a6c38756df42d76e5f3
+DIST md5-0.7.0.crate 6671 BLAKE2B a1c8132cb4d7497ab3f4550e6fffdea6b118ad99a31128c068ea3243b5f76c4b059042da376a0be32fb74e866571348a581c2ca727d6acf855d823ce15f593b5 SHA512 569c992eafe25986a1328666a428b2335ecc5cb7a5ba142c34d7abb1247f6768c0bb3dce790121686d4ebf1b4a1832d65315136552163dfba5f799f99551544a
+DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc
+DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4
+DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
+DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
+DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c
+DIST nalgebra-0.32.3.crate 374117 BLAKE2B ec8e1c00e3e96c7e7d2923e9ddf0b36caa0d926fcc3b07c681c07f8bd21e8141b94f692cf4f31092a7363bec8980c004091ff9bb5fa638737891bb098459a534 SHA512 5070964adf414e681120cba3d4c56d4632b50b33c543beecd22234869c1264c1eec7e796cf71fe93f4c994d977f5cb8b4ba14891d2025b59700a5080415805ed
+DIST nalgebra-macros-0.2.1.crate 6378 BLAKE2B 06fa641fa79c645e0ce826d11e32807d524cac86dff1b7bd2d87cb24a0be3f3fef55b34fb67d2a1a6977740233ddfbd377bc8209ded2357d345463c487166192 SHA512 d2c24ce31a7ff9a495b8d252fab4fddbdfa7d6585e09dd1b6ce7f1e221cc04be733082a268fc2837212c151d603d449969f80f147bcc374615fde2b3afaac0c0
+DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
+DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad
+DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
+DIST num-complex-0.4.4.crate 29564 BLAKE2B 8ae65e8f2d87de96ec0a3d0e6d580584aff8cfbd0ebe56272dcf7cc5eea1b545fb9d597cbe4b1e25562b99a217a03ceef60e6cbda47c1e8cbd29b38d16cbe428 SHA512 632f9486df426d9254d2b6484c560b31e4ac0270de85878b9c4d14339a05ab318a90019f0724d2fac4d8496b03680650f899cedb1741c58eb7536cf3732db600
+DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
+DIST num-rational-0.4.1.crate 27889 BLAKE2B c6db5b2165eb341268cc8b81df44caf25a18242d0ff1cc0959444ed9a51ba9985c1238d6d79433c3927267ceb181da6d491bf282560db6bafd7768b79ec65842 SHA512 a7547ca663543e9da9e18dd079762cde371b85d55874a54d6b343ba775a9373392c85cebad511c53b5af5db298bd5d57ccef6161c1c28587a6c9fa2c5962a0bd
+DIST num-traits-0.2.16.crate 50130 BLAKE2B 1101d28cb4dce477657684a068792b94c7008a965e655edbabfeff51cbe6f008450dc6d7e4fc5dc4fe9c3ee8623ed77a7bde83ce2f68e75d618295fe6cebe0a8 SHA512 2ef65e2f6275b1000f611cc4d019b2f4846a8964b54d9b96462da10e3ac9edbf3d1de82e40094c76f7f5205740361b0eb0ced414bcddbaba5955144f728c6f94
+DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e
+DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d
+DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
+DIST objc-foundation-0.1.1.crate 9063 BLAKE2B 876dd217b612278a522f2d08434537d468f8b0fd1efb0e58d0b58216e20f7f9fc80a5ff034ea25d9216d4d53b2d65552684ae5d5212f18d758c7937c91742a84 SHA512 976dcab4e62ad1c387a81723d70b969fb7d332e1f7dbeb2ea9a26c62fa999d91ff6d8f737ac5725a7611334862df16fa8b15765c036d7acfc3e42a745d051f34
+DIST objc_id-0.1.1.crate 3258 BLAKE2B 9a74fc17235ffdd7987c2735a7a9d136376fd13355f0561b4ecf234784aed077d1ab5aa11c1a82fcee7d47d4d36e471ca4ba3e5bb725a2ed0049a5565967326f SHA512 ec36fae6f5cefda00f3e44618b3c9fe6ec8f528f70d1a95def6421704bfa128a6e5b4a32e9dd686bf6ff60c4f87fe8094aa5e1c8070bcde58b17fdc06f49f9f5
+DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
+DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c
+DIST oorandom-11.1.3.crate 10068 BLAKE2B 443ced49f63015823866257a36a88e566f75adaa79511c1c73f1190ec8855ca590d2b6ece07c2ad5e9e47a89f7891af6e9e43b7d74d9ac57cb3551e60b50aca1 SHA512 51ae60ef51da56d7673f36a6c5b99b743580c5f5be54fdcb54b69e5e2f6bbba3267f96b74e7cd6dee6962dfa6696fd9ed073f22726a2861b8f2601946a8efab9
+DIST pango-0.18.0.crate 47499 BLAKE2B 7f446be2a20cb9bdded6668deb0c6aee8a8368ed2439df131ec47c42eeef9ca8440e43623455638e8bb9433d016af0f732cf558021b7feefc4218be86a0e897d SHA512 6c2a333b65cb39d6dab511f3f5a6e3fffb7aec0bd02ac147cd4b6dd7cf5f917d69b4515472f3e999a30c4ea2974b1b85b6b6f684a3de7ca2902728b013576ea8
+DIST pango-0.18.3.crate 47591 BLAKE2B 56eb8e33752289787ded747b5184dc088a948a60500663ffa56bbb3fee638745597719e266862e1990331a3356231418fa3c2a8dc6fd7194790fd904ecdb480a SHA512 eaa4d780ab208089e2c3e989d3ec3b2a2131752dfa0ed2a048394e3425007b58f668509f5b6064acb9070bcf424e9e93469070c11fe343725fe6df0c9b45c318
+DIST pango-sys-0.18.0.crate 24709 BLAKE2B f197872258fae7b554be9d62ad2c7a3484fc817430b008263a6b2d20845809ee3c450fa8c65e6845854d5885cdd80f24791a94ee7fa3cde43bf1c7c504f886a0 SHA512 b20df431e744c7b19896b31f487060e0d929c65289520f1fd4d624ff708698d4e082baa73366321206a2a7e3f4ad126ace9b3e55169ff815c9c6b25e5ec5ba3f
+DIST pangocairo-0.18.0.crate 5639 BLAKE2B 0764c7a5d26a81eef808ff867c9d0028d8162e5775a541529f165c803ce23f600bd0c19a7e568b4c1451bd7b94b84910456ef7d4bd8124aeaacb28b1fc727773 SHA512 8bdfbbbfeb0b455e24e7551c41f462632ca0a301141d57a8bd86b50517d1a0fe363e1ad81170c8cd448a6c94cf93bc43e2383e3f2d6a60c8c7197964c82b4c15
+DIST pangocairo-sys-0.18.0.crate 3226 BLAKE2B f6bc8ffa27ef3b3edcaa92d44a28a888664099f844f2b60cd4cc74b387af1bcbd6f6c699144314016d16297383d2d1a8ee81423799ddd6b21e093b3d16a94b2c SHA512 f6760f27fe22d3e73640aae4239ef3329f12ec7bb62df5381c0019ef28d60f4f45b15a0e414a55b3512270b90bb8b37af667f4233c3f901e44ea0dec28a1a67e
+DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
+DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 2f9666872894d1c85895437d1353f9e15be2bc8d004ffc8f0e5be95e9dd4b274797db3752eba1c0b5b6071c1b8a71e4857cae0b2aff1afdaa39e92e70be2e6fd SHA512 8d6dfdf661b0f7d0774cb9f61121f2daefd182ac8a2a0d24eab451febfbe1a664c815c163d34a7f3d15a54915a8e22e6c6cd10e89cb7d7598d48d81ad6a3c256
+DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032
+DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee
+DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd
+DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44
+DIST phf-0.10.1.crate 5406 BLAKE2B 70532bb97a0089ef2a57a1bd43b4dd30f0289ffc1a15357ffd8a372d82374bd505f4e39d3bfd6bc2d3c2afca39703c89e3ed37ac41c364cee3759bf0cb609f82 SHA512 84568d6d1baa7c4e6faf5f3ee09133e736977286d7cb7630a59a53fc8ea15d0d41b9242f8929184667ce576cc9946da55d1e8bc06e98824f163c91c6aa05e073
+DIST phf-0.11.2.crate 21569 BLAKE2B c809201298f1c5046874b3bbdd30e33f2bee2e4b977152a2c5faa91019ee5a1c8fe1d42cf91f6d0b0dd52015fc66f0a84c1b3ae014291ad7d5ba647a78debded SHA512 97752bfb44f3d1f9347b4ccfb6fa2fb80b3263d6f67aa703c52ae90d693c537a0db878acef828c79bd4c41e8f7ca0ea45588dee073d12c9bb0f2980c511b65b4
+DIST phf_codegen-0.10.0.crate 3402 BLAKE2B 2d0a3d8f5fd0f8e577f6d4a5d0cf87bd5e4c0d5690d3aa331ba252351b59c478e42212cd66f167a2a88c2b9111ae7aca2c9fff3740dcba1b77d2beedc1d44483 SHA512 dab91b53c72a5b9b6c4773b9f16d2cd58f65bdd9fb975257b8d107d4509b44f5ce8b92ab59a60171207e025688cde54ef97c9973c4226a8765f10f35c4f6f1b1
+DIST phf_generator-0.10.0.crate 7525 BLAKE2B 1219f37d5699896f9dcdd367cfcbeb4ba19d3498c2e52acd02975b236ec3802f6ee57eaca40393a9742b5397809ef548923410768a727108c83139fc70562a43 SHA512 b6542d816b2e963c169df695d332f92237ba380f49bf919021514a16aef71de8f4f70b9612356db9f345f3f0d3656b2b39a4f34f8ffa8515510b81f1b19cb9f7
+DIST phf_generator-0.11.2.crate 14190 BLAKE2B a20d6d3d815ca0eb5ef18780587b9963459887a3ddfe3408c99f5ad7c382da014cc0bbbdca24fe13c780460f3e4ec4580665004afbd300fa470a91d3becf1a5f SHA512 122ee5ddb1f65f386d35e438396eafb7c9f2b1254daa11aefe0a6a45aa0662190c0b7fce32b6e003b04d022e60c2af4e355f995d5ddbd1b58df93eedacb809b3
+DIST phf_macros-0.11.2.crate 4748 BLAKE2B 643942f8e83dcf5623f3479d677ee11c7e25a87e9e90f2aa3b43a75398e6d956613257046f5b307476f605b433c5ae443832223ff1319a918fcf3f9602ce291d SHA512 ea6acfc43491af1330d32860103ad60f29566f6c32d43bbef254f23da0f17cc3723b1d04153fa41f82c01d3865e0e16156b9d2dcbe6a52532b8f268f3a55df7c
+DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
+DIST phf_shared-0.11.2.crate 14284 BLAKE2B 3c3bbd24de77b032d194d0b0679a84a4e2848d41ceea5552f73e51e3ebddd5e61188393f126f668689dccbbfa92a8accd9c09a77de39eeaf72b8993dae280dcf SHA512 f2cf9e8ceabde75bb7548e5a47dece9a8fb7eea4a6c5568675e7bd735860c3e51181d749a26cd3dcad1476ec22d524ccb77a956dd267cd0f2b7dfb81db9abcbe
+DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee
+DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
+DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a
+DIST plotters-0.3.5.crate 143975 BLAKE2B 57b9b37d9e5f43f12f1bbd95d0c0789a09b2f34b30278c62d8637f341a901ac4c0d70ce4a4f869429a43cafaab637d2f25af3eff12354b0e85b184f439c91320 SHA512 38bd608db346161ffa04c50aa315bf5d5eb2840490c5ad6722b9e294b8aacc3c434a1c6de073d2a29cb34de6cdc6260a227f9b7995ffbe75fbb8783708f50045
+DIST plotters-backend-0.3.5.crate 13440 BLAKE2B 72ba042a2057f7afebad34a794df17a0c340ae0d15af2631a3f3abbe117dd8a8d17f877dd935ad59f33494c523664cbd4fc11e05f6c7ae0c495b5e9d4c4a8708 SHA512 4468e2619d7fe47cd03fefa8b1d901ddf5cd47b2899b4b9082cfb695f315cbe415fd57efbef6e0a67eb51dd8edad530c15442810fbb87dfc4b7943b1a7f55460
+DIST plotters-svg-0.3.5.crate 6948 BLAKE2B 1e8df5cdf68b1e27e22ef2f383a81caf76ab598d09f31c536e86c543df78a609a33c3c426660a34a37d1313cc2937b0c678c5e1e43fd3d65bce95b59b2531935 SHA512 91c4955f62dbb8d80e01e5cbdc7ad5f1869be6025de1d2baeeb9198fb108ad8f01916cdc0728b7123ed9217abe92cdd8ad30116dd454312c8f63bf9cec98644a
+DIST png-0.17.10.crate 89384 BLAKE2B 4202db161bd974cc9b08ef01adf3ed4cbcaf00a5b8c3c8a42846581976be44e4e0bcf025d0493d39bc395dbaba6bd1336553d00e58f4280e23f41a6027ff4bec SHA512 33fdf0365b3475d7384fac29bfcd95177e822ac33d3adb1d91a1d52ea90a88bcc5facd95daadf02a79190d406f8a855c4ca4b6e09a0012c63ccbe5285d050101
+DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029
+DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a
+DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
+DIST predicates-3.0.3.crate 22743 BLAKE2B e0dbdba7bfaedfd3730bc381efd439c09a0730a8876be219ae5b8beb230f99acb29263c7eea1ea7333102335550936cb968f82268eeaf61db912fc4d2ba2952c SHA512 6638890cf3ca26170363e789318fd201223818089a34970fb650c12e11da0c2031dbe114ffa1e4bc55c05f7c75f41c60ca3bdb4764e061c6317508275940c7e1
+DIST predicates-3.0.4.crate 23240 BLAKE2B ff0b96b85668dd24e8368479d82210b38f591f67a0793a080670e02b649516be8acda4ae5f80e98113a2030bfc7ec71cffe53a0fea4fb65f98b3a2fc1f6daece SHA512 b2dbfa83760004abce72f2ef576d7ec079c4ea909120a8fe1ec6b87da0fcc2b48406cd6857ed16e131281b4775a6f33ae94f975e381794fd9a98a2c0e11e1f75
+DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702
+DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3
+DIST proc-macro-crate-1.3.1.crate 9678 BLAKE2B ed617a1930bf28a26e865f6477229566a0c4ade7f2c1e8f70d628c5536985f03c7533c561490415e207c0f58b4885367e7f54ddcf10b058711829f78a34d68a9 SHA512 5306f017933ffa89eb6111ee00b0536179c5cfab56529440630a0bec86b62194ff16f57ebb471b233e88cd886b7b9871de8402ed29073b23e5ca98193e513659
+DIST proc-macro-crate-2.0.1.crate 10989 BLAKE2B 3eec28b964420b6cbc78dce2d39d344d39195585256cb79b6a64d9fc5996115e05505a4611639fccd2733f443df6cb00f2d92cfc20ef2dbfddd2fc18d7dca68c SHA512 4a914dad5b558b9baf7ba9ca28c154cd14c97c85c094ebb412f6f80ecd4331de7d899c020f0facee788926acc22e0fe229e00d549b84b062aab470237dedf63e
+DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
+DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
+DIST proc-macro2-1.0.66.crate 43575 BLAKE2B 9eb3e816b00fcf625c280ba14ad269f5893d0523473a24de07c21945f6f932fbd08efb3c339b35d903245510e3f065e1478439b024a325f2bb9f97bc7bcbb18d SHA512 85f5a762f9411142e5ac28144bd380f07f0633ed2e44d8a2545be9fb8f42abaca6b5d45631b4be83b8e8b9beca7438bc52f25615c3a410a3a1249474b1aca407
+DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f
+DIST proptest-1.2.0.crate 194884 BLAKE2B dc217485d84af76365170252690d18b0abd472addcf1ebda60db79255d17d48a0f56897b93bbb01d84f20c9c1f53da854bbfd3091c8685229c4dfaa51c673e3f SHA512 b0786ba104849dc45bf1cb970cd7bd8fa645f0bfe1fbd37f1c2535d28d2f7773cc99af67838ebcb546d900f421bb6145c1a70639d5fa2ff0d25b45a2ab176e9e
+DIST proptest-1.4.0.crate 198527 BLAKE2B e6e6585a3e4872595cc9778fac723bd9002c3ed5137338f8f50b1bb4beb43e2503ef4ba67228018a5f753d60b3cb188944145d0a37126478c87d07426f974140 SHA512 eb7f4e976f9d71f75dd6a575339d0e31b6f693f2f3399b3e495d9fe1be2490a0c691c312c95103f543669899381d3a3264a2f74604eee587ae0972139bfc49cd
+DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
+DIST quick-error-2.0.1.crate 14265 BLAKE2B 3815c89e960923bfe0abc962c38714b953fa1d5af991f3de22d1d084a8cd1ba1761fc961ba97e06ead3992ed1b61f525d04bcce459599e5546315932281c1dfd SHA512 e028deb598466ae91663e5d090606be4f117662d0fa6e0c0b0043c7261f26787057e84e644cae72a45b1a0a7b1fb03fc9712faa3abee94b97ce2c8d25c365c32
+DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c
+DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
+DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
+DIST rand_xorshift-0.3.0.crate 9121 BLAKE2B 56c29e159c0beb9c751429130e84e4666f9031b6f70e180544f9cc8f8e85d98676b861b588dbda46f2cdbd254fb908c02c6ba640d53422e6bfa1ae4e48ca5a33 SHA512 256e410e5bc08c56496c53c3d53936f3b1cfed41458b0ee8879d7aa8b95375055746ca49e29000ef847b37f01e9237f569cd000c4b281f6c78ddfc78ce439a49
+DIST rawpointer-0.2.1.crate 7490 BLAKE2B ee4542886347f2bfc7cb32cf4f7d025d35c78cb763e6d6acf2a8f85ae8d0261a2a20f86903952bd33b886dcaff789bd30c507b4e5d53c0debd2e6696291a825b SHA512 bff9ba7b69e7754e89ca6d42bd3b7a547f450404de999e35c10e4002fe03ee1f563b9799673c5010aa4c2f80885ca9e45b5560c5093e117be3b75d86affcb62f
+DIST rayon-1.7.0.crate 169488 BLAKE2B 518f0eda1fcbd1b1b230587ea18cab0023a699e796c819bf35a6492b7edb051137446bfbc49aaab0a68aef8280c970ad14301a9f8f7461d537af119a65b33a38 SHA512 d999c811b701d0aa4e547234bdc20a7df56728e142c4aa882bae081b7b057e8c3a72f4a62fb35535e57501e8c2ba7ff072068b59d6b5374e9ca6bb66cc0984d3
+DIST rayon-1.8.0.crate 170172 BLAKE2B e2df52c64435926a13f4f275c4f25a9694316aeb02b73856c600a1a813686ceb20828676d8272393d1aec18eac4f05bfcdc5ef02ff1e19245c547c0313a2a03c SHA512 ab1cef238530d81c255b6631ecfed9cc4f3f8d7cb6a74701d29c1dcb022cc5b859db1d246cf8247d47702fdadcedfe64a6749e24cf6c7258e8c9411af7e4524a
+DIST rayon-core-1.11.0.crate 73118 BLAKE2B 313d65bb6e3a010569b317b32ac91c72e38282f4fcddbcb56ffa97de42d88c0d34f35f76b62e1ad60ee96b596aa681caf2071a8d5dfdca085fb1fbafb07c3ee4 SHA512 00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800
+DIST rayon-core-1.12.0.crate 70081 BLAKE2B ef1bb1d430776b0ad49aa523cfe83bb0aa3a381b2e571db74cb8de04bbff884b8c269de31d7afbfd609118c445bf079afd2d4920842c8a8b312d329e4675cfc0 SHA512 588fa479c499e1620e25c5818996f0376d3bf526272af6c50a17ca0ccf0f8f67b03a3a665938575a86a8edc1f101a37ab01133b27f904eb5c291bbfc581135b2
+DIST rctree-0.5.0.crate 8298 BLAKE2B 64239e74abce1a80d200a9d62c4c0c5910373e073c9a8222a29aaf0761d7c8efa9a30ea46340ef7ccfa233b484057298561e7109f9eb2347db3bbd842300152a SHA512 d781a1201fccd6dd3921460993f3c6e737c71a0fa2cc699c95ba17043d73a70d2f14c3262096374c89a8b0d89d5157380efc4e1d2d13f702b9039bfee2febc96
+DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
+DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d
+DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3
+DIST regex-1.9.5.crate 253883 BLAKE2B aeb05371251aaa0fd11dce1f22ea095345b3b1e68d9d5e083b4b8b0b938d0d901b3bade66015bec830db3ee71d0d2ccac09b842ff9919e08b0e98112ea1897be SHA512 79b921edc977dc98bd07e89dc17873c8a1088473ddf941504973259bb8c46ad11bbe3818fb88a7ed07b86841206c322a9555033d0a5dfebb18fcae45e07ea53e
+DIST regex-automata-0.3.8.crate 610113 BLAKE2B 1aebbca26e76e85b42b035fa9ba02f98425b75fdeeec0f12c1c08e8f4a320c64d36c129c692e622256d7f8772052041c47df1aff165d8337d55d61770963a777 SHA512 47ad01be2c51fd510576e14f399b7f30d379a2cce2dbef3af4ee3e609859451082885132ae703c810e2b19bb3716976356e057a1a592ed507146aff9e7138dac
+DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8
+DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
+DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd
+DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728
+DIST rgb-0.8.36.crate 16576 BLAKE2B d1cfe1d22070883ef9313376145f8810dab360259dc2a23b4507ed3eb02b324e1dde46cfceb608ce745a87cd2520b2ce49c1e8827ed07c7c7b9aeb60d64f981d SHA512 e1e812b04e3c6b0ab93f7a10161eef808fe11888a5c1fc0060cd91fa90129c31491d5c64de0cec989acfcf66ce481bd61d9cdcdcb54e5bf2556da0e5c3bb7612
+DIST rgb-0.8.37.crate 16644 BLAKE2B 4f158ac34c03627bae762a3b579901d4737c2b71d9cd96b18024bf7f297169c3edb097d0d67289f8e20b2275a0613a45eedc8fae306437b76435eabaf8cb0793 SHA512 72491fb2c315ee347c7474e6f9b3d6eaaf1db66ddf163214df8466a4a8ccb0aaaed76fc4c72808b70bfbcdf9dc2a109511ccf8e405e4a006b349030e8ad199a8
+DIST rustix-0.38.13.crate 342118 BLAKE2B 9fb31bba5253870345abc513768b0b0deaf581212462e328edd7ebcaa028979454585502ea9b4c93b82701ad08d134b637066f81204b4bb2a374ed5747c36acf SHA512 66e3914746895222963ab80da0fcbbb8489cb74dd37913f57f8570258265a94657d7dea37c944ed20543012bcb474ada3c50650a194554ba74fab07c313aab93
+DIST rustix-0.38.28.crate 365398 BLAKE2B cd9401511363c806f0c8de5076031aebd22a9c6cdc49963277bd7a58ebdccaa59c33710ee625bc0a07fe2102f370e39143adca0651d123a0dfeb562d32e7a537 SHA512 a48c959c0fbc9700294b1ab0fb71a303bcef89a01b4407c2d7dc7c83b35dfbdb69bb6ac9a364ba7d68b4e561445e6c227af586cab15d9799de9e6622e89ada12
+DIST rusty-fork-0.3.0.crate 19881 BLAKE2B 01bae755c66d7e4f72789b7140de35573d82961adadcc9febb841e332fc2730b405d4f1dc8aff1db6eba3ca03ee24d5dcd9a9c9a914fd2a94428c796dc9bfcd0 SHA512 8e41e12971c36ae1d4439943e55204e32fb4e62717355a2bf79152825eef7dac305c2fe22468957cb3b7af0b27004ceb18eee2d2fa0a6f8822b28b711f64ccd7
+DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b
+DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10
+DIST safe_arch-0.7.1.crate 76930 BLAKE2B 7083fbf6b390dd238f22c499b725cdeb21fd07fe1b17a6fda183ae2cccaec22659dc6c154f4b0dbb902648588a77e0c457c79dfbe3f3fc4029a912e2fb1249bc SHA512 99c9c076c046a29bd8c6430b41ff37e3604490b9cd83ce69edd289ea22b511f1e70ed477164d5edae650fb933a7fb01713ca7a5b3dace5df793a4e80c3154ece
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb
+DIST selectors-0.25.0.crate 53052 BLAKE2B ad08dac9deb6d99c96d9057cf0f4bb995aacc4623e7fa1b2e93094e6553f68544c67fc4444a0ae2bd8fa325519ee62fec2a063dce6c52077d3f88fb2794c918d SHA512 cdab3c87fed0ca7f20ebadc48cd495c5c9494a65e5b849bdc533ca2eb77d3a380e84cae68f04a1df81e0729779fcdb98a8f2300cfcb28338c9b3016e18f3feb3
+DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2
+DIST serde-1.0.193.crate 76863 BLAKE2B 163097e85b5542451896d7381607aa297e3b0342a2641887a01689b13122c6c1ca566fcb7f32f51bb0ecc861aed014f1467edfe21338223d5361555f870425a3 SHA512 82259ca302f42116ecffca3c88bc1212785ce5430f9d29390a9041d4e5943c13b13de119fde644a583960102c4b6e850a16f962d36dc76ac69fc2297ed65a506
+DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0
+DIST serde_derive-1.0.193.crate 55692 BLAKE2B eeb2a2fbcd0daf5fee1bd6a4f584fed330db58cbd786073311d6a94308c63dfc6b7c2dfbc4b8980064ed66509f0127525b79d99aa96ca0134226fe21715999bb SHA512 05efb144aeee293a0e7dc7540106eb8c4920b2d8dfc25771d73afa8ffcba330104643430a6e396ea2adabbed4ccb23591251479b75449b9c8322799f91d38c41
+DIST serde_json-1.0.106.crate 146672 BLAKE2B fa8ca9a6f692929d0579aef6fd80766d11f5ca553d20c01b504778559a32aaf0574753f94d3978859c3e96a67f6f297ffb1919f2f9df42f8375d643c31bc71c4 SHA512 7b0d06c71bda19bc9e0cd5cb43b932ce15c7769514ef31e0099bd147cc9389fb8827ffee23544a37f7a813ea0c4a99b8614b1b6ea5cd337a1513769db085474d
+DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6
+DIST serde_spanned-0.6.3.crate 7737 BLAKE2B 957352cb24d5cb1173613a48de7e411d768c61a73dd57572530490be0569e133e7c8eb62ec34e542a17010871562a53e37b296386c54dee8ea61d175dd0b05e3 SHA512 5c4f4a861dba2af7f0ad0c585859f845a7ea6c0a8ff8b63985503c9da27f313ba15b904b0aa56a59043c44a87c75fd317b23006a3804d332b84855189e436610
+DIST serde_spanned-0.6.4.crate 7756 BLAKE2B 58b8bfa3b39368f4bec795bf1bf1b0e19554efa9cbf44a8f5deaef79c926c8cafb4eabd6230b56acd77c75b924b8642a141e3f7827a5fea16633edb764b54124 SHA512 10a71df5cf84abd5c658de0321a4813ce582735fa5cc349694d979acd8c8228fcf69b3c65bba803d706089b49b053c15a8b1c4fc4c19a586596b8cc58cc2ce04
+DIST servo_arc-0.3.0.crate 12738 BLAKE2B 974c29c80428d423ae2c660d58eaee5a03ee7b03c0d2a4fcb1beefdd2bbb8304049d494f2b8b87558ec3f9e2971d802b88c14f88e365b88a77d6ef4e6130a70f SHA512 2027b01976566873dde77759f4d1d4fc89400536454cff7fb0c35b908384e8ed14252a17d87f6e21c06f03948901b963b32b0e965c99affe7e3a761ca34295e1
+DIST simba-0.8.1.crate 52545 BLAKE2B d6f02df46cf10e8c9728c6f08a923781a970b78158063fb475c885255b6d1f9bbe485031c5a6654f074752537af252c5e67b2684a1e0759315c91c5988bc1583 SHA512 d17f2338b03dc319221c3b1afdd54d3f34c5926ce40ab22d67030057b407c8e2c6c9617ee4d1f5e637b24540baa5aed5bd9cea06e6e6652e05d5281fb702eb80
+DIST simd-adler32-0.3.7.crate 12086 BLAKE2B 8e0ae18603b344fd8a6573cc3fe1f8594ad542619a6e0d6e8f62e356a3a97409f4de3a215d561b8ed0e063ab431d81b63967a5a0b6561c45537a27ee84eaa362 SHA512 2976bb7fa153854ecd0d68ccdc108bf81d5da374839d53ce9dfb27e80d8db258bb817ea3dac73921e408541d75e2797b6d20fa63c42c1e8a935b6d75dee14bac
+DIST siphasher-0.3.11.crate 10442 BLAKE2B 771221614bbd56f609b9743da4352dc7a2cbd0f6257952fab0cd052e5e5b258a4c95a0461d6d1b579dec90b72d66a0e58e036899b3db8341ae753a421a4cd4d5 SHA512 601121bd41da896142dc6ccc74a6eec3ebee3e976857ab8b5d21e915fdc8bc6e979af66a489c406371fbbbfc7a13338cc4b3744aa981206e43c53998f3e1699b
+DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40
+DIST smallvec-1.11.0.crate 34680 BLAKE2B e54d56f6bbffbfa7ce5fe5f04e325b2e5cf19d290e4be278bc00a136e26284625b9c18c7c2b10b7fb8fad0ea7e3770f3cdbcfbaa913f5ac08d0a2f8b4e0de188 SHA512 41bfbecbc2c244497568a41724d65791ec3fd6d8057813d521367cca316c09c2b28fb3973826236b01c1f5d2f905d8d22b0c3c47f957a9ff5d7685591f15ccd7
+DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d
+DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
+DIST string_cache-0.8.7.crate 16655 BLAKE2B 9a017f3248a3d5e7b8c1a05462a882862b20174c7ce5dda1568c3d3f61c422e84ba2ccd5d6dbd726d1c752f1eaa8062a179470927a80d5bdda0ce530d1ae2c17 SHA512 03f9cdd2c01c0f233284851f17eaefebd68a91ae2ed2b231fab2d6d6476bd19e0696d7d3a74fb6ecb2ec36b89e79ad966ab73051255c9e194bcf9c5029fb8479
+DIST string_cache_codegen-0.5.2.crate 8156 BLAKE2B b1cd91e22937622ce51152957ed45ee88dba9756449f3ef4c4884e491b7810e1c9f10b58012244dafa4422d5589502876f30a43940ee9754ef7b9952ebe4bb41 SHA512 01b9b1a865878537f657adf908159fd04f3f2ba4e70f8c632b73d0ed5a8a09fe2bb9ac8ac4397dec1f50d771dec33fc5d3f9e68dbf80cc177118665b2c67e864
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
+DIST syn-2.0.32.crate 242504 BLAKE2B 2c2938c0d711c684c9baf95538e2e76220418646590474b2b654d9242d2818aa7c3e5990208fe231ef64903df17edbbf6cc930e6224c964cad4eae5aeaeae781 SHA512 609f125f8138d17b1185760b1a63f3713079f5214fb56c23012229a56d10ac1c12654466c9ad1ecd6b2aff1126d125abfb0a42bd7f669635e5024b962b0cb0af
+DIST syn-2.0.41.crate 246016 BLAKE2B 9d389f2e2a0acb4c84c309456e8ffcc88c5d4d541535ed136832d7a6054dde45a598bb68e8a6f3062ca2a96e1ceae947d54b3aec9bad65b0c51d6733aa6c80db SHA512 6bbaf69ca783025dfb81ac3612ac60bfbed31b2d87792909b35c12892dadebdaff2ddf9463105e536b671dce5870610ab90fe29471284bbd3014dca8d6993f1a
+DIST system-deps-6.1.1.crate 24171 BLAKE2B 40ec288648bda3c5370f78b7614621d3919589eedd19c86e542e4091066eaaf1d36258cf657a3e74bf2bde70dcedd14d335f4b7c89043b742b96d756df0c38e8 SHA512 14fc67e8a4447381bb5330ae6d579cafe7b1a1e62d3f528256217c18e07f6d0aa7095340b6c771eb62404b1e21771b627d77cdaadeb46cc80dc4fd6c789577d9
+DIST system-deps-6.2.0.crate 24961 BLAKE2B de59a67e59aeb793dfc7f71aacf93303a4eaa3364aec69fabb7572c07120c447c0b3581ad62aa61292d7c78cda880557e1bc11a3a76bd1a6bd84dd3128c4fa2a SHA512 10bbc503b8f55560a607d764c2575c7b854ae07ed50470d7cededc1e0451e4c7f75e06a655eba90e5470d8c2d1f1911089cd4d82da378a2d15f8e718c8f794c4
+DIST target-lexicon-0.12.11.crate 24594 BLAKE2B cf06720caecb5b5758f05c6375fa600da9260aac04017458060406a042dc578d51a2c5b6f189345d45dacea42ba01fbe46853d07f70d7b37cba17d87aa101f9a SHA512 f38701a8e9dd17b7db591b1b4c82c3b75d317e003262bb7b09b9cabd3afab5ab79c02a7dd524910b6941ada3a8f1378ea9e199b2b5938f8f01ee75bb0eae8718
+DIST target-lexicon-0.12.12.crate 25156 BLAKE2B f3803596c75f6c89438592a1176c3748fc2c0524d7d50a20056de1cd26d40c572b05bafcdf6dd702752864bea37c8b4f28f96dadc12a5b3bb1d279b25e489f85 SHA512 6147295c43ba1b7b087a3c5ab51534b2985e4e77e5e15687978cfb9d07e21c4fd9bc7191576d6cabd268d08a44dc733c4a957e59dba8b948c2055d8bb433aeca
+DIST tempfile-3.8.0.crate 31720 BLAKE2B ac975555bb4957f91e7d5733ef737bf25c62a738096457afa05079ed038de5e7144cbfd0e28bacd3eeb832de611616fb39ec07866481205c1f5c1005b2869d31 SHA512 8bc8e954bc0c6af46cf6e77d70f93583baea39fce54b111f4bba51fe5d5e5c184753ae2a2ea68a882b6ba5a157a57aeffeecc3e3cae86d78d952f3aa025fdf7f
+DIST tempfile-3.8.1.crate 32164 BLAKE2B abccff7939df8cd223a5a8ee61e5af7c35335f1cd61b3e72fed9a8565465c293e99938d57b50743141aace3cd20422ad5d3090507ed66561cb0155771fe0a5ec SHA512 b257bfb70793575d59ec4cf4b7492aff83dafb68b367a48594211f476a3b1d4800b69bddc405d8749d8b320c30cbe71be1261a60b4bbc862663b37a6c7d97a3a
+DIST tendril-0.4.3.crate 37210 BLAKE2B 0a70926644e8dc492247d49b8939169702903c2458d7b2c0fea2e6ed54166909f484e8e876eddc8ff7491642ec24a200c5d1e51412c6a7c26ee60f1f4164e98c SHA512 53f074aec6e59717fca280b1764f6c2e0a1c073336f48d012ff268a7189697d42d24a91a6a549c7d9e1fe8b0006e34c219f4dba3cc95247d3905c6f8a6a8186f
+DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062
+DIST thiserror-1.0.48.crate 18862 BLAKE2B b98d63646526e1ed0baf27a17faacee3d8be34421f6fb211d4e1909965a3a327440c0b97c4aba423f416c5a849a47a1d42623a6e64ae27d2236706dc9a30a783 SHA512 078427d19a28f59aaca27f508795cfb06c024b5a34dfc83360c3bec2b8f7abe474706a41fb68732998f154507921beb03dd033f0a6d1dcfcee03b1f2adb8a0b2
+DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46
+DIST thiserror-impl-1.0.48.crate 15096 BLAKE2B 6b5eed1102256f2c809c21201cf319cc8eed11ab1dd04e6b6bf9759c8eb32e58f0c88407e7c515ac801cea69abfa3bba0c4ee98b034459129f322f6918e9e168 SHA512 6826e242445fba8beb16325fe2e0ad0423b84aae6c1a035dca85e6e07d2b62be8879cb1a0a2b307602d330ad83530260a2480123c9ac5cde59157f74ffd665b7
+DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9
+DIST time-0.3.28.crate 117447 BLAKE2B f566dca385815e7cf77efce568207b654ab51170f37d2ad6f447125f815623f70fb5d21932d3f2b6e97e6106be607b49b10f6ea3ddfc6f5f6c443a2825f51756 SHA512 97bc516631586d089797a5a35bf7d487084f1f1ad8b59a5a5454c07c2cb4f20de666ebb67c5ff539cab3fd2dd0c2498f3a4d4ae64541c0f3b1f56abccd58dcce
+DIST time-0.3.30.crate 120289 BLAKE2B 917b71ea8362ca14f2564706919e7e62ebd3e8024d48ebcd9ac9799368a12f425b982a7739a73c025155d5dd0650ef8c9fd4642c60a9111294cad7ac2e30672c SHA512 268f0c779e2a44431932aa407f39878ff1412e287f9678574537fe7185f12faf7605c5ef433aa6d364bf77894e819ff3953f870ef7ad208b7203f1c58eccc4e5
+DIST time-core-0.1.1.crate 7197 BLAKE2B 9d0be2ef7111a8b66e5c750b2c372627ae4acfb2c68b0c6ed44b3c23bea1cdca4f65b24d2f2027b4d334667b1620019f4cb8c6d9799c1c2c537e6cfe692ab88a SHA512 a29d6619581d3fed73d6bc66a2c18805b80a3d54197feac5ad987a2c31d003bf4fef88a312d5315d2fa5c7d3e509066a65c1732be2ce280cf937bb4eff012e14
+DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52
+DIST time-macros-0.2.14.crate 23766 BLAKE2B 15ad8697849aeb0098c0841f9f73fa117175b819c49e0dacacdca1d06df69c997f4655aa3ca8a4c5c7022d84615cdae37c793304152cb9f98b4eed0f1c293e46 SHA512 df10aadebfd0215c4b4c7b1240ec4f000869dbdf484bd0d8d9f08fee59567690733007590d77ce700bf2fbf244bf5e4920f9962cc215b0f66cf4fe9892bdf380
+DIST time-macros-0.2.15.crate 23568 BLAKE2B ed16207f302e03095e726f0087f9f7c1514cd71b68a17ac804424c526349838171f3bda62d442b8429a89adb084cca1a4117828c3d66d20f2ff8272d7cb2d3a6 SHA512 d6da54996ab99a46b2b2cef83cec62eca2462490db439ba9814502f7d5ecc3018eb266b29453d601677a0ef39797da77a106d407e0e5de3b110ec1c5ae2f3c6b
+DIST tinytemplate-1.2.1.crate 26490 BLAKE2B af39d96f33f63238e455a4e38fde1d1730fd9661ae68be7b05df6ef9d2ab1a04db1332cc4ec9deb6da3a8e22b124df81b0fa8916d8491b808742bb733c8e48be SHA512 0cc080057e096f0796e72004343e1a8332c2e8a12e43f6ade150ebf632e9c29c7ad04de0b940cd57df81efdc4d07a6607da9b86a30d8383e39ac3d7be185edb9
+DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
+DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e
+DIST toml-0.7.8.crate 49671 BLAKE2B 47988292efa682f34b5295ee15524d9603d7884a0ebdc50aff93823bc9bb565569097b6aa0c622976cb23688aff73e41c0a19b0ab72ca55676cc86d7ae3db693 SHA512 84479acfa305aa682ed6ba655208c245d442d61028c422fefd6174371ec214e88912c257a3e2527e14646b655b18d55ac2d5482b0b4fd8cc2a9f66575ff1c84b
+DIST toml-0.8.2.crate 50425 BLAKE2B 3d715fb4bcb42e5ff1ad21f7553a559997c19b01ec0def1b92a6c6c19bd3c5171bebff63318a742369cec4b2df90bcc9a6824c0aa9fd1d8118abbeb360230757 SHA512 99c8e779c040ab2781d4d1626283e851ef386431732d0f84e7084cc65e892c5f9664a8834d95d558f135c77ca9c5132df953aede1357cb646579f5b3d8187570
+DIST toml_datetime-0.6.3.crate 10770 BLAKE2B fc1754eb7c3a7073cfe41e5ccba152ff09891a8de8afe38991cf2dd7b93aacf07f1075fd24d7aa643238cf31e3df1fc3162335b2c475438178b4a4d8a2055471 SHA512 cabf5dce24ed3bf4674008743180a21e86286d999cdce79f934de48b1e1fe0f16a7f3d2498bf059acdb823b51bc01986faf47139f8100ae272e6bd19095cfa9b
+DIST toml_edit-0.19.15.crate 95324 BLAKE2B f989f96d571693ff81572af6c05a6f51b673e478f22d20a6b166c45909902ac80280ea92ec5c3567327df90100a47fb7504845fc39bbcff6756af6c1a89e2221 SHA512 46d6bd2fea957392ae0ad7e687dad7743b76ee8e8ec76c80d6374ea294d3d09b6f73df0a82c821b9ee3b5268987a4136aa825034309f3cbc1947dbd1af1505dc
+DIST toml_edit-0.20.2.crate 96487 BLAKE2B 030a68413efaa9cd970f4d0c9c32068c90b5f2633a35673db76af12dbe66b26c8ac2c31fffe8d78046c677bf404358a269131788df816bc52208b78650983580 SHA512 7eacaf3c78ac8c2bd768dc7e5ff03c39dbfed60da1eb498ba537a56579d674a23a7db6dc30286a088a0f3158cc1a292783194df5415eb1620d61c61df36e18dc
+DIST typenum-1.16.0.crate 42477 BLAKE2B acc6dcd4521493c438a8a3d997ab0456fdbff3db66aee9b81ba219714d47522c3ca8fe26f8ce84edfda416ff9a22747caf3ecc9cc4bcd1e7647ac351d5aef407 SHA512 93da3ed62573acbc9d5d31257fb72ae9cfc7d59e4040c1f32d93e8fec94795e1aa20a3bf76ddc64c4b383184306bb2a66e51fd61b64dd4ce46a1bca8238b57b2
+DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
+DIST unarray-0.1.4.crate 12895 BLAKE2B 20fab4ce218941bad9ae341d24e92469b01f46523adf9d6c80cf2418b79dc529011f357e3c96a66ad96bf822358581a150f75c4d3ca67043e01814c59f1a9bd1 SHA512 373d16e9688938762c61cc9056a50badfde417f64385de1949678333cf9465cc496a357707989da83ee5e4ab041a89688fcd3ab9dfb9c6ec66446c9f5b56b630
+DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9
+DIST unicode-bidi-0.3.14.crate 56429 BLAKE2B 8670c2bb1ad98d4540d7837e8b395078b5e0eacc0dcb7ef3ecf6ddaff9d69ce136a883b99cc5bdafd3a3d657834432d0145b11a44ea1d8b776a5394e56ba04f1 SHA512 8793d415e33f1f693ba5928d8aa09ad6dc10bca6d8ad338fca527e5b142d1ea1cb84515459a9fa0a821ae68747cae570bd3872646fcf218ebc7167ad41c97379
+DIST unicode-ident-1.0.11.crate 42067 BLAKE2B 3c7cac3d2bf1cbf1cf04716a482f130123e8e6940f7a90a17bc62fca44ac0069688165538f5329b95a72f735b594cfb85e3250738393ffd1b53cb0cd95077d89 SHA512 9682bbee339fb987c9d0bb6a54406d37b28b5c3587372d406402e4341900fec97e3234cd03b5c98b90b6378fd533dc452cac3de90d3ade19c4b09657e4abf6df
+DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920
+DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c
+DIST url-2.4.1.crate 78228 BLAKE2B 6e324237af50605e9285889d967e6a66e258982c5e78ec99b2df68cbcc555574c0b0d650724ecb015e1065c737c88e3c04205973c35b0afcd63f222e91dde3f9 SHA512 ff2aed100e405f4474e17dcc01d59b63460e7a8babeb7cdcf9df6c1c65216c425e24d557f76c7097702b2befc381656107bef755ce929089b52a3901c46aa185
+DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3
+DIST utf-8-0.7.6.crate 10422 BLAKE2B 296690040895ba9da9e69d527aea415f4bd6bd3c010e67a08f9cffd2f4cd92a99f9ddde77512f9ef5a0db069ac9ac3cd6fd91aa18f0bcadf870ed212fdd76f2b SHA512 6bf0787cc297a1ac4e47389464d05ef6850602f549621687e776618bec96c1f7bacbb1ac8faaa63e5d28d975b850db8d6c784eb66e2466128f0521b91c14015b
+DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050
+DIST version-compare-0.1.1.crate 13224 BLAKE2B 4bb1e7db6a4a5b30f4ef950234fa939bd562e8d5693aad42a5dadddde7caee01b4dc42b28d8ef61a769cf573440e57c0dc321f8a8b4b3dfc0cc035507bfed886 SHA512 efc9441440f702518867e2056c0ab066cd2fa6949112479e463802610f25a4d50c4411eb5fd0ba6ca9b187e358fce8d99579188e0ed9ba0297191172ab7af408
+DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
+DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
+DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9
+DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
+DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705
+DIST wasm-bindgen-0.2.89.crate 181935 BLAKE2B 88ff35daace267087750053eacdcf81f1d6cfd7653e1b21cd8436799688615a2840ab733e0196cde747dd4a49ffc3d4efc7c64f48e4e75bd9a240a689f7c037c SHA512 e9e3b95547423ac7acb0f0b327b9fde6c8ef3160296509332fe5d9cbf9eb6a4ed6ad30b29552cdcd113a94e95fab4e3ecc1e7a03811514f84fac569972febf5b
+DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94
+DIST wasm-bindgen-backend-0.2.89.crate 28205 BLAKE2B d280d04a6e8df72c0eb0d99b134c017be8c7d378578e23505ebb184510e6eab746fc06ca25333a62c24405565531b6e1c79a5010ae31aebb280c7820d5fe41fd SHA512 9ff63a2401e741013753fbbbc86990948e0e8820ffdb4b16167d2c72f12626306e5d077fef37d8d956acc73eefd699dc7f03250926a5609639b127d4e46daf1b
+DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6
+DIST wasm-bindgen-macro-0.2.89.crate 13906 BLAKE2B 93e4b784eaf75a070f471d7d60b802d42b4bdbfd0c7ec21ecf1dbda554ed2bed62d99c2b28ba1527ad8f6f3e5b6083d132f36f9c36efcfa9f6a9cfab73b1ca0d SHA512 060e0f300bdc42557798f4d7348165ac9dde60e4f7760acca5da6ec02bdf8bac22e2e5b80f733aae625a0c699dbe831e0afc6e66b2af8fe445aa6513c5180381
+DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33
+DIST wasm-bindgen-macro-support-0.2.89.crate 20008 BLAKE2B 867ed0049f076d37e8c0587928d67209d69071a6beb80afaba35b947c16958d2c61ef1c762d1706de6744f23ed811815cd94f7059b3ad823aa99f30929cc3a33 SHA512 4ff50819d989733b51e6614b8b14992dc7e53e4c283b89c4e21dd50659cdc49a8cec379df7630ee26e04be62f4ff0bc5eeee9153dbeaec213e8217964a149e76
+DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008
+DIST wasm-bindgen-shared-0.2.89.crate 7265 BLAKE2B 78668ee6af47357983788161c2a50562ff37a8d584e6be61142c5609360aa712571c3fac6b3395215c5d132edb864e0ce8e7b648fd7225433a81f2ae3e6a586b SHA512 02b2252b5b2e6bc8723404ee8cc750684f488b3e80ab60210d97fd7b343a67db2ef8d62aa792a5f02bb351467f4ffbc887512a215007f6fd089b29f8d3a23be3
+DIST web-sys-0.3.64.crate 725584 BLAKE2B f650eecc22ca53b75fff06c4117439d8fe9efa486701cb16a0daf76865cd017a9e25ed8c7ae1fc65fa2dd94a12c14bc2e6f9e837b70b47b4ca468bef65a29f82 SHA512 b02b0bc3f1354842b364d2f062ea4f5025edb6e615046750b56a6e2fcacef7e0b46a190eb45e14e590cf297e3ec1a813a81612ac5acfc12d744fe16c5ce041a4
+DIST web-sys-0.3.66.crate 733024 BLAKE2B 5f9b318d3d6f0395579d7483c2a72325203680a030532c084a63899d8467288d82bbd33eacf66595513bece2d2d94ca7e3450649a62a06585e1012fadbfebd32 SHA512 7fad95dad96e1b4f0d187f116889aa142747b2f44e8fb88ed8579d96cd5491997a7c13dca9745de4536ba7363a51b88615ce57aec25963bcbc8ce9a2e8b4c658
+DIST weezl-0.1.7.crate 42166 BLAKE2B a3a2a48dbb444b2bd910e1470507209f3d0acc75d88e22bcb42b5ca7ab8edbc41fc9e49cb6a2e18cf5e470d7bd26f4e4d9e30ea01c3eb543f171289a86927fdf SHA512 3fd8cb01dde494371df57001c97be90418b642ba88b0945cd98f973a4498743b83d383bcdfc8884db1da75271aeef4ce3b418e425f23690f12a5cc645c418e90
+DIST wide-0.7.11.crate 78683 BLAKE2B 4b2bec958267bdebf191b7e4abad021197fb130d64d37656ba192346c5a88f63c0b9d7a938e7c84811aade3eed82166cb5ae9ba4127b6ab4dbbadda2f05e7e92 SHA512 4370dbe1a6e76b4abd8f49f016bb624a6d28507553f5bcb744bdda2d4af371c18bf7b9e4d40b48ccccbfd8f874abb86c6201ff19d50cba2707f46e00f702f8b6
+DIST wide-0.7.13.crate 80191 BLAKE2B eeaa799d907f1c60f0485b9efd187939b5bb4b3d1cf17a6bd892b9415230226ceb213766f3a8046a4a4bd388946c6db9ad05dbcf26fda38cb81cf1f2e0a3383a SHA512 d3b15bb5973b5242554f0fedc83087a211ee49d705a708930fa9a87ced15be0aa542fb823ab1e84c9879326965140753f6929c29e96f7f67cf7e6e911c27a526
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
+DIST winapi-util-0.1.6.crate 12234 BLAKE2B b8db8ec9d7ada5532a22a2d070320174c32ece1f48890e9b028708e194fe72a04287b11910dc2ddc7f9c9674a9d8d39449b3e100725e1f59e59e3047a7e3650b SHA512 b1c949f9bcd34c1949a9d3a7bde6ce62fcf3d2cb66df60af41fe67a9d1acb24e571cdd5ac721be9f1ee4b3af5ef5149b5724ad6e02b558e124ef2a4412d12db9
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c
+DIST windows-core-0.51.1.crate 42364 BLAKE2B 0227e8cc033f40b644879ce4a86f17b9552076378eb6cc6c8cedaa15602ef3ce0deb1ca48c6a7b4276af2bc2e0434e76193649051d7a2f78695f60400d00ccff SHA512 90615ed84f11fdfe0725a4a8b112e45f93ae6cb7e65c16636f85217369fd8b708553ae5bd28aff66e18b180ffa3c0f6820a94022fc5eb202b4f8358f8926fde6
+DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
+DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03
+DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709
+DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e
+DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996
+DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f
+DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff
+DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1
+DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a
+DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e
+DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e
+DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671
+DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74
+DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7
+DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa
+DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0
+DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0
+DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7
+DIST winnow-0.5.15.crate 145621 BLAKE2B 039262561227641c2d8b996ebb59c79718de3f2b7dd8e369fc3e341f3458b1e0213f35c575d615e87d5f89aad639c7a258e4efb2c10f58c2cd6e120482702cc2 SHA512 42dce18906f41e45e6dd75ba01af6a94501317dee8b45f4c7340f7c9c94f8935afe2536cd9ad5a91eef6f3a6135cab0a451d67a35b5a0fd69130a90e6aa47603
+DIST winnow-0.5.28.crate 150758 BLAKE2B 10ea6c613e474b48da3af7fd2b6459e6ac1bd75fc2295c2a174f87988e74c1b9019c12d55c4f3d79bb37fa08f8613c98233d2f4f9b72a2d5783b46da0c14153b SHA512 763d6000d2d4a215c0deab8a7e6a50b981222cd73b51a5e5167cc07e24ec93afd667e1ae1b884f50daf6df1ae71cbbfadd114fefa7e41a7ee43971b9714e3042
+DIST xml5ever-0.17.0.crate 41208 BLAKE2B 42be2b72566bf44d3cf70b365aee45a6c8034c20e4e18c5f71ed51be3a02dc63ccd2545bd41cdb9c019ea34e8419dbb93888ee41bd9b38f2a41c7bf63e27c323 SHA512 0c67244411811a3e82fe58d341b371b938ce6e45ec1af2bd8615c0f0a9628fa662ec0eb130de2ae199d32c7778f0c2d2b80221812dc33831b93333dcde5a682e
+DIST yeslogic-fontconfig-sys-4.0.1.crate 6694 BLAKE2B a78e56725245af764e31dbfc7e337dae5ab50e0af8d23a6f2ab5f5744b15208567bbaa742876d76fede07f7313fcce8e9c0c06aa9936cee16b902d8e7a641395 SHA512 b1626e259d8535c0189535eb240b92c798330c01866f33231ca9baba07b3da792cc5390221c826c67df9c6e6c0ae64568f1dbd70b9841750e233dab2bd27f506
diff --git a/gnome-base/librsvg/librsvg-2.40.21.ebuild b/gnome-base/librsvg/librsvg-2.40.21.ebuild
index 8c57841ec7c8..3bc59a2c526f 100644
--- a/gnome-base/librsvg/librsvg-2.40.21.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.21.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
GNOME2_EAUTORECONF="yes"
-VALA_USE_DEPEND="vapigen"
-inherit autotools gnome2 multilib-minimal vala
+inherit gnome2 multilib-minimal vala
DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha arm hppa ~ia64 ~mips ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha arm hppa ~ia64 ~loong ~mips ppc ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE="+introspection tools +vala"
REQUIRED_USE="vala? ( introspection )"
@@ -32,13 +31,18 @@ BDEPEND="
dev-libs/gobject-introspection-common
dev-libs/vala-common
dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.13
+ >=dev-build/gtk-doc-am-1.13
virtual/pkgconfig
x11-libs/gdk-pixbuf
vala? ( $(vala_depend) )
"
# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
+QA_FLAGS_IGNORED="
+ usr/bin/rsvg-convert
+ usr/lib.*/librsvg.*
+"
+
RESTRICT="test" # Lots of issues due to freetype changes and more; ever since newer tests got backported into 2.40.19
PATCHES=(
diff --git a/gnome-base/librsvg/librsvg-2.50.7.ebuild b/gnome-base/librsvg/librsvg-2.50.7.ebuild
deleted file mode 100644
index c498732ad533..000000000000
--- a/gnome-base/librsvg/librsvg-2.50.7.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION=0.46
-
-inherit gnome2 multilib-minimal rust-toolchain vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
- >=x11-libs/cairo-1.16.0[glib,${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
- >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
- >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=x11-libs/pango-1.44.0[${MULTILIB_USEDEP}]
-
- introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-"
-DEPEND="${RDEPEND}
- >=virtual/rust-1.40[${MULTILIB_USEDEP}]
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-RESTRICT="test" # Lots of issues on 32bit builds, 64bit build seems to get into an infinite compilation sometimes, etc.
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=(
- --disable-static
- --disable-debug
- --disable-tools # the tools/ subdirectory is useful only for librsvg devs
- $(multilib_native_use_enable introspection)
- $(multilib_native_use_enable vala)
- --enable-pixbuf-loader
- )
-
- if ! multilib_is_native_abi; then
- myconf+=(
- # Set the rust target, which can differ from CHOST
- RUST_TARGET="$(rust_abi)"
- # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
- # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
- cross_compiling=yes
- )
- fi
-
- ECONF_SOURCE=${S} \
- gnome2_src_configure "${myconf[@]}"
-
- if multilib_is_native_abi; then
- ln -s "${S}"/doc/html doc/html || die
- fi
-}
-
-multilib_src_compile() {
- # causes segfault if set, see bug #411765
- unset __GL_NO_DSO_FINALIZER
- gnome2_src_compile
-}
-
-multilib_src_install() {
- gnome2_src_install
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
- multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/librsvg-2.57.0.ebuild b/gnome-base/librsvg/librsvg-2.57.0.ebuild
new file mode 100644
index 000000000000..a82776c7a99c
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.57.0.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+CRATES="
+ adler@1.0.2
+ aho-corasick@1.0.5
+ android-tzdata@0.1.1
+ android_system_properties@0.1.5
+ anes@0.1.6
+ anstream@0.5.0
+ anstyle-parse@0.2.1
+ anstyle-query@1.0.0
+ anstyle-wincon@2.1.0
+ anstyle@1.0.3
+ anyhow@1.0.75
+ approx@0.5.1
+ assert_cmd@2.0.12
+ autocfg@1.1.0
+ bit-set@0.5.3
+ bit-vec@0.6.3
+ bitflags@1.3.2
+ bitflags@2.4.0
+ block@0.1.6
+ bstr@1.6.2
+ bumpalo@3.13.0
+ bytemuck@1.14.0
+ byteorder@1.4.3
+ cairo-rs@0.18.0
+ cairo-sys-rs@0.18.0
+ cast@0.3.0
+ cc@1.0.83
+ cfg-expr@0.15.5
+ cfg-if@1.0.0
+ chrono@0.4.30
+ ciborium-io@0.2.1
+ ciborium-ll@0.2.1
+ ciborium@0.2.1
+ clap@4.4.2
+ clap_builder@4.4.2
+ clap_complete@4.4.1
+ clap_derive@4.4.2
+ clap_lex@0.5.1
+ colorchoice@1.0.0
+ const-cstr@0.3.0
+ core-foundation-sys@0.8.4
+ crc32fast@1.3.2
+ criterion-plot@0.5.0
+ criterion@0.5.1
+ crossbeam-channel@0.5.8
+ crossbeam-deque@0.8.3
+ crossbeam-epoch@0.9.15
+ crossbeam-utils@0.8.16
+ cssparser-macros@0.6.1
+ cssparser@0.31.2
+ cstr@0.2.11
+ data-url@0.3.0
+ deranged@0.3.8
+ derive_more@0.99.17
+ difflib@0.4.0
+ dlib@0.5.2
+ doc-comment@0.3.3
+ dtoa-short@0.3.4
+ dtoa@1.0.9
+ either@1.9.0
+ encoding_rs@0.8.33
+ equivalent@1.0.1
+ errno-dragonfly@0.1.2
+ errno@0.3.3
+ fastrand@2.0.0
+ fdeflate@0.3.0
+ flate2@1.0.27
+ float-cmp@0.9.0
+ fnv@1.0.7
+ form_urlencoded@1.2.0
+ futf@0.1.5
+ futures-channel@0.3.28
+ futures-core@0.3.28
+ futures-executor@0.3.28
+ futures-io@0.3.28
+ futures-macro@0.3.28
+ futures-task@0.3.28
+ futures-util@0.3.28
+ fxhash@0.2.1
+ gdk-pixbuf-sys@0.18.0
+ gdk-pixbuf@0.18.0
+ getrandom@0.2.10
+ gio-sys@0.18.1
+ gio@0.18.1
+ glib-macros@0.18.0
+ glib-sys@0.18.1
+ glib@0.18.1
+ gobject-sys@0.18.0
+ half@1.8.2
+ hashbrown@0.14.0
+ heck@0.4.1
+ hermit-abi@0.3.2
+ iana-time-zone-haiku@0.1.2
+ iana-time-zone@0.1.57
+ idna@0.4.0
+ indexmap@2.0.0
+ is-terminal@0.4.9
+ itertools@0.10.5
+ itertools@0.11.0
+ itoa@1.0.9
+ js-sys@0.3.64
+ language-tags@0.3.2
+ lazy_static@1.4.0
+ libc@0.2.147
+ libloading@0.8.0
+ libm@0.2.7
+ linked-hash-map@0.5.6
+ linux-raw-sys@0.4.7
+ locale_config@0.3.0
+ lock_api@0.4.10
+ log@0.4.20
+ lopdf@0.31.0
+ mac@0.1.1
+ malloc_buf@0.0.6
+ markup5ever@0.11.0
+ matches@0.1.10
+ matrixmultiply@0.3.7
+ md5@0.7.0
+ memchr@2.6.3
+ memoffset@0.9.0
+ minimal-lexical@0.2.1
+ miniz_oxide@0.7.1
+ nalgebra-macros@0.2.1
+ nalgebra@0.32.3
+ new_debug_unreachable@1.0.4
+ nom@7.1.3
+ normalize-line-endings@0.3.0
+ num-complex@0.4.4
+ num-integer@0.1.45
+ num-rational@0.4.1
+ num-traits@0.2.16
+ num_cpus@1.16.0
+ objc-foundation@0.1.1
+ objc@0.2.7
+ objc_id@0.1.1
+ once_cell@1.18.0
+ oorandom@11.1.3
+ pango-sys@0.18.0
+ pango@0.18.0
+ pangocairo-sys@0.18.0
+ pangocairo@0.18.0
+ parking_lot@0.12.1
+ parking_lot_core@0.9.8
+ paste@1.0.14
+ percent-encoding@2.3.0
+ phf@0.10.1
+ phf@0.11.2
+ phf_codegen@0.10.0
+ phf_generator@0.10.0
+ phf_generator@0.11.2
+ phf_macros@0.11.2
+ phf_shared@0.10.0
+ phf_shared@0.11.2
+ pin-project-lite@0.2.13
+ pin-utils@0.1.0
+ pkg-config@0.3.27
+ plotters-backend@0.3.5
+ plotters-svg@0.3.5
+ plotters@0.3.5
+ png@0.17.10
+ ppv-lite86@0.2.17
+ precomputed-hash@0.1.1
+ predicates-core@1.0.6
+ predicates-tree@1.0.9
+ predicates@3.0.3
+ proc-macro-crate@1.3.1
+ proc-macro-error-attr@1.0.4
+ proc-macro-error@1.0.4
+ proc-macro2@1.0.66
+ proptest@1.2.0
+ quick-error@1.2.3
+ quick-error@2.0.1
+ quote@1.0.33
+ rand@0.8.5
+ rand_chacha@0.3.1
+ rand_core@0.6.4
+ rand_xorshift@0.3.0
+ rawpointer@0.2.1
+ rayon-core@1.11.0
+ rayon@1.7.0
+ rctree@0.5.0
+ redox_syscall@0.3.5
+ regex-automata@0.3.8
+ regex-syntax@0.6.29
+ regex-syntax@0.7.5
+ regex@1.9.5
+ rgb@0.8.36
+ rustix@0.38.13
+ rusty-fork@0.3.0
+ ryu@1.0.15
+ safe_arch@0.7.1
+ same-file@1.0.6
+ scopeguard@1.2.0
+ selectors@0.25.0
+ serde@1.0.188
+ serde_derive@1.0.188
+ serde_json@1.0.106
+ serde_spanned@0.6.3
+ servo_arc@0.3.0
+ simba@0.8.1
+ simd-adler32@0.3.7
+ siphasher@0.3.11
+ slab@0.4.9
+ smallvec@1.11.0
+ stable_deref_trait@1.2.0
+ string_cache@0.8.7
+ string_cache_codegen@0.5.2
+ strsim@0.10.0
+ syn@1.0.109
+ syn@2.0.32
+ system-deps@6.1.1
+ target-lexicon@0.12.11
+ tempfile@3.8.0
+ tendril@0.4.3
+ termtree@0.4.1
+ thiserror-impl@1.0.48
+ thiserror@1.0.48
+ time-core@0.1.1
+ time-macros@0.2.14
+ time@0.3.28
+ tinytemplate@1.2.1
+ tinyvec@1.6.0
+ tinyvec_macros@0.1.1
+ toml@0.7.8
+ toml_datetime@0.6.3
+ toml_edit@0.19.15
+ typenum@1.16.0
+ unarray@0.1.4
+ unicode-bidi@0.3.13
+ unicode-ident@1.0.11
+ unicode-normalization@0.1.22
+ url@2.4.1
+ utf-8@0.7.6
+ utf8parse@0.2.1
+ version-compare@0.1.1
+ version_check@0.9.4
+ wait-timeout@0.2.0
+ walkdir@2.4.0
+ wasi@0.11.0+wasi-snapshot-preview1
+ wasm-bindgen-backend@0.2.87
+ wasm-bindgen-macro-support@0.2.87
+ wasm-bindgen-macro@0.2.87
+ wasm-bindgen-shared@0.2.87
+ wasm-bindgen@0.2.87
+ web-sys@0.3.64
+ weezl@0.1.7
+ wide@0.7.11
+ winapi-i686-pc-windows-gnu@0.4.0
+ winapi-util@0.1.5
+ winapi-x86_64-pc-windows-gnu@0.4.0
+ winapi@0.3.9
+ windows-sys@0.48.0
+ windows-targets@0.48.5
+ windows@0.48.0
+ windows_aarch64_gnullvm@0.48.5
+ windows_aarch64_msvc@0.48.5
+ windows_i686_gnu@0.48.5
+ windows_i686_msvc@0.48.5
+ windows_x86_64_gnu@0.48.5
+ windows_x86_64_gnullvm@0.48.5
+ windows_x86_64_msvc@0.48.5
+ winnow@0.5.15
+ xml5ever@0.17.0
+ yeslogic-fontconfig-sys@4.0.1
+"
+
+inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
+
+LICENSE="LGPL-2.1+"
+# Dependent crate licenses
+LICENSE+="
+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0
+ Unicode-DFS-2016
+"
+
+SLOT="2"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
+
+IUSE="gtk-doc +introspection +vala"
+REQUIRED_USE="
+ gtk-doc? ( introspection )
+ vala? ( introspection )
+"
+
+RDEPEND="
+ >=x11-libs/cairo-1.17.0[glib,svg(+),${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.48.11[${MULTILIB_USEDEP}]
+
+ introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=virtual/rust-1.70.0[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+ gtk-doc? ( dev-util/gi-docgen )
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+
+ dev-libs/gobject-introspection-common
+ dev-libs/vala-common
+"
+# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
+
+QA_FLAGS_IGNORED="
+ usr/bin/rsvg-convert
+ usr/lib.*/librsvg.*
+"
+
+src_prepare() {
+ use vala && vala_setup
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-static
+ --disable-debug
+ $(multilib_native_use_enable gtk-doc)
+ $(multilib_native_use_enable introspection)
+ $(multilib_native_use_enable vala)
+ --enable-pixbuf-loader
+ )
+
+ if ! multilib_is_native_abi; then
+ myconf+=(
+ # Set the rust target, which can differ from CHOST
+ RUST_TARGET="$(rust_abi)"
+ # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+ # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+ cross_compiling=yes
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_compile() {
+ gnome2_src_compile
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete || die
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+ mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+ fi
+}
+
+pkg_postinst() {
+ multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/librsvg/librsvg-2.57.2.ebuild b/gnome-base/librsvg/librsvg-2.57.2.ebuild
new file mode 100644
index 000000000000..11f104971fd2
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.57.2.ebuild
@@ -0,0 +1,389 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+CRATES="
+ adler@1.0.2
+ aho-corasick@1.1.2
+ android-tzdata@0.1.1
+ android_system_properties@0.1.5
+ anes@0.1.6
+ anstream@0.6.5
+ anstyle-parse@0.2.3
+ anstyle-query@1.0.2
+ anstyle-wincon@3.0.2
+ anstyle@1.0.4
+ anyhow@1.0.75
+ approx@0.5.1
+ assert_cmd@2.0.12
+ autocfg@1.1.0
+ bit-set@0.5.3
+ bit-vec@0.6.3
+ bitflags@1.3.2
+ bitflags@2.4.1
+ block@0.1.6
+ bstr@1.8.0
+ bumpalo@3.14.0
+ bytemuck@1.14.0
+ byteorder@1.5.0
+ cairo-rs@0.18.3
+ cairo-sys-rs@0.18.2
+ cast@0.3.0
+ cc@1.0.83
+ cfg-expr@0.15.5
+ cfg-if@1.0.0
+ chrono@0.4.31
+ ciborium-io@0.2.1
+ ciborium-ll@0.2.1
+ ciborium@0.2.1
+ clap@4.4.11
+ clap_builder@4.4.11
+ clap_complete@4.4.4
+ clap_derive@4.4.7
+ clap_lex@0.6.0
+ colorchoice@1.0.0
+ const-cstr@0.3.0
+ core-foundation-sys@0.8.6
+ crc32fast@1.3.2
+ criterion-plot@0.5.0
+ criterion@0.5.1
+ crossbeam-deque@0.8.4
+ crossbeam-epoch@0.9.16
+ crossbeam-utils@0.8.17
+ cssparser-macros@0.6.1
+ cssparser@0.31.2
+ cstr@0.2.11
+ data-url@0.3.1
+ deranged@0.3.10
+ derive_more@0.99.17
+ difflib@0.4.0
+ dlib@0.5.2
+ doc-comment@0.3.3
+ dtoa-short@0.3.4
+ dtoa@1.0.9
+ either@1.9.0
+ encoding_rs@0.8.33
+ equivalent@1.0.1
+ errno@0.3.8
+ fastrand@2.0.1
+ fdeflate@0.3.1
+ flate2@1.0.28
+ float-cmp@0.9.0
+ fnv@1.0.7
+ form_urlencoded@1.2.1
+ futf@0.1.5
+ futures-channel@0.3.29
+ futures-core@0.3.29
+ futures-executor@0.3.29
+ futures-io@0.3.29
+ futures-macro@0.3.29
+ futures-task@0.3.29
+ futures-util@0.3.29
+ fxhash@0.2.1
+ gdk-pixbuf-sys@0.18.0
+ gdk-pixbuf@0.18.3
+ getrandom@0.2.11
+ gio-sys@0.18.1
+ gio@0.18.4
+ glib-macros@0.18.3
+ glib-sys@0.18.1
+ glib@0.18.4
+ gobject-sys@0.18.0
+ half@1.8.2
+ hashbrown@0.14.3
+ heck@0.4.1
+ hermit-abi@0.3.3
+ iana-time-zone-haiku@0.1.2
+ iana-time-zone@0.1.58
+ idna@0.5.0
+ indexmap@2.1.0
+ is-terminal@0.4.9
+ itertools@0.10.5
+ itertools@0.11.0
+ itoa@1.0.10
+ js-sys@0.3.66
+ language-tags@0.3.2
+ lazy_static@1.4.0
+ libc@0.2.151
+ libloading@0.8.1
+ libm@0.2.8
+ linked-hash-map@0.5.6
+ linux-raw-sys@0.4.12
+ locale_config@0.3.0
+ lock_api@0.4.11
+ log@0.4.20
+ lopdf@0.31.0
+ mac@0.1.1
+ malloc_buf@0.0.6
+ markup5ever@0.11.0
+ matches@0.1.10
+ matrixmultiply@0.3.8
+ md5@0.7.0
+ memchr@2.6.4
+ memoffset@0.9.0
+ minimal-lexical@0.2.1
+ miniz_oxide@0.7.1
+ nalgebra-macros@0.2.1
+ nalgebra@0.32.3
+ new_debug_unreachable@1.0.4
+ nom@7.1.3
+ normalize-line-endings@0.3.0
+ num-complex@0.4.4
+ num-integer@0.1.45
+ num-rational@0.4.1
+ num-traits@0.2.17
+ objc-foundation@0.1.1
+ objc@0.2.7
+ objc_id@0.1.1
+ once_cell@1.19.0
+ oorandom@11.1.3
+ pango-sys@0.18.0
+ pango@0.18.3
+ pangocairo-sys@0.18.0
+ pangocairo@0.18.0
+ parking_lot@0.12.1
+ parking_lot_core@0.9.9
+ paste@1.0.14
+ percent-encoding@2.3.1
+ phf@0.10.1
+ phf@0.11.2
+ phf_codegen@0.10.0
+ phf_generator@0.10.0
+ phf_generator@0.11.2
+ phf_macros@0.11.2
+ phf_shared@0.10.0
+ phf_shared@0.11.2
+ pin-project-lite@0.2.13
+ pin-utils@0.1.0
+ pkg-config@0.3.27
+ plotters-backend@0.3.5
+ plotters-svg@0.3.5
+ plotters@0.3.5
+ png@0.17.10
+ powerfmt@0.2.0
+ ppv-lite86@0.2.17
+ precomputed-hash@0.1.1
+ predicates-core@1.0.6
+ predicates-tree@1.0.9
+ predicates@3.0.4
+ proc-macro-crate@2.0.1
+ proc-macro-error-attr@1.0.4
+ proc-macro-error@1.0.4
+ proc-macro2@1.0.70
+ proptest@1.4.0
+ quick-error@1.2.3
+ quick-error@2.0.1
+ quote@1.0.33
+ rand@0.8.5
+ rand_chacha@0.3.1
+ rand_core@0.6.4
+ rand_xorshift@0.3.0
+ rawpointer@0.2.1
+ rayon-core@1.12.0
+ rayon@1.8.0
+ rctree@0.5.0
+ redox_syscall@0.4.1
+ regex-automata@0.4.3
+ regex-syntax@0.8.2
+ regex@1.10.2
+ rgb@0.8.37
+ rustix@0.38.28
+ rusty-fork@0.3.0
+ ryu@1.0.16
+ safe_arch@0.7.1
+ same-file@1.0.6
+ scopeguard@1.2.0
+ selectors@0.25.0
+ serde@1.0.193
+ serde_derive@1.0.193
+ serde_json@1.0.108
+ serde_spanned@0.6.4
+ servo_arc@0.3.0
+ simba@0.8.1
+ simd-adler32@0.3.7
+ siphasher@0.3.11
+ slab@0.4.9
+ smallvec@1.11.2
+ stable_deref_trait@1.2.0
+ string_cache@0.8.7
+ string_cache_codegen@0.5.2
+ strsim@0.10.0
+ syn@1.0.109
+ syn@2.0.41
+ system-deps@6.2.0
+ target-lexicon@0.12.12
+ tempfile@3.8.1
+ tendril@0.4.3
+ termtree@0.4.1
+ thiserror-impl@1.0.50
+ thiserror@1.0.50
+ time-core@0.1.2
+ time-macros@0.2.15
+ time@0.3.30
+ tinytemplate@1.2.1
+ tinyvec@1.6.0
+ tinyvec_macros@0.1.1
+ toml@0.8.2
+ toml_datetime@0.6.3
+ toml_edit@0.20.2
+ typenum@1.17.0
+ unarray@0.1.4
+ unicode-bidi@0.3.14
+ unicode-ident@1.0.12
+ unicode-normalization@0.1.22
+ url@2.5.0
+ utf-8@0.7.6
+ utf8parse@0.2.1
+ version-compare@0.1.1
+ version_check@0.9.4
+ wait-timeout@0.2.0
+ walkdir@2.4.0
+ wasi@0.11.0+wasi-snapshot-preview1
+ wasm-bindgen-backend@0.2.89
+ wasm-bindgen-macro-support@0.2.89
+ wasm-bindgen-macro@0.2.89
+ wasm-bindgen-shared@0.2.89
+ wasm-bindgen@0.2.89
+ web-sys@0.3.66
+ weezl@0.1.7
+ wide@0.7.13
+ winapi-i686-pc-windows-gnu@0.4.0
+ winapi-util@0.1.6
+ winapi-x86_64-pc-windows-gnu@0.4.0
+ winapi@0.3.9
+ windows-core@0.51.1
+ windows-sys@0.48.0
+ windows-sys@0.52.0
+ windows-targets@0.48.5
+ windows-targets@0.52.0
+ windows_aarch64_gnullvm@0.48.5
+ windows_aarch64_gnullvm@0.52.0
+ windows_aarch64_msvc@0.48.5
+ windows_aarch64_msvc@0.52.0
+ windows_i686_gnu@0.48.5
+ windows_i686_gnu@0.52.0
+ windows_i686_msvc@0.48.5
+ windows_i686_msvc@0.52.0
+ windows_x86_64_gnu@0.48.5
+ windows_x86_64_gnu@0.52.0
+ windows_x86_64_gnullvm@0.48.5
+ windows_x86_64_gnullvm@0.52.0
+ windows_x86_64_msvc@0.48.5
+ windows_x86_64_msvc@0.52.0
+ winnow@0.5.28
+ xml5ever@0.17.0
+ yeslogic-fontconfig-sys@4.0.1
+"
+
+inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
+
+LICENSE="LGPL-2.1+"
+# Dependent crate licenses
+LICENSE+="
+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0
+ Unicode-DFS-2016
+"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="gtk-doc +introspection +vala"
+REQUIRED_USE="
+ gtk-doc? ( introspection )
+ vala? ( introspection )
+"
+
+RDEPEND="
+ >=x11-libs/cairo-1.17.0[glib,svg(+),${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.50.0[${MULTILIB_USEDEP}]
+
+ introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=virtual/rust-1.70.0[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+ gtk-doc? ( dev-util/gi-docgen )
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+
+ dev-libs/gobject-introspection-common
+ dev-libs/vala-common
+"
+# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
+
+QA_FLAGS_IGNORED="
+ usr/bin/rsvg-convert
+ usr/lib.*/librsvg.*
+"
+
+src_prepare() {
+ use vala && vala_setup
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-static
+ --disable-debug
+ $(multilib_native_use_enable gtk-doc)
+ $(multilib_native_use_enable introspection)
+ $(multilib_native_use_enable vala)
+ --enable-pixbuf-loader
+ )
+
+ if ! multilib_is_native_abi; then
+ myconf+=(
+ # Set the rust target, which can differ from CHOST
+ RUST_TARGET="$(rust_abi)"
+ # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+ # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+ cross_compiling=yes
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_compile() {
+ gnome2_src_compile
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete || die
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+ mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+ fi
+}
+
+pkg_postinst() {
+ multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/librsvg/librsvg-2.57.3.ebuild b/gnome-base/librsvg/librsvg-2.57.3.ebuild
new file mode 100644
index 000000000000..42083e7d1127
--- /dev/null
+++ b/gnome-base/librsvg/librsvg-2.57.3.ebuild
@@ -0,0 +1,389 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{10..12} )
+
+CRATES="
+ adler@1.0.2
+ aho-corasick@1.1.2
+ android-tzdata@0.1.1
+ android_system_properties@0.1.5
+ anes@0.1.6
+ anstream@0.6.5
+ anstyle-parse@0.2.3
+ anstyle-query@1.0.2
+ anstyle-wincon@3.0.2
+ anstyle@1.0.4
+ anyhow@1.0.75
+ approx@0.5.1
+ assert_cmd@2.0.12
+ autocfg@1.1.0
+ bit-set@0.5.3
+ bit-vec@0.6.3
+ bitflags@1.3.2
+ bitflags@2.4.1
+ block@0.1.6
+ bstr@1.8.0
+ bumpalo@3.14.0
+ bytemuck@1.14.0
+ byteorder@1.5.0
+ cairo-rs@0.18.3
+ cairo-sys-rs@0.18.2
+ cast@0.3.0
+ cc@1.0.83
+ cfg-expr@0.15.5
+ cfg-if@1.0.0
+ chrono@0.4.31
+ ciborium-io@0.2.1
+ ciborium-ll@0.2.1
+ ciborium@0.2.1
+ clap@4.4.11
+ clap_builder@4.4.11
+ clap_complete@4.4.4
+ clap_derive@4.4.7
+ clap_lex@0.6.0
+ colorchoice@1.0.0
+ const-cstr@0.3.0
+ core-foundation-sys@0.8.6
+ crc32fast@1.3.2
+ criterion-plot@0.5.0
+ criterion@0.5.1
+ crossbeam-deque@0.8.4
+ crossbeam-epoch@0.9.16
+ crossbeam-utils@0.8.17
+ cssparser-macros@0.6.1
+ cssparser@0.31.2
+ cstr@0.2.11
+ data-url@0.3.1
+ deranged@0.3.10
+ derive_more@0.99.17
+ difflib@0.4.0
+ dlib@0.5.2
+ doc-comment@0.3.3
+ dtoa-short@0.3.4
+ dtoa@1.0.9
+ either@1.9.0
+ encoding_rs@0.8.33
+ equivalent@1.0.1
+ errno@0.3.8
+ fastrand@2.0.1
+ fdeflate@0.3.1
+ flate2@1.0.28
+ float-cmp@0.9.0
+ fnv@1.0.7
+ form_urlencoded@1.2.1
+ futf@0.1.5
+ futures-channel@0.3.29
+ futures-core@0.3.29
+ futures-executor@0.3.29
+ futures-io@0.3.29
+ futures-macro@0.3.29
+ futures-task@0.3.29
+ futures-util@0.3.29
+ fxhash@0.2.1
+ gdk-pixbuf-sys@0.18.0
+ gdk-pixbuf@0.18.3
+ getrandom@0.2.11
+ gio-sys@0.18.1
+ gio@0.18.4
+ glib-macros@0.18.3
+ glib-sys@0.18.1
+ glib@0.18.4
+ gobject-sys@0.18.0
+ half@1.8.2
+ hashbrown@0.14.3
+ heck@0.4.1
+ hermit-abi@0.3.3
+ iana-time-zone-haiku@0.1.2
+ iana-time-zone@0.1.58
+ idna@0.5.0
+ indexmap@2.1.0
+ is-terminal@0.4.9
+ itertools@0.10.5
+ itertools@0.11.0
+ itoa@1.0.10
+ js-sys@0.3.66
+ language-tags@0.3.2
+ lazy_static@1.4.0
+ libc@0.2.151
+ libloading@0.8.1
+ libm@0.2.8
+ linked-hash-map@0.5.6
+ linux-raw-sys@0.4.12
+ locale_config@0.3.0
+ lock_api@0.4.11
+ log@0.4.20
+ lopdf@0.31.0
+ mac@0.1.1
+ malloc_buf@0.0.6
+ markup5ever@0.11.0
+ matches@0.1.10
+ matrixmultiply@0.3.8
+ md5@0.7.0
+ memchr@2.6.4
+ memoffset@0.9.0
+ minimal-lexical@0.2.1
+ miniz_oxide@0.7.1
+ nalgebra-macros@0.2.1
+ nalgebra@0.32.3
+ new_debug_unreachable@1.0.4
+ nom@7.1.3
+ normalize-line-endings@0.3.0
+ num-complex@0.4.4
+ num-integer@0.1.45
+ num-rational@0.4.1
+ num-traits@0.2.17
+ objc-foundation@0.1.1
+ objc@0.2.7
+ objc_id@0.1.1
+ once_cell@1.19.0
+ oorandom@11.1.3
+ pango-sys@0.18.0
+ pango@0.18.3
+ pangocairo-sys@0.18.0
+ pangocairo@0.18.0
+ parking_lot@0.12.1
+ parking_lot_core@0.9.9
+ paste@1.0.14
+ percent-encoding@2.3.1
+ phf@0.10.1
+ phf@0.11.2
+ phf_codegen@0.10.0
+ phf_generator@0.10.0
+ phf_generator@0.11.2
+ phf_macros@0.11.2
+ phf_shared@0.10.0
+ phf_shared@0.11.2
+ pin-project-lite@0.2.13
+ pin-utils@0.1.0
+ pkg-config@0.3.27
+ plotters-backend@0.3.5
+ plotters-svg@0.3.5
+ plotters@0.3.5
+ png@0.17.10
+ powerfmt@0.2.0
+ ppv-lite86@0.2.17
+ precomputed-hash@0.1.1
+ predicates-core@1.0.6
+ predicates-tree@1.0.9
+ predicates@3.0.4
+ proc-macro-crate@2.0.1
+ proc-macro-error-attr@1.0.4
+ proc-macro-error@1.0.4
+ proc-macro2@1.0.70
+ proptest@1.4.0
+ quick-error@1.2.3
+ quick-error@2.0.1
+ quote@1.0.33
+ rand@0.8.5
+ rand_chacha@0.3.1
+ rand_core@0.6.4
+ rand_xorshift@0.3.0
+ rawpointer@0.2.1
+ rayon-core@1.12.0
+ rayon@1.8.0
+ rctree@0.5.0
+ redox_syscall@0.4.1
+ regex-automata@0.4.3
+ regex-syntax@0.8.2
+ regex@1.10.2
+ rgb@0.8.37
+ rustix@0.38.28
+ rusty-fork@0.3.0
+ ryu@1.0.16
+ safe_arch@0.7.1
+ same-file@1.0.6
+ scopeguard@1.2.0
+ selectors@0.25.0
+ serde@1.0.193
+ serde_derive@1.0.193
+ serde_json@1.0.108
+ serde_spanned@0.6.4
+ servo_arc@0.3.0
+ simba@0.8.1
+ simd-adler32@0.3.7
+ siphasher@0.3.11
+ slab@0.4.9
+ smallvec@1.11.2
+ stable_deref_trait@1.2.0
+ string_cache@0.8.7
+ string_cache_codegen@0.5.2
+ strsim@0.10.0
+ syn@1.0.109
+ syn@2.0.41
+ system-deps@6.2.0
+ target-lexicon@0.12.12
+ tempfile@3.8.1
+ tendril@0.4.3
+ termtree@0.4.1
+ thiserror-impl@1.0.50
+ thiserror@1.0.50
+ time-core@0.1.2
+ time-macros@0.2.15
+ time@0.3.30
+ tinytemplate@1.2.1
+ tinyvec@1.6.0
+ tinyvec_macros@0.1.1
+ toml@0.8.2
+ toml_datetime@0.6.3
+ toml_edit@0.20.2
+ typenum@1.17.0
+ unarray@0.1.4
+ unicode-bidi@0.3.14
+ unicode-ident@1.0.12
+ unicode-normalization@0.1.22
+ url@2.5.0
+ utf-8@0.7.6
+ utf8parse@0.2.1
+ version-compare@0.1.1
+ version_check@0.9.4
+ wait-timeout@0.2.0
+ walkdir@2.4.0
+ wasi@0.11.0+wasi-snapshot-preview1
+ wasm-bindgen-backend@0.2.89
+ wasm-bindgen-macro-support@0.2.89
+ wasm-bindgen-macro@0.2.89
+ wasm-bindgen-shared@0.2.89
+ wasm-bindgen@0.2.89
+ web-sys@0.3.66
+ weezl@0.1.7
+ wide@0.7.13
+ winapi-i686-pc-windows-gnu@0.4.0
+ winapi-util@0.1.6
+ winapi-x86_64-pc-windows-gnu@0.4.0
+ winapi@0.3.9
+ windows-core@0.51.1
+ windows-sys@0.48.0
+ windows-sys@0.52.0
+ windows-targets@0.48.5
+ windows-targets@0.52.0
+ windows_aarch64_gnullvm@0.48.5
+ windows_aarch64_gnullvm@0.52.0
+ windows_aarch64_msvc@0.48.5
+ windows_aarch64_msvc@0.52.0
+ windows_i686_gnu@0.48.5
+ windows_i686_gnu@0.52.0
+ windows_i686_msvc@0.48.5
+ windows_i686_msvc@0.52.0
+ windows_x86_64_gnu@0.48.5
+ windows_x86_64_gnu@0.52.0
+ windows_x86_64_gnullvm@0.48.5
+ windows_x86_64_gnullvm@0.52.0
+ windows_x86_64_msvc@0.48.5
+ windows_x86_64_msvc@0.52.0
+ winnow@0.5.28
+ xml5ever@0.17.0
+ yeslogic-fontconfig-sys@4.0.1
+"
+
+inherit cargo gnome2 multilib-minimal python-any-r1 rust-toolchain vala
+
+DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
+HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
+
+LICENSE="LGPL-2.1+"
+# Dependent crate licenses
+LICENSE+="
+ Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD ISC MIT MPL-2.0
+ Unicode-DFS-2016
+"
+
+SLOT="2"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
+
+IUSE="gtk-doc +introspection +vala"
+REQUIRED_USE="
+ gtk-doc? ( introspection )
+ vala? ( introspection )
+"
+
+RDEPEND="
+ >=x11-libs/cairo-1.17.0[glib,svg(+),${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.9:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.20:2[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.50.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/harfbuzz-2.0.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.50.0[${MULTILIB_USEDEP}]
+
+ introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=virtual/rust-1.70.0[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
+ gtk-doc? ( dev-util/gi-docgen )
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+
+ dev-libs/gobject-introspection-common
+ dev-libs/vala-common
+"
+# dev-libs/gobject-introspection-common, dev-libs/vala-common needed by eautoreconf
+
+QA_FLAGS_IGNORED="
+ usr/bin/rsvg-convert
+ usr/lib.*/librsvg.*
+"
+
+src_prepare() {
+ use vala && vala_setup
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --disable-static
+ --disable-debug
+ $(multilib_native_use_enable gtk-doc)
+ $(multilib_native_use_enable introspection)
+ $(multilib_native_use_enable vala)
+ --enable-pixbuf-loader
+ )
+
+ if ! multilib_is_native_abi; then
+ myconf+=(
+ # Set the rust target, which can differ from CHOST
+ RUST_TARGET="$(rust_abi)"
+ # RUST_TARGET is only honored if cross_compiling, but non-native ABIs aren't cross as
+ # far as C parts and configure auto-detection are concerned as CHOST equals CBUILD
+ cross_compiling=yes
+ )
+ fi
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/html doc/html || die
+ fi
+}
+
+multilib_src_compile() {
+ gnome2_src_compile
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete || die
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
+ mv "${ED}"/usr/share/doc/Rsvg-2.0 "${ED}"/usr/share/gtk-doc/html/ || die
+ fi
+}
+
+pkg_postinst() {
+ multilib_foreach_abi gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ multilib_foreach_abi gnome2_pkg_postrm
+}
diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml
index 2e5d78e58d78..db4f9dee8926 100644
--- a/gnome-base/librsvg/metadata.xml
+++ b/gnome-base/librsvg/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="tools">Build svg viewer tool</flag>
-</use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="tools">Build svg viewer tool</flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/librsvg</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 622c8809d83b..d21f60c38645 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1 +1 @@
-DIST nautilus-40.2.tar.xz 3250384 BLAKE2B 8f8bb0c1a060d57695b28df126d421f386d634cbeea007ca30e076eb1b432a4098b98e9a1f39f688f8a920d99ef42ae2d53fe14fb270ba1e7de16aadd037a8d7 SHA512 ff7beab2963231c6e5ccd88098260659dd7fedd38ef6c0b95d66ffa110bfe5adc86477e2c1657eb2fcfe6110384038f75a7e669158712dfc1e2bd3f9e273b268
+DIST nautilus-45.2.1.tar.xz 3208272 BLAKE2B 80adf7ace00c21d21eddf764595c3f981e6206b936996458e5c2cc9cc51536e759528bdc38d1cddfe1c87eb94eac0ef2ced714ae797db947b81199a4bfa41c9d SHA512 c1e26e9f802f62ccb7a7d60f895575a1b31d8071f6a60206472fe79f70d64717b9abe97a5c5c0c87349994ff6f144dfe97c7bd448a05a9da00ff9918884e65fa
diff --git a/gnome-base/nautilus/files/3.30.5-docs-build.patch b/gnome-base/nautilus/files/3.30.5-docs-build.patch
deleted file mode 100644
index 65ac29109e8f..000000000000
--- a/gnome-base/nautilus/files/3.30.5-docs-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From a62478c8e55bc6b1cd685f0c8c2094e1ed244c69 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 11 Mar 2019 20:52:53 +0200
-Subject: [PATCH] build: Always install man page
-
-It's already generated and shouldn't be thrown in the same pot as
-full gtk-doc generation. It should be either a separate `man` option,
-or just always installed.
----
- docs/meson.build | 4 +++-
- meson.build | 4 +---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/docs/meson.build b/docs/meson.build
-index b039cb631..2b1800be6 100644
---- a/docs/meson.build
-+++ b/docs/meson.build
-@@ -1,3 +1,5 @@
- install_man('nautilus.1')
-
--subdir('reference')
-+if get_option('docs')
-+ subdir('reference')
-+endif
-diff --git a/meson.build b/meson.build
-index 996360a62..50479f5f0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -222,9 +222,7 @@ subdirs = [
- # Conditional building #
- ########################
-
--if get_option('docs')
-- subdirs += 'docs'
--endif
-+subdirs += 'docs'
- if get_option('tests') != 'none'
- subdirs += 'test'
- endif
---
-2.17.0
-
diff --git a/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch b/gnome-base/nautilus/files/43.0-optional-gstreamer.patch
index f28e9575d783..de0e008fffb7 100644
--- a/gnome-base/nautilus/files/3.32.3-optional-gstreamer.patch
+++ b/gnome-base/nautilus/files/43.0-optional-gstreamer.patch
@@ -1,33 +1,21 @@
-From f2d55bc9a9398ed1c36e1b856bcb33080abbf7c0 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Thu, 19 Sep 2019 22:26:08 +0300
-Subject: [PATCH] build: Optional gstreamer
-
----
- extensions/meson.build | 4 +++-
- meson.build | 2 ++
- meson_options.txt | 6 ++++++
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
diff --git a/extensions/meson.build b/extensions/meson.build
-index 5c6f64cef..bd8c41d3e 100644
+index a10349c..5494275 100644
--- a/extensions/meson.build
+++ b/extensions/meson.build
-@@ -1,3 +1,5 @@
+@@ -1,2 +1,4 @@
subdir('image-properties')
-subdir('audio-video-properties')
+if get_option('gstreamer')
+ subdir('audio-video-properties')
+endif
- subdir('sendto')
diff --git a/meson.build b/meson.build
-index 0a267d670..ccb2b8cc1 100644
+index 00f01f6..bdbd33a 100644
--- a/meson.build
+++ b/meson.build
-@@ -122,8 +122,10 @@ libm = cc.find_library('m')
-
+@@ -102,8 +102,10 @@ libm = cc.find_library('m')
if get_option('extensions')
- gexiv = dependency('gexiv2', version: '>= 0.10.0')
+ gexiv = dependency('gexiv2', version: '>= 0.14.0')
+ gdkpixbuf = dependency('gdk-pixbuf-2.0', version: '>= 2.30.0')
+ if get_option('gstreamer')
gst_tag_dep = dependency('gstreamer-tag-1.0')
gst_pbutils_dep = dependency('gstreamer-pbutils-1.0')
@@ -36,7 +24,7 @@ index 0a267d670..ccb2b8cc1 100644
gio = dependency('gio-2.0', version: glib_ver)
gio_unix = dependency('gio-unix-2.0', version: glib_ver)
diff --git a/meson_options.txt b/meson_options.txt
-index fce5f16f9..1fa8f8952 100644
+index fce5f16..1fa8f89 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,6 +13,12 @@ option(
@@ -52,6 +40,3 @@ index fce5f16f9..1fa8f8952 100644
option(
'introspection',
type: 'boolean',
---
-2.20.1
-
diff --git a/gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch b/gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch
new file mode 100644
index 000000000000..ba7f970d7f28
--- /dev/null
+++ b/gnome-base/nautilus/files/45.2.1-better-icon-lookup-fallback.patch
@@ -0,0 +1,116 @@
+From 95befc684c535e251278ccc68b06261c2620271d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Sun, 10 Dec 2023 17:01:18 +0000
+Subject: [PATCH 1/2] icon-info: Don't ask the theme for an icon it doesn't
+ have
+
+GtkIconTheme changed behavior from GTK3 to GTK4. Before, it would
+return NULL for a non-existent icon. Now it returns a non-scallable
+`image-missing` icon.
+
+But our icon info code still relies on NULL icon to set a fallback.
+
+The documented solution to get the old behavior back is to call
+gtk_icon_theme_has_gicon(). Let's just do that instead.
+
+Also use a more generic fallback icon that's been available in
+adwaita-icon-theme for a few versions before our GTK4 port.
+
+Closes https://gitlab.gnome.org/GNOME/nautilus/-/issues/2796
+
+
+(cherry picked from commit 7de816f8a2019adec468cf39073fcd5bb922512f)
+---
+ src/nautilus-file.c | 2 +-
+ src/nautilus-icon-info.c | 7 ++++---
+ src/nautilus-properties-window.c | 2 +-
+ 3 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/nautilus-file.c b/src/nautilus-file.c
+index 0492e2f87..b469288a3 100644
+--- a/src/nautilus-file.c
++++ b/src/nautilus-file.c
+@@ -4706,7 +4706,7 @@ get_default_file_icon (void)
+ static GIcon *fallback_icon = NULL;
+ if (fallback_icon == NULL)
+ {
+- fallback_icon = g_themed_icon_new ("text-x-generic");
++ fallback_icon = g_themed_icon_new ("application-x-generic");
+ }
+
+ return fallback_icon;
+diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c
+index c6b1e9a92..a7f3243d6 100644
+--- a/src/nautilus-icon-info.c
++++ b/src/nautilus-icon-info.c
+@@ -395,13 +395,14 @@ nautilus_icon_info_lookup (GIcon *icon,
+ return g_object_ref (icon_info);
+ }
+
+- icon_paintable = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_for_display (gdk_display_get_default ()),
+- icon, size, scale, GTK_TEXT_DIR_NONE, 0);
+- if (icon_paintable == NULL)
++ GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
++ if (!gtk_icon_theme_has_gicon (theme, icon))
+ {
+ return nautilus_icon_info_new_for_paintable (NULL, scale);
+ }
+
++ icon_paintable = gtk_icon_theme_lookup_by_gicon (theme, icon, size, scale, GTK_TEXT_DIR_NONE, 0);
++
+ if (G_IS_THEMED_ICON (icon))
+ {
+ ThemedIconKey lookup_key;
+diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
+index 08bf91fcb..6a6dcc362 100644
+--- a/src/nautilus-properties-window.c
++++ b/src/nautilus-properties-window.c
+@@ -570,7 +570,7 @@ get_image_for_properties_window (NautilusPropertiesWindow *self,
+
+ if (!icon)
+ {
+- g_autoptr (GIcon) gicon = g_themed_icon_new ("text-x-generic");
++ g_autoptr (GIcon) gicon = g_themed_icon_new ("application-x-generic");
+
+ icon = nautilus_icon_info_lookup (gicon, NAUTILUS_GRID_ICON_SIZE_MEDIUM, icon_scale);
+ }
+--
+2.43.0
+
+
+From 038885de47293a3fd2a15410d7cf3e0d36406a0d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniof@gnome.org>
+Date: Wed, 13 Dec 2023 00:13:35 +0000
+Subject: [PATCH 2/2] icon-info: Fix build
+
+Previous commit relied on mixing declarations with code, which is not allowed with the build flags of this branch.
+
+(cherry picked from commit deed9bcab051529e64e3fc1870f299233b8c200e)
+---
+ src/nautilus-icon-info.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c
+index a7f3243d6..f18d574d6 100644
+--- a/src/nautilus-icon-info.c
++++ b/src/nautilus-icon-info.c
+@@ -333,6 +333,7 @@ nautilus_icon_info_lookup (GIcon *icon,
+ {
+ NautilusIconInfo *icon_info;
+ g_autoptr (GtkIconPaintable) icon_paintable = NULL;
++ GtkIconTheme *theme;
+
+ if (G_IS_LOADABLE_ICON (icon))
+ {
+@@ -395,7 +396,7 @@ nautilus_icon_info_lookup (GIcon *icon,
+ return g_object_ref (icon_info);
+ }
+
+- GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
++ theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
+ if (!gtk_icon_theme_has_gicon (theme, icon))
+ {
+ return nautilus_icon_info_new_for_paintable (NULL, scale);
+--
+2.43.0
+
diff --git a/gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch b/gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch
new file mode 100644
index 000000000000..e1136fb196c9
--- /dev/null
+++ b/gnome-base/nautilus/files/45.2.1-fix-av-props-crash.patch
@@ -0,0 +1,38 @@
+From 6836526d6c95107f0bcdcf628ab2dfed394541a5 Mon Sep 17 00:00:00 2001
+From: Peter Eisenmann <p3732@getgoogleoff.me>
+Date: Sat, 9 Dec 2023 14:40:52 +0100
+Subject: [PATCH] properties-window: fix extension callback signature
+
+This was added in [1] with an incorrect signature.
+
+Relates to #3160
+
+[1] bc4dfddd80544092483fb058c946716ea4fc47f1
+
+
+(cherry picked from commit 8d51206503304ff62ca5eeba30ef3b29cdc50820)
+---
+ src/nautilus-properties-window.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
+index 14c8f74213..08bf91fcb7 100644
+--- a/src/nautilus-properties-window.c
++++ b/src/nautilus-properties-window.c
+@@ -925,10 +925,10 @@ create_extension_group_row (NautilusPropertiesItem *item,
+ }
+
+ static void
+-navigate_extension_model_page (AdwPreferencesRow *row,
+- GParamSpec *params,
+- NautilusPropertiesWindow *self)
++navigate_extension_model_page (AdwPreferencesRow *row,
++ gpointer user_data)
+ {
++ NautilusPropertiesWindow *self = NAUTILUS_PROPERTIES_WINDOW (user_data);
+ GListModel *list_model = g_object_get_data (G_OBJECT (row), "nautilus-extension-properties-model");
+ AdwNavigationPage *page;
+
+--
+GitLab
+
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index 922b9f77a330..b905953fa288 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -1,15 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="gstreamer">Enable the Audio/Video file properties page</flag>
- <flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files
- from the file mananger</flag>
- <flag name="sendto">Enable the nautilus-sendto extension to send files to
- various locations/devices</flag>
-</use>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <use>
+ <flag name="cloudproviders">Enable the cloudproviders support</flag>
+ <flag name="gstreamer">Enable the Audio/Video file properties page</flag>
+ <flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files from the file mananger</flag>
+ <flag name="sendto">Enable the nautilus-sendto extension to send files to various locations/devices</flag>
+ </use>
+ <upstream>
+ <remote-id type="gnome-gitlab">GNOME/nautilus</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gnome-base/nautilus/nautilus-40.2.ebuild b/gnome-base/nautilus/nautilus-45.2.1-r1.ebuild
index 60b6475d5030..64e21fdb42a6 100644
--- a/gnome-base/nautilus/nautilus-40.2.ebuild
+++ b/gnome-base/nautilus/nautilus-45.2.1-r1.ebuild
@@ -1,49 +1,52 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
DESCRIPTION="Default file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+HOMEPAGE="https://apps.gnome.org/Nautilus/"
LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
-IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+IUSE="+cloudproviders gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+REQUIRED_USE="gtk-doc? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
DEPEND="
- >=dev-libs/glib-2.67.1:2
- >=media-libs/gexiv2-0.10.0
+ >=dev-libs/glib-2.77.0:2
+ >=media-libs/gexiv2-0.14.2
+ >=x11-libs/gdk-pixbuf-2.30.0:2
gstreamer? ( media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0 )
- >=app-arch/gnome-autoar-0.3.0
- >=gnome-base/gnome-desktop-3.0.0:3=
- >=x11-libs/gtk+-3.22.27:3[X,introspection?]
- >=gui-libs/libhandy-1.1.90:1
+ >=app-arch/gnome-autoar-0.4.4
+ >=gnome-base/gnome-desktop-43:4=
+ >=gnome-base/gsettings-desktop-schemas-42
+ >=gui-libs/gtk-4.11.2:4[introspection?]
+ >=gui-libs/libadwaita-1.4_alpha:1
+ >=dev-libs/libportal-0.5:=[gtk]
>=x11-libs/pango-1.28.3
selinux? ( >=sys-libs/libselinux-2.0 )
- >=app-misc/tracker-3.0:3=
- x11-libs/libX11
+ >=app-misc/tracker-3.0:3
>=dev-libs/libxml2-2.7.8:2
+ cloudproviders? ( >=net-libs/libcloudproviders-0.3.1 )
introspection? ( >=dev-libs/gobject-introspection-1.54:= )
"
RDEPEND="${DEPEND}
- gstreamer? ( !<media-video/totem-3.31.91[nautilus] )
>=app-misc/tracker-miners-3.0:3=
" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
BDEPEND="
>=dev-util/gdbus-codegen-2.51.2
- >=dev-util/meson-0.57.2
dev-util/glib-utils
gtk-doc? (
- >=dev-util/gtk-doc-1.10
- app-text/docbook-xml-dtd:4.1.2 )
+ app-text/docbook-xml-dtd:4.1.2
+ dev-util/gi-docgen
+ )
>=sys-devel/gettext-0.19.8
virtual/pkgconfig
- x11-base/xorg-proto
+ test? ( sys-apps/dbus )
"
PDEPEND="
gnome? ( x11-themes/adwaita-icon-theme )
@@ -53,30 +56,40 @@ PDEPEND="
" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
PATCHES=(
- "${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
- "${FILESDIR}"/3.32.3-optional-gstreamer.patch # Allow controlling audio-video-properties build
+ "${FILESDIR}"/43.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
+ "${FILESDIR}"/${PV}-fix-av-props-crash.patch # Fix crash opening audio/video properties, upstream #3160
+ "${FILESDIR}"/${PV}-better-icon-lookup-fallback.patch # Upstream #2796 from gnome-45 branch
)
src_prepare() {
+ default
+ xdg_environment_reset
+
+ # Disable -Werror
+ sed -e '/-Werror=/d' -i meson.build || die
+
if use previewer; then
DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
To activate the previewer, select a file and press space; to
close the previewer, press space again."
fi
- xdg_src_prepare
+
+ # Disable test-nautilus-search-engine-tracker; bug #831170
+ sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
}
src_configure() {
local emesonargs=(
$(meson_use gtk-doc docs)
-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
- $(meson_use gstreamer) # gstreamer audio-video-properties extension
$(meson_use introspection)
- -Dlibportal=false
-Dpackagekit=false
$(meson_use selinux)
+ $(meson_use cloudproviders)
-Dprofiling=false
-Dtests=$(usex test all none)
+
+ $(meson_use gstreamer) # gstreamer audio-video-properties extension
)
meson_src_configure
}
@@ -87,7 +100,12 @@ src_install() {
}
src_test() {
- virtx meson_src_test
+ # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+ gnome2_environment_reset
+ # TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may
+ # need some sorting out with tracker use flag deps
+ # GIO_USE_VOLUME_MONITOR=unix due to https://gitlab.gnome.org/GNOME/gvfs/-/issues/629#note_1467280
+ GIO_USE_VOLUME_MONITOR=unix XDG_SESSION_TYPE=x11 virtx dbus-run-session meson test -C "${BUILD_DIR}" || die
}
pkg_postinst() {