summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorMarkus Volk <f_l_k@t-online.de>2024-12-16 23:23:03 +0100
committerKhem Raj <raj.khem@gmail.com>2024-12-19 09:41:21 -0800
commitd89fc6ffbdf8f947643def51b804052bb5e7ac97 (patch)
treeb22dbdf3a831ffde7e58515489a7543a132a1254 /meta-gnome
parent1bf9854163b2e09a570dd863449f1959bea242b0 (diff)
downloadmeta-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>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/libpeas/libpeas-1/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch82
-rw-r--r--meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb30
-rw-r--r--meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch37
-rw-r--r--meta-gnome/recipes-gnome/libpeas/libpeas_2.0.5.bb20
4 files changed, 169 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas-1/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
new file mode 100644
index 0000000000..6bb48777ec
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libpeas/libpeas-1/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
@@ -0,0 +1,82 @@
1From d798af685e9e1166400acbdab082c17b02dad85b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 18 May 2023 23:28:10 -0700
4Subject: [PATCH] Remove builddir and srcdir paths from test binaries
5
6Encoding buildtime paths is not needed since if these tests are to be
7run they will be run on target where builddir structure most certainly
8wont be available.
9
10Fixes
11WARNING: libpeas-1.36.0-r0 do_package_qa: QA Issue: File /usr/bin/peas-demo in package libpeas-demo contains reference to TMPDIR [buildpaths]
12
13Upstream-Status: Inappropriate [Cross-compile specific]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 peas-demo/meson.build | 2 +-
17 tests/libpeas-gtk/testing/meson.build | 4 ++--
18 tests/libpeas/testing/meson.build | 4 ++--
19 tests/testing-util/meson.build | 4 ++--
20 4 files changed, 7 insertions(+), 7 deletions(-)
21
22diff --git a/peas-demo/meson.build b/peas-demo/meson.build
23index a3ec53b..855ebf2 100644
24--- a/peas-demo/meson.build
25+++ b/peas-demo/meson.build
26@@ -9,7 +9,7 @@ peas_demo_c = [
27
28 peas_demo_c_args = [
29 '-DHAVE_CONFIG_H',
30- '-DPEAS_BUILDDIR="@0@"'.format(builddir),
31+ '-DPEAS_BUILDDIR="/usr/src/debug/libpeas"',
32 '-DPEAS_PREFIX="@0@"'.format(prefix),
33 '-DPEAS_LIBDIR="@0@"'.format(libdir),
34 ]
35diff --git a/tests/libpeas-gtk/testing/meson.build b/tests/libpeas-gtk/testing/meson.build
36index 646f42d..fd9a692 100644
37--- a/tests/libpeas-gtk/testing/meson.build
38+++ b/tests/libpeas-gtk/testing/meson.build
39@@ -19,8 +19,8 @@ libpeas_gtk_testing_deps = [
40
41 libpeas_gtk_testing_c_args = [
42 '-DHAVE_CONFIG_H',
43- '-DBUILDDIR="@0@"'.format(builddir),
44- '-DSRCDIR="@0@"'.format(srcdir),
45+ '-DBUILDDIR="/usr/src/debug/libpeas"',
46+ '-DSRCDIR="/usr/src/debug/libpeas"',
47 ]
48
49 libpeas_gtk_testing_lib = library(
50diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build
51index 74ba7b1..084daa9 100644
52--- a/tests/libpeas/testing/meson.build
53+++ b/tests/libpeas/testing/meson.build
54@@ -21,8 +21,8 @@ libpeas_testing_deps = [
55
56 libpeas_testing_c_args = [
57 '-DHAVE_CONFIG_H',
58- '-DBUILDDIR="@0@"'.format(builddir),
59- '-DSRCDIR="@0@"'.format(srcdir),
60+ '-DBUILDDIR="/usr/src/debug/libpeas"',
61+ '-DSRCDIR="/usr/src/debug/libpeas"',
62 ]
63
64 libpeas_testing_lib = library(
65diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build
66index 1c40740..83ad059 100644
67--- a/tests/testing-util/meson.build
68+++ b/tests/testing-util/meson.build
69@@ -17,8 +17,8 @@ libtesting_util_deps = [
70
71 libtesting_util_c_args = [
72 '-DHAVE_CONFIG_H',
73- '-DBUILDDIR="@0@"'.format(builddir),
74- '-DSRCDIR="@0@"'.format(srcdir),
75+ '-DBUILDDIR="/usr/src/debug/libpeas"',
76+ '-DSRCDIR="/usr/src/debug/libpeas"',
77 '-UG_DISABLE_ASSERT',
78 '-UG_DISABLE_CAST_CHECKS',
79 ]
80--
812.40.1
82
diff --git a/meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb b/meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb
new file mode 100644
index 0000000000..c0b785fee7
--- /dev/null
+++ b/meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb
@@ -0,0 +1,30 @@
1SUMMARY = "libpeas is a gobject-based plugins engine"
2HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas"
3LICENSE = "LGPL-2.1-or-later"
4LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
5
6DEPENDS = "gtk+3"
7
8GTKDOC_MESON_OPTION = "gtk_doc"
9
10inherit gnomebase gobject-introspection gi-docgen gtk-icon-cache features_check
11
12ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
13# FIXME: When upgrading to libpeas 2, g-i is no longer needed.
14REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
15
16SRC_URI = "https://download.gnome.org/sources/libpeas/1.36/libpeas-${PV}.tar.xz;name=archive"
17SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch"
18SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
19S = "${UNPACKDIR}/libpeas-${PV}"
20
21PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject"
22
23PACKAGES =+ "${PN}-demo ${PN}-python3"
24FILES:${PN}-demo = " \
25 ${bindir}/peas-demo \
26 ${libdir}/peas-demo \
27"
28
29RDEPENDS:${PN}-python3 = "python3-pygobject"
30FILES:${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so"
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 @@
1From c9bb8f5c730745b48eb86404d0297ebc15bf9fa7 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Mon, 16 Dec 2024 12:22:49 +0100
4Subject: [PATCH] meson
5
6Upstream-Status: Inappropriate [oe-specific]
7
8Signed-off-by: Markus Volk <f_l_k@t-online.de>
9---
10 meson.build | 11 +++++----------
11 1 file changed, 3 insertions(+), 8 deletions(-)
12
13diff --git a/meson.build b/meson.build
14index 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--
362.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 @@
1SUMMARY = "libpeas is a gobject-based plugins engine"
2HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas"
3LICENSE = "LGPL-2.1-or-later"
4LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
5
6DEPENDS = "glib-2.0"
7
8inherit gnomebase gobject-introspection vala gi-docgen
9
10SRC_URI += "file://disable-lgi-check.patch"
11SRC_URI[archive.sha256sum] = "376f2f73d731b54e13ddbab1d91b6382cf6a980524def44df62add15489de6dd"
12
13PACKAGECONFIG ?= "python3 gjs lua51 ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection', 'vala', '', d)}"
14PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject,python3-pygobject"
15PACKAGECONFIG[gjs] = "-Dgjs=true,-Dgjs=false,gjs mozjs-128"
16PACKAGECONFIG[lua51] = "-Dlua51=true,-Dlua51=false,luajit luajit-native,lua-lgi"
17PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
18
19FILES:${PN} += "${libdir}/libpeas-2"
20