diff options
| author | Markus Volk <f_l_k@t-online.de> | 2024-12-16 23:23:03 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-12-19 09:41:21 -0800 |
| commit | d89fc6ffbdf8f947643def51b804052bb5e7ac97 (patch) | |
| tree | b22dbdf3a831ffde7e58515489a7543a132a1254 | |
| parent | 1bf9854163b2e09a570dd863449f1959bea242b0 (diff) | |
| download | meta-openembedded-d89fc6ffbdf8f947643def51b804052bb5e7ac97.tar.gz | |
libpeas: add recipe for 2.0.5
- Drop 0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
peas-demo is not built anymore
- Add patch to disable the broken check for lgi
lgi does not support pkgconfig but it hasn't changed version since 2017
- Remove gtk+3 from depends and dont inherit gtk-icon-cache to not pull it
in again indirectly
- g-i is not required anymore and will be built depending on DISTRO_FEATURES
- Dont package the loaders into separate packages to reduce required RDEPENDS.
If a loader is not wanted on target it will be better to remove the according
PACKAGECONFIG option to also remove the dependencies?
- Move libpeas recipe to meta-gnome
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-gnome/recipes-gnome/libpeas/libpeas-1/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch (renamed from meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch) | 0 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb (renamed from meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb) | 2 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch | 37 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/libpeas/libpeas_2.0.5.bb | 20 |
4 files changed, 59 insertions, 0 deletions
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch b/meta-gnome/recipes-gnome/libpeas/libpeas-1/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch index 6bb48777ec..6bb48777ec 100644 --- a/meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch +++ b/meta-gnome/recipes-gnome/libpeas/libpeas-1/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch | |||
diff --git a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb b/meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb index 016981f04d..c0b785fee7 100644 --- a/meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb +++ b/meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb | |||
| @@ -13,8 +13,10 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | |||
| 13 | # FIXME: When upgrading to libpeas 2, g-i is no longer needed. | 13 | # FIXME: When upgrading to libpeas 2, g-i is no longer needed. |
| 14 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" | 14 | REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" |
| 15 | 15 | ||
| 16 | SRC_URI = "https://download.gnome.org/sources/libpeas/1.36/libpeas-${PV}.tar.xz;name=archive" | ||
| 16 | SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch" | 17 | SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch" |
| 17 | SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c" | 18 | SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c" |
| 19 | S = "${UNPACKDIR}/libpeas-${PV}" | ||
| 18 | 20 | ||
| 19 | PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" | 21 | PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject" |
| 20 | 22 | ||
diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch b/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch new file mode 100644 index 0000000000..9ed7adb8ce --- /dev/null +++ b/meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch | |||
| @@ -0,0 +1,37 @@ | |||
| 1 | From c9bb8f5c730745b48eb86404d0297ebc15bf9fa7 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Markus Volk <f_l_k@t-online.de> | ||
| 3 | Date: Mon, 16 Dec 2024 12:22:49 +0100 | ||
| 4 | Subject: [PATCH] meson | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [oe-specific] | ||
| 7 | |||
| 8 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
| 9 | --- | ||
| 10 | meson.build | 11 +++++---------- | ||
| 11 | 1 file changed, 3 insertions(+), 8 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/meson.build b/meson.build | ||
| 14 | index a8100af..0fb15d2 100644 | ||
| 15 | --- a/meson.build | ||
| 16 | +++ b/meson.build | ||
| 17 | @@ -209,14 +209,9 @@ if lua_found | ||
| 18 | else | ||
| 19 | lua_prg = lua51_prg | ||
| 20 | endif | ||
| 21 | - lua_lgi_check = run_command(lua_prg, ['-e', 'print(require("lgi")._VERSION)']) | ||
| 22 | - if lua_lgi_check.returncode() == 0 | ||
| 23 | - lua_lgi_ver = lua_lgi_check.stdout().strip() | ||
| 24 | - if lua_lgi_ver.version_compare(lua_lgi_req) | ||
| 25 | - lua51_lgi_dep = declare_dependency(version: lua_lgi_ver) | ||
| 26 | - lua_lgi_found = true | ||
| 27 | - endif | ||
| 28 | - endif | ||
| 29 | + lua_lgi_ver = '0.9.0' | ||
| 30 | + lua_lgi_found = true | ||
| 31 | + lua51_lgi_dep = declare_dependency(version: lua_lgi_ver) | ||
| 32 | message('lua-lgi version: ' + lua_lgi_ver) | ||
| 33 | endif | ||
| 34 | |||
| 35 | -- | ||
| 36 | 2.47.0 | ||
| 37 | |||
diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas_2.0.5.bb b/meta-gnome/recipes-gnome/libpeas/libpeas_2.0.5.bb new file mode 100644 index 0000000000..8c7d364765 --- /dev/null +++ b/meta-gnome/recipes-gnome/libpeas/libpeas_2.0.5.bb | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | SUMMARY = "libpeas is a gobject-based plugins engine" | ||
| 2 | HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas" | ||
| 3 | LICENSE = "LGPL-2.1-or-later" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d" | ||
| 5 | |||
| 6 | DEPENDS = "glib-2.0" | ||
| 7 | |||
| 8 | inherit gnomebase gobject-introspection vala gi-docgen | ||
| 9 | |||
| 10 | SRC_URI += "file://disable-lgi-check.patch" | ||
| 11 | SRC_URI[archive.sha256sum] = "376f2f73d731b54e13ddbab1d91b6382cf6a980524def44df62add15489de6dd" | ||
| 12 | |||
| 13 | PACKAGECONFIG ?= "python3 gjs lua51 ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection', 'vala', '', d)}" | ||
| 14 | PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject,python3-pygobject" | ||
| 15 | PACKAGECONFIG[gjs] = "-Dgjs=true,-Dgjs=false,gjs mozjs-128" | ||
| 16 | PACKAGECONFIG[lua51] = "-Dlua51=true,-Dlua51=false,luajit luajit-native,lua-lgi" | ||
| 17 | PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" | ||
| 18 | |||
| 19 | FILES:${PN} += "${libdir}/libpeas-2" | ||
| 20 | |||
