Tue, 11 Mar 2025 14:13:42 -0500
Make sure we look for gi-docgen before our other dependencies
This helps to make sure we're getting the version of gi-docgen we're expecting.
Also update gi-docgen to 2025.3
Testing Done:
Called in the turtles.
Reviewed at https://reviews.imfreedom.org/r/3885/
| meson.build | file | annotate | diff | comparison | revisions | |
| subprojects/gi-docgen.wrap | file | annotate | diff | comparison | revisions |
--- a/meson.build Fri Feb 28 14:06:20 2025 -0600 +++ b/meson.build Tue Mar 11 14:13:42 2025 -0500 @@ -169,17 +169,33 @@ math = compiler.find_library('m', required: false) ####################################################################### +# Documentation +####################################################################### +if get_option('doc') and not get_option('introspection') + error('Documentation requires GObject Introspection.') +endif + +dependency( + 'gi-docgen', version: '>= 2025.3', + fallback: ['gi-docgen', 'dummy_dep'], + required: get_option('doc') +) + +gidocgen = find_program('gi-docgen', required : get_option('doc')) +docs_dir = get_option('prefix') / get_option('datadir') / 'doc' + +####################################################################### # Check for GLib (required) ####################################################################### glib = dependency('glib-2.0', version : '>= 2.80.0') -gio = dependency('gio-2.0') -gnome = import('gnome') - add_project_arguments( '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_80', '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_80', language : 'c',) +gio = dependency('gio-2.0') +gnome = import('gnome') + ####################################################################### # Check for GObject Introspection ####################################################################### @@ -190,23 +206,6 @@ endif ####################################################################### -# Documentation -####################################################################### - -if get_option('doc') and not get_option('introspection') - error('Documentation requires GObject Introspection.') -endif - -dependency( - 'gi-docgen', version: '>= 2021.1', - fallback: ['gi-docgen', 'dummy_dep'], - required: get_option('doc') -) - -gidocgen = find_program('gi-docgen', required : get_option('doc')) -docs_dir = get_option('prefix') / get_option('datadir') / 'doc' - -####################################################################### # Check Pidgin dependencies ####################################################################### if get_option('gtkui')
--- a/subprojects/gi-docgen.wrap Fri Feb 28 14:06:20 2025 -0600 +++ b/subprojects/gi-docgen.wrap Tue Mar 11 14:13:42 2025 -0500 @@ -1,5 +1,5 @@ [wrap-file] -directory = gi-docgen-2024.1 -source_url = https://download.gnome.org/sources/gi-docgen/2024/gi-docgen-2024.1.tar.xz -source_filename = gi-docgen-2024.1.tar.xz -source_hash = 870c77f9620462cce49e35542a42dc1612fc858733e83dbbe248c535458aec1e +directory = gi-docgen-2025.3 +source_url = https://download.gnome.org/sources/gi-docgen/2025/gi-docgen-2025.3.tar.xz +source_filename = gi-docgen-2025.3.tar.xz +source_hash = 8a89a58bc0f77dfc3e8a2a0e3497fc39f5413ae35e5597e9ec6160abf8ee14d8