diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /textproc/gtk-doc/files/patch-meson.build | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'textproc/gtk-doc/files/patch-meson.build')
| -rw-r--r-- | textproc/gtk-doc/files/patch-meson.build | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/textproc/gtk-doc/files/patch-meson.build b/textproc/gtk-doc/files/patch-meson.build index f9f92a6a8e19..c436ad75abe2 100644 --- a/textproc/gtk-doc/files/patch-meson.build +++ b/textproc/gtk-doc/files/patch-meson.build @@ -1,20 +1,20 @@ ---- meson.build.orig 2020-11-17 13:56:44 UTC +--- meson.build.orig 2024-03-05 18:09:52 UTC +++ meson.build -@@ -7,7 +7,7 @@ project('gtk-doc', 'c', +@@ -7,7 +7,7 @@ python = import('python') gnome = import('gnome') - python = import('python') # Meson new Python module https://mesonbuild.com/Python-module.html + python = import('python') --python3 = python.find_installation('python3') -+python3 = python.find_installation() +-python3 = python.find_installation('python3', modules: ['pygments']) ++python3 = python.find_installation(python.find_installation().full_path(), modules: ['pygments']) - version = meson.project_version() - package_name = meson.project_name() -@@ -163,7 +163,7 @@ configure_file( + # Paths + srcdir = meson.current_source_dir() +@@ -134,7 +134,7 @@ configure_file( output: 'gtk-doc.pc', configuration: gtkdoc_pc, install: true, -- install_dir: pkgconfigdir, -+ install_dir: join_paths(libdir, 'pkgconfig'), +- install_dir: get_option('datadir') / 'pkgconfig', ++ install_dir: join_paths(get_option('prefix'), 'libdata', 'pkgconfig'), ) subdir('help') |