diff --git a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch index c9d78145ff6..1203b7e6ce7 100644 --- a/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch +++ b/meta/recipes-gnome/gtk-doc/files/0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch @@ -1,4 +1,4 @@ -From 00a3a827aca9e053cb0d69bea50a61fece341f0f Mon Sep 17 00:00:00 2001 +From e069b394874be4a8ce55ee0e50b08deb5633b358 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 31 Aug 2016 16:44:46 +0300 Subject: [PATCH] Do not hardocode paths to perl/python in scripts. diff --git a/meta/recipes-gnome/gtk-doc/files/0001-meson.build-add-an-option-to-not-check-for-runtime-d.patch b/meta/recipes-gnome/gtk-doc/files/0001-meson.build-add-an-option-to-not-check-for-runtime-d.patch deleted file mode 100644 index 88ec64cdb32..00000000000 --- a/meta/recipes-gnome/gtk-doc/files/0001-meson.build-add-an-option-to-not-check-for-runtime-d.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ffa3ed38663cc806f914691c63ca7d8fab959eef Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sun, 21 Jun 2026 11:11:04 +0200 -Subject: [PATCH] meson.build: add an option to not check for runtime - dependencies at build time - -pygments and parametrized are run-time dependencies, and should -not be enforced at build time as they are never actually used then. - -This is especially useful in cross-compilation, as the modules -are checked in the python installation on the build host, and that -has no relevance to the target environment that the build outputs -will be executed in. - -https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/105 -Upstream-Status: Backport [link above] -Signed-off-by: Alexander Kanavin ---- - meson.build | 9 ++++++--- - meson_options.txt | 6 ++++++ - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 30f1520..e087cff 100644 ---- a/meson.build -+++ b/meson.build -@@ -8,9 +8,12 @@ fs = import('fs') - gnome = import('gnome') - python = import('python') - --required_python_modules = ['pygments'] --if get_option('tests') -- required_python_modules += ['parameterized'] -+required_python_modules = [] -+if get_option('check_runtime_deps') -+ required_python_modules = ['pygments'] -+ if get_option('tests') -+ required_python_modules += ['parameterized'] -+ endif - endif - - python3 = python.find_installation('python3', modules: required_python_modules) -diff --git a/meson_options.txt b/meson_options.txt -index d44dbb4..84463b2 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -21,3 +21,9 @@ option( - type: 'boolean', value: true, - description: 'Build the test suite (requires glib and the parameterized python module)' - ) -+ -+option( -+ 'check_runtime_deps', -+ type: 'boolean', value: true, -+ description: 'Check for runtime dependencies during build configuration' -+) diff --git a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch index a9c7154fc41..6c92920b551 100644 --- a/meta/recipes-gnome/gtk-doc/files/no-clobber.patch +++ b/meta/recipes-gnome/gtk-doc/files/no-clobber.patch @@ -1,4 +1,4 @@ -From 01a52d8cf076e2692d947c8ed2681cb794eaa3c0 Mon Sep 17 00:00:00 2001 +From b2607b8ed3a3468fe3bae3b24577406feca1004f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 21 Mar 2018 14:47:29 +0000 Subject: [PATCH] gtk-doc: don't regenerate gtk-doc in do_install diff --git a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch index de16ea0cc6f..a3bef8af8e3 100644 --- a/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch +++ b/meta/recipes-gnome/gtk-doc/files/pkg-config-native.patch @@ -1,4 +1,4 @@ -From 0800f184cffc837276ea65b86e4efc7942eb1d7e Mon Sep 17 00:00:00 2001 +From 2d704126396de04b99a4090e1f36ef7479748a81 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 5 Sep 2016 22:25:44 +0100 Subject: [PATCH] Use native pkg-config when looking for gtk-doc. diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc_1.36.1.bb b/meta/recipes-gnome/gtk-doc/gtk-doc_1.37.0.bb similarity index 90% rename from meta/recipes-gnome/gtk-doc/gtk-doc_1.36.1.bb rename to meta/recipes-gnome/gtk-doc/gtk-doc_1.37.0.bb index dcdeebe258a..52746a01f11 100644 --- a/meta/recipes-gnome/gtk-doc/gtk-doc_1.36.1.bb +++ b/meta/recipes-gnome/gtk-doc/gtk-doc_1.37.0.bb @@ -15,10 +15,9 @@ PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,glib-2.0" EXTRA_OEMESON = "-Dyelp_manual=false -Dcheck_runtime_deps=false" -SRC_URI[archive.sha256sum] = "0e517a5f97069831181be177516bde8aa8b3922398f2bdb09e265d22aecadbc5" +SRC_URI[archive.sha256sum] = "2facfb530ddcd20c03ed4758ef934e832626c393e2cacd23fc1249b7ed0e4246" SRC_URI += "file://0001-Do-not-hardocode-paths-to-perl-python-in-scripts.patch \ file://no-clobber.patch \ - file://0001-meson.build-add-an-option-to-not-check-for-runtime-d.patch \ " SRC_URI:append:class-native = " file://pkg-config-native.patch"