| Message ID | 20260112200051.3240567-1-peter@berginkonsult.se |
|---|---|
| State | Under Review |
| Headers | show |
| Series | [meta-gnome] gtksourceview*: fix build issue related to S | expand |
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb index 48c54a7483..878949f9b7 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb @@ -11,6 +11,7 @@ inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspecti GNOMEBN = "gtksourceview" SRC_URI[archive.sha256sum] = "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd" +S = "${UNPACKDIR}/gtksourceview-${PV}" REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb index 439332bcea..a045fbd1a7 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb @@ -15,6 +15,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI += "file://0001-remove-pointless-check.patch" SRC_URI[archive.sha256sum] = "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d" +S = "${UNPACKDIR}/gtksourceview-${PV}" GIR_MESON_OPTION = 'gir' GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.18.0.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.18.0.bb index fa6d559543..75010a67b8 100644 --- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.18.0.bb +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.18.0.bb @@ -21,6 +21,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" GNOMEBN = "gtksourceview" SRC_URI[archive.sha256sum] = "051a78fe38f793328047e5bcd6d855c6425c0b480c20d9432179e356742c6ac0" +S = "${UNPACKDIR}/gtksourceview-${PV}" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled'
Source code for gtksourceview will be unpacked to a directory called 'gtksourceview-${PV}'. But as the recipes have added part of PV to the name of the recipe the default setting of variable S will be wrong. This is fixed by explicitly setting it. Fixing issues like: WARNING: gtksourceview3-3.24.11-r0 do_unpack: gtksourceview3: the directory ${UNPACKDIR}/${BP} (<snip>/gtksourceview3/3.24.11/sources/gtksourceview3-3.24.11) pointed to by the S variable doesn't exist - please set S within the recipe to point to where the source has been unpacked to WARNING: gtksourceview3-3.24.11-r0 do_populate_lic: Could not copy license file <snip>/gtksourceview3/3.24.11/sources/gtksourceview3-3.24.11/COPYING to <snip>/gtksourceview3/3.24.11/license-destdir/corei7-64/gtksourceview3/COPYING: [Errno 2] No such file or directory: '<snip>/gtksourceview3/3.24.11/sources/gtksourceview3-3.24.11/COPYING' ERROR: gtksourceview3-3.24.11-r0 do_populate_lic: QA Issue: gtksourceview3: LIC_FILES_CHKSUM points to an invalid file: <snip>/gtksourceview3/3.24.11/sources/gtksourceview3-3.24.11/COPYING [license-checksum] ERROR: gtksourceview3-3.24.11-r0 do_populate_lic: Fatal QA errors were found, failing task. WARNING: gtksourceview4-4.8.4-r0 do_unpack: gtksourceview4: the directory ${UNPACKDIR}/${BP} (<snip>/gtksourceview4/sources/gtksourceview4-4.8.4) pointed to by the S variable doesn't exist - please set S within the recipe to point to where the source has been unpacked to ERROR: gtksourceview4-4.8.4-r0 do_patch: Applying patch '0001-remove-pointless-check.patch' on target directory '<snip>/gtksourceview4/4.8.4/sources/gtksourceview4-4.8.4' WARNING: gtksourceview5-5.18.0-r0 do_unpack: gtksourceview5: the directory ${UNPACKDIR}/${BP} (<snip>/gtksourceview5/5.18.0/sources/gtksourceview5-5.18.0) pointed to by the S variable doesn't exist - please set S within the recipe to point to where the source has been unpacked to WARNING: gtksourceview5-5.18.0-r0 do_populate_lic: Could not copy license file <snip>/gtksourceview5/5.18.0/sources/gtksourceview5-5.18.0/COPYING to <snip>/gtksourceview5/5.18.0/license-destdir/corei7-64/gtksourceview5/COPYING: [Errno 2] No such file or directory: '<snip>/gtksourceview5/5.18.0/sources/gtksourceview5-5.18.0/COPYING' ERROR: gtksourceview5-5.18.0-r0 do_populate_lic: QA Issue: gtksourceview5: LIC_FILES_CHKSUM points to an invalid file: <snip>/gtksourceview5/5.18.0/sources/gtksourceview5-5.18.0/COPYING [license-checksum] ERROR: gtksourceview5-5.18.0-r0 do_populate_lic: Fatal QA errors were found, failing task. Signed-off-by: Peter Bergin <peter@berginkonsult.se> --- meta-gnome/recipes-gnome/gtksourceview/gtksourceview3_3.24.11.bb | 1 + meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.8.4.bb | 1 + meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.18.0.bb | 1 + 3 files changed, 3 insertions(+)