gentoo auto-resync : 12:12:2024 - 02:01:23

3 files changed, 95 insertions, 1 deletions

diff --git a/sys-libs/libmodulemd/Manifest b/sys-libs/libmodulemd/Manifest
index 2718dfc2ef98..008409f365ed 100644
--- a/sys-libs/libmodulemd/Manifest
+++ b/sys-libs/libmodulemd/Manifest
@@ -1,4 +1,5 @@
+AUX libmodulemd-2.15.0-glib-docs.patch 3456 BLAKE2B 55437b981d7a024700d15ff3aa0320c4d60896aae164ce386fed6810afd7a8fbbf4ecbfcdddb781a8c9a9cbda9952c28e7a2bd6f867d2740a92bf393fc250310 SHA512 bb033210c9280552d3a64aa6bec3505aaafff403924bb21036d4458349d52096723c54e433892d2c948cb4753696e6e776e217549d680e135715b1985728b07a
 DIST libmodulemd-2.15.0.tar.gz 572396 BLAKE2B 39e9240deb4e1a3278bf323e111b137b980ac5a3069598b7306390d27623730ac1bc826c91ed049257c0d5de8c6a05c3bbc22ac8e9435b5c38c147f0f077ec41 SHA512 6e890952bf6b6fe3ee5790ff71866938627134eaa2d6c6e3bf1940dcf21203dc0101f487801d62f3698e5a50402eb089665c99723aeffd831e5f0b341a63aace
-EBUILD libmodulemd-2.15.0-r1.ebuild 1455 BLAKE2B 687496329a23868f635be70ba84c30441ebeeef0b931fad37a834a4455ee8debe7bf877a4afec45f08164731dc1a46d497ce19affec41a74ee1c5fc24995d097 SHA512 667281e6d20c38abb33017c93f71e685742ce76e817695e0c43b8debdb2aa324c3871bcb5ba6108d33b11314cddb39dc423b57e13b87e4b1f6986f7a99790703
+EBUILD libmodulemd-2.15.0-r1.ebuild 1512 BLAKE2B ed47b84346b446d1678db89944e9e7689a3852abb1780136107f78026073f7e23dfb9559d1fc3c75686ad896e4e32036ae1c8cb2b2e071b332cca478c88ba77b SHA512 df4db7b79bdd40c93459710a4305d7ecc625e5b8433dc2f416b3c63eadcacbf9d3b2cae02bedef5f6c1a7e15884eb6a9cbe0d4648e3ec2f7c2488afa93293643
 EBUILD libmodulemd-9999.ebuild 1450 BLAKE2B 62b8a3c0d77809b9701fd3e126e53134bf83c697e90aaabd67da92a5f066bf377315e1748e41ec514bb6e8092471640b5f17ce559e8cf4cac6b1c048c86092fb SHA512 7f91781f5604bf3922a5aa0879707bd5efdfdfed1a8d7246e3378db230af39a3c96075b25e73fd3c0e590d57ed7d71ee58375d470df3598e7f4546e34b840037
 MISC metadata.xml 340 BLAKE2B 051251d010c8d4dc48ce40383c19609ed6de9a9dee7220bf116d719600b1864ca4918ea53ac5a2f491350bf6ffe5528c2f98974c147dd4e7be83f1646b1d17eb SHA512 e5efb6c891911de2ab7af8ea47c4a195d8016be333a827981754ea263eb03d8e1b727aba6f819c07993d0eec1b38feb3441f808464f2ef7558e6a5b48e9bb89d
diff --git a/sys-libs/libmodulemd/files/libmodulemd-2.15.0-glib-docs.patch b/sys-libs/libmodulemd/files/libmodulemd-2.15.0-glib-docs.patch
new file mode 100644
index 000000000000..7ab46652ed9d
--- /dev/null
+++ b/sys-libs/libmodulemd/files/libmodulemd-2.15.0-glib-docs.patch
@@ -0,0 +1,89 @@
+https://github.com/fedora-modularity/libmodulemd/commit/29c339a31b1c753dcdef041e5c2e0e600e48b59d
+https://github.com/fedora-modularity/libmodulemd/commit/9d2809090cc0cccd7bab67453dc00cf43a289082
+https://github.com/fedora-modularity/libmodulemd/commit/f3336199b4e69af3305f156abc7533bed9e9a762
+
+The commits above are required for USE=doc. For some reason upstream cross-reference glib html
+docs?
+
+--- a/meson.build
++++ b/meson.build
+@@ -67,23 +67,34 @@ sed = find_program('sed')
+ test = find_program('test')
+ 
+ with_docs = get_option('with_docs')
++gtk_doc_referred_paths = []
+ if with_docs
+   gtkdoc = dependency('gtk-doc')
+-  glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
+ 
+-  glib_index_path = join_paths(glib_docpath, 'glib/index.html')
+-  ret = run_command ([test, '-e', glib_index_path],
+-    check: false)
+-  if ret.returncode() != 0
+-    error('Missing documentation for GLib: @0@'.format(glib_index_path))
++  if glib.version().version_compare('<2.79.0')
++    glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
++    glib_modules = ['glib', 'gobject' ]
++  else
++    warning('glib >= 2.79.0 documention might not be properly referred from libmodulemd documentation.')
++    if glib.version().version_compare('<2.80.1')
++      glib_docpath = join_paths(glib_prefix, 'share', 'doc', 'glib-2.0')
++      glib_modules = ['glib', 'gobject' ]
++    else
++      glib_docpath = join_paths(glib_prefix, 'share', 'doc')
++      glib_modules = ['glib-2.0', 'gobject-2.0' ]
++    endif
+   endif
+ 
+-  gobject_index_path = join_paths(glib_docpath, 'gobject/index.html')
+-  ret = run_command ([test, '-e', gobject_index_path],
+-    check: false)
+-  if ret.returncode() != 0
+-    error('Missing documentation for GObject: @0@'.format(gobject_index_path))
+-  endif
++  foreach referred_module : glib_modules
++    doc_module_path = join_paths(glib_docpath, referred_module)
++    doc_index_file = join_paths(doc_module_path, 'index.html')
++    ret = run_command ([test, '-e', doc_index_file],
++      check: false)
++    if ret.returncode() != 0
++      error('Missing GTK documentation for @0@: @1@'.format(referred_module, doc_index_file))
++    endif
++    gtk_doc_referred_paths += [ doc_module_path ]
++  endforeach
+ endif
+ 
+ # Keep with_manpages option a tristate feature for backward compatibility.
+@@ -198,6 +209,7 @@ summary({'prefix': get_option('prefix'),
+          'datadir': get_option('datadir'),
+          'Python 2 GObject Overrides': gobject_overrides_dir_py2,
+          'Python 3 GObject Overrides': gobject_overrides_dir_py3,
++         'GTK-Doc Referred Paths': gtk_doc_referred_paths,
+         }, section: 'Directories')
+ 
+ summary({'Custom Python': get_option('python_name'),
+--- a/modulemd/meson.build
++++ b/modulemd/meson.build
+@@ -256,6 +256,10 @@ configure_file(
+ # --- Documenatation --- #
+ 
+ if with_docs
++    fixxref_args = []
++    foreach path : gtk_doc_referred_paths
++      fixxref_args += [ '--extra-dir=@0@'.format(path) ]
++    endforeach
+     gnome.gtkdoc(
+         'modulemd-2.0',
+         install_dir: 'modulemd-2.0',
+@@ -265,10 +269,7 @@ if with_docs
+         dependencies : [
+             modulemd_dep,
+         ],
+-        fixxref_args: [
+-                     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
+-                     '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
+-                   ],
++        fixxref_args: [ fixxref_args ],
+         install : true,
+     )
+ endif
diff --git a/sys-libs/libmodulemd/libmodulemd-2.15.0-r1.ebuild b/sys-libs/libmodulemd/libmodulemd-2.15.0-r1.ebuild
index dd7902b5a240..547c64f68c58 100644
--- a/sys-libs/libmodulemd/libmodulemd-2.15.0-r1.ebuild
+++ b/sys-libs/libmodulemd/libmodulemd-2.15.0-r1.ebuild
@@ -48,6 +48,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.15.0-glib-docs.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use doc with_docs)