gentoo auto-resync : 27:11:2024 - 02:00:00

4 files changed, 80 insertions, 1 deletions

diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index d8585105acff..de4f4812d073 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index f2038ce69257..c0f633de86ce 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -3,7 +3,8 @@ AUX cinnamon-3.8.0-gnome-background-compatibility.patch 1069 BLAKE2B 4908d36ef03
 AUX cinnamon-6.2.0-fix-arm64-settings-panel-path.patch 1832 BLAKE2B 15f3300a695f12bd138ff4d3f4e67215d7d7f2e61cd15b84253a7573e0b4e2313697c443cae452b8f324df2b5e1c1161b97fc3f750e1da1207a21b7accad0d81 SHA512 9cf22a4072de3caf9be14405fd3f4ba96262cfc30aad8bb47b161f53ae7c1d6a061397cab1fe5515418e48d2d24919a113ae1b58e4f04fef26efd8a9f52cdbbc
 AUX cinnamon-6.2.0-optional-wayland.patch 2333 BLAKE2B 2c52be837f95f24a20c4a4a506891bba315eefcbc7574b8024c741881d3b04c7bbebba716539d52ee960c5d2295812d81b0affc6112ae2fca0c80a845e95b4e3 SHA512 c43995dec07d4be77bc1c14c1a73d8d8d1acef9ab22479a1bd74067aed162523a21279aa7f3b45353e555708b2af9d0ea6ac39dc1150bd2b9cc1da57941f1b0c
 AUX cinnamon-6.2.0-polkit-agent-on-x11.patch 2440 BLAKE2B ddecfd38e2ac60ab9089e68708efae1e24e5c597c2523222e2b8be4f0f71020dc2dff7008e4c4d895fb58d345263e6176e2f097e96ed7d5c98966dc41d447a4f SHA512 e8b72d5c024a8b3b5d4b171c43f0528e2915a21d21893bb4fb4c5fe2a5e9ce6272c9da781a9282f1445b6643929e666af325c3f4d0e755e53365861b9279c078
+AUX cinnamon-6.2.0-remove-gtk-doc-recorder.patch 2739 BLAKE2B e76ca1591e94198b56b1424d918e3e825fca229e5f690d5b88c57be4f4ec778b35d8a0600c7439b90b438ef1e886dcfb23347c3caea32193aec0bdfd9a5b3807 SHA512 b3bc23c47e106b5a6af25c5516b0277a55ec799e31f8fdf18987ee3979cc7f6276598939525ecbde08c64345130b371bfbe14ed3b37b1eeb7854377756ad05da
 AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360
 DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11
-EBUILD cinnamon-6.2.9.ebuild 5958 BLAKE2B 617b2963485bf1d6990d275b87147312d00b4747ca9467ab88761251009faf51b385a930a01ec8506704e779f272a27e4bd3f1566e6d38deadab061cf9c6047a SHA512 c3d6778646849044eea584f58e3ddef19dd679e91ac4b81d265383ad6fbb996e718bbaa334dedabe18959c58b35f24022c8524fec573532e33076043b665fe2d
+EBUILD cinnamon-6.2.9.ebuild 6154 BLAKE2B e1d1f25087647251b83f1ed438fd06073e685db4855ddb8860d1e58390324a1b470fb5780e238d405f222430caed05e46954e81d4cc26671b069a165727565a1 SHA512 e2c07e8e72d9d55e40f2e1b5f63d2cc1d094b55b1f688411d492b444b2ce8bfd3a4de2706776263fe68ad43276959b9acb95a4316858c67aca879eb8dffdf89a
 MISC metadata.xml 685 BLAKE2B abc17d8b8cf6c9e0886fe404030821ac588090c26477e72e4d8a0bdc7cc26b20dc130c7a7b41cd240db4c8073f05fd9947447ae517cfc2646d59aeb35c1783f6 SHA512 84b352a0ebcc832bd71733e4b9b5954bcdf2005e18d357f5d39f03d177b7be6f8477e88965c8b66119da5209071745a197f21a9d049bbed8e903f794bf110b62
diff --git a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
index 8c997830c621..34e200355b06 100644
--- a/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-6.2.9.ebuild
@@ -127,6 +127,10 @@ PATCHES=(
 	# Fix path for settings panels on arm64
 	# https://github.com/linuxmint/cinnamon/pull/12278
 	"${FILESDIR}/${PN}-6.2.0-fix-arm64-settings-panel-path.patch"
+
+	# Remove reference to non-existant gtk-doc file
+	# https://github.com/linuxmint/cinnamon/commit/1e43299b9ad548c9395edfd456cbba017ca02b9f
+	"${FILESDIR}/${PN}-6.2.0-remove-gtk-doc-recorder.patch"
 )
 
 src_prepare() {
diff --git a/gnome-extra/cinnamon/files/cinnamon-6.2.0-remove-gtk-doc-recorder.patch b/gnome-extra/cinnamon/files/cinnamon-6.2.0-remove-gtk-doc-recorder.patch
new file mode 100644
index 000000000000..ee93032177d9
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-6.2.0-remove-gtk-doc-recorder.patch
@@ -0,0 +1,74 @@
+From 1e43299b9ad548c9395edfd456cbba017ca02b9f Mon Sep 17 00:00:00 2001
+From: Rick Calixte <10281587+rcalixte@users.noreply.github.com>
+Date: Wed, 2 Oct 2024 11:09:58 -0400
+Subject: [PATCH] docs: Remove recorder.xml.in (#12395)
+
+This file references another for inclusion that no longer exists. With
+gtk-doc-tools 1.34.0, stricter checking is enabled that results in a failure
+which halts the build process due to this invalid file reference.
+---
+ docs/reference/cinnamon/cinnamon-docs.sgml |  1 -
+ docs/reference/cinnamon/meson.build        | 15 +--------------
+ docs/reference/cinnamon/recorder.xml.in    | 12 ------------
+ 3 files changed, 1 insertion(+), 27 deletions(-)
+ delete mode 100644 docs/reference/cinnamon/recorder.xml.in
+
+diff --git a/docs/reference/cinnamon/cinnamon-docs.sgml b/docs/reference/cinnamon/cinnamon-docs.sgml
+index bd5bebd793..4e79c29933 100644
+--- a/docs/reference/cinnamon/cinnamon-docs.sgml
++++ b/docs/reference/cinnamon/cinnamon-docs.sgml
+@@ -35,7 +35,6 @@
+     <xi:include href="xml/cinnamon-tray-icon.xml"/>
+     <xi:include href="xml/cinnamon-tray-manager.xml"/>
+   </chapter>
+-  <xi:include href="recorder.xml"/>
+   <chapter>
+     <title>Integration helpers and utilities</title>
+     <xi:include href="xml/cinnamon-global.xml"/>
+diff --git a/docs/reference/cinnamon/meson.build b/docs/reference/cinnamon/meson.build
+index fec3ed34de..0123077f0e 100644
+--- a/docs/reference/cinnamon/meson.build
++++ b/docs/reference/cinnamon/meson.build
+@@ -7,23 +7,10 @@ ignore = [
+     sniffer_headers,
+ ]
+ 
+-recorder_conf = configuration_data()
+-
+-if get_option('build_recorder')
+-    recorder_conf.set('BUILD_RECORDER_XML_START', '-->')
+-    recorder_conf.set('BUILD_RECORDER_XML_END', '<!--')
+-else
+-    recorder_conf.set('BUILD_RECORDER_XML_START', '')
+-    recorder_conf.set('BUILD_RECORDER_XML_END', '')
++if not get_option('build_recorder')
+     ignore += 'cinnamon-recorder.h'
+ endif
+ 
+-configure_file(
+-    input: 'recorder.xml.in',
+-    output: 'recorder.xml',
+-    configuration: recorder_conf,
+-)
+-
+ gnome.gtkdoc(
+     'cinnamon',
+     mode: 'xml',
+diff --git a/docs/reference/cinnamon/recorder.xml.in b/docs/reference/cinnamon/recorder.xml.in
+deleted file mode 100644
+index 133c57bfac..0000000000
+--- a/docs/reference/cinnamon/recorder.xml.in
++++ /dev/null
+@@ -1,12 +0,0 @@
+-<?xml version="1.0"?>
+-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+-[
+-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+-]>
+-  <!-- @BUILD_RECORDER_XML_START@
+-  <chapter>
+-    <title>Recorder</title>
+-    <xi:include href="xml/cinnamon-recorder.xml"/>
+-  </chapter>
+-  @BUILD_RECORDER_XML_END@ -->