diff mbox series

[meta-oe,PATCHv4] libpeas: add recipe for 2.0.5

Message ID 20241216222303.84194-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-oe,PATCHv4] libpeas: add recipe for 2.0.5 | expand

Commit Message

Markus Volk Dec. 16, 2024, 10:23 p.m. UTC
- 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>
---
 ...-and-srcdir-paths-from-test-binaries.patch |  0
 .../recipes-gnome/libpeas/libpeas-1_1.36.0.bb |  2 +
 .../libpeas/libpeas/disable-lgi-check.patch   | 37 +++++++++++++++++++
 .../recipes-gnome/libpeas/libpeas_2.0.5.bb    | 20 ++++++++++
 4 files changed, 59 insertions(+)
 rename {meta-oe/recipes-gnome/libpeas/libpeas => meta-gnome/recipes-gnome/libpeas/libpeas-1}/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch (100%)
 rename meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb => meta-gnome/recipes-gnome/libpeas/libpeas-1_1.36.0.bb (88%)
 create mode 100644 meta-gnome/recipes-gnome/libpeas/libpeas/disable-lgi-check.patch
 create mode 100644 meta-gnome/recipes-gnome/libpeas/libpeas_2.0.5.bb
diff mbox series

Patch

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
similarity index 100%
rename from meta-oe/recipes-gnome/libpeas/libpeas/0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch
rename to 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
similarity index 88%
rename from meta-oe/recipes-gnome/libpeas/libpeas_1.36.0.bb
rename to 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}"
 # FIXME: When upgrading to libpeas 2, g-i is no longer needed.
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 
+SRC_URI = "https://download.gnome.org/sources/libpeas/1.36/libpeas-${PV}.tar.xz;name=archive"
 SRC_URI += "file://0001-Remove-builddir-and-srcdir-paths-from-test-binaries.patch"
 SRC_URI[archive.sha256sum] = "297cb9c2cccd8e8617623d1a3e8415b4530b8e5a893e3527bbfd1edd13237b4c"
+S = "${UNPACKDIR}/libpeas-${PV}"
 
 PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject"
 
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 @@ 
+From c9bb8f5c730745b48eb86404d0297ebc15bf9fa7 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Mon, 16 Dec 2024 12:22:49 +0100
+Subject: [PATCH] meson
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+---
+ meson.build | 11 +++++----------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index a8100af..0fb15d2 100644
+--- a/meson.build
++++ b/meson.build
+@@ -209,14 +209,9 @@ if lua_found
+     else
+         lua_prg = lua51_prg
+     endif
+-    lua_lgi_check = run_command(lua_prg, ['-e', 'print(require("lgi")._VERSION)'])
+-    if lua_lgi_check.returncode() == 0
+-        lua_lgi_ver = lua_lgi_check.stdout().strip()
+-        if lua_lgi_ver.version_compare(lua_lgi_req)
+-            lua51_lgi_dep = declare_dependency(version: lua_lgi_ver)
+-            lua_lgi_found = true
+-        endif
+-    endif
++    lua_lgi_ver = '0.9.0'
++    lua_lgi_found = true
++    lua51_lgi_dep = declare_dependency(version: lua_lgi_ver)
+     message('lua-lgi version: ' + lua_lgi_ver)
+ endif
+ 
+-- 
+2.47.0
+
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 @@ 
+SUMMARY = "libpeas is a gobject-based plugins engine"
+HOMEPAGE = "https://wiki.gnome.org/Projects/Libpeas"
+LICENSE = "LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4b54a1fd55a448865a0b32d41598759d"
+
+DEPENDS = "glib-2.0"
+
+inherit gnomebase gobject-introspection vala gi-docgen
+
+SRC_URI += "file://disable-lgi-check.patch"
+SRC_URI[archive.sha256sum] = "376f2f73d731b54e13ddbab1d91b6382cf6a980524def44df62add15489de6dd"
+
+PACKAGECONFIG ?= "python3 gjs lua51 ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection', 'vala', '', d)}"
+PACKAGECONFIG[python3] = "-Dpython3=true,-Dpython3=false,python3-pygobject,python3-pygobject"
+PACKAGECONFIG[gjs] = "-Dgjs=true,-Dgjs=false,gjs mozjs-128"
+PACKAGECONFIG[lua51] = "-Dlua51=true,-Dlua51=false,luajit luajit-native,lua-lgi"
+PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
+
+FILES:${PN} += "${libdir}/libpeas-2"
+