mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
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>
This commit is contained in:
Markus Volk
Khem Raj
+82
@@ -0,0 +1,82 @@
|
||||
From d798af685e9e1166400acbdab082c17b02dad85b Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 18 May 2023 23:28:10 -0700
|
||||
Subject: [PATCH] Remove builddir and srcdir paths from test binaries
|
||||
|
||||
Encoding buildtime paths is not needed since if these tests are to be
|
||||
run they will be run on target where builddir structure most certainly
|
||||
wont be available.
|
||||
|
||||
Fixes
|
||||
WARNING: libpeas-1.36.0-r0 do_package_qa: QA Issue: File /usr/bin/peas-demo in package libpeas-demo contains reference to TMPDIR [buildpaths]
|
||||
|
||||
Upstream-Status: Inappropriate [Cross-compile specific]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
peas-demo/meson.build | 2 +-
|
||||
tests/libpeas-gtk/testing/meson.build | 4 ++--
|
||||
tests/libpeas/testing/meson.build | 4 ++--
|
||||
tests/testing-util/meson.build | 4 ++--
|
||||
4 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/peas-demo/meson.build b/peas-demo/meson.build
|
||||
index a3ec53b..855ebf2 100644
|
||||
--- a/peas-demo/meson.build
|
||||
+++ b/peas-demo/meson.build
|
||||
@@ -9,7 +9,7 @@ peas_demo_c = [
|
||||
|
||||
peas_demo_c_args = [
|
||||
'-DHAVE_CONFIG_H',
|
||||
- '-DPEAS_BUILDDIR="@0@"'.format(builddir),
|
||||
+ '-DPEAS_BUILDDIR="/usr/src/debug/libpeas"',
|
||||
'-DPEAS_PREFIX="@0@"'.format(prefix),
|
||||
'-DPEAS_LIBDIR="@0@"'.format(libdir),
|
||||
]
|
||||
diff --git a/tests/libpeas-gtk/testing/meson.build b/tests/libpeas-gtk/testing/meson.build
|
||||
index 646f42d..fd9a692 100644
|
||||
--- a/tests/libpeas-gtk/testing/meson.build
|
||||
+++ b/tests/libpeas-gtk/testing/meson.build
|
||||
@@ -19,8 +19,8 @@ libpeas_gtk_testing_deps = [
|
||||
|
||||
libpeas_gtk_testing_c_args = [
|
||||
'-DHAVE_CONFIG_H',
|
||||
- '-DBUILDDIR="@0@"'.format(builddir),
|
||||
- '-DSRCDIR="@0@"'.format(srcdir),
|
||||
+ '-DBUILDDIR="/usr/src/debug/libpeas"',
|
||||
+ '-DSRCDIR="/usr/src/debug/libpeas"',
|
||||
]
|
||||
|
||||
libpeas_gtk_testing_lib = library(
|
||||
diff --git a/tests/libpeas/testing/meson.build b/tests/libpeas/testing/meson.build
|
||||
index 74ba7b1..084daa9 100644
|
||||
--- a/tests/libpeas/testing/meson.build
|
||||
+++ b/tests/libpeas/testing/meson.build
|
||||
@@ -21,8 +21,8 @@ libpeas_testing_deps = [
|
||||
|
||||
libpeas_testing_c_args = [
|
||||
'-DHAVE_CONFIG_H',
|
||||
- '-DBUILDDIR="@0@"'.format(builddir),
|
||||
- '-DSRCDIR="@0@"'.format(srcdir),
|
||||
+ '-DBUILDDIR="/usr/src/debug/libpeas"',
|
||||
+ '-DSRCDIR="/usr/src/debug/libpeas"',
|
||||
]
|
||||
|
||||
libpeas_testing_lib = library(
|
||||
diff --git a/tests/testing-util/meson.build b/tests/testing-util/meson.build
|
||||
index 1c40740..83ad059 100644
|
||||
--- a/tests/testing-util/meson.build
|
||||
+++ b/tests/testing-util/meson.build
|
||||
@@ -17,8 +17,8 @@ libtesting_util_deps = [
|
||||
|
||||
libtesting_util_c_args = [
|
||||
'-DHAVE_CONFIG_H',
|
||||
- '-DBUILDDIR="@0@"'.format(builddir),
|
||||
- '-DSRCDIR="@0@"'.format(srcdir),
|
||||
+ '-DBUILDDIR="/usr/src/debug/libpeas"',
|
||||
+ '-DSRCDIR="/usr/src/debug/libpeas"',
|
||||
'-UG_DISABLE_ASSERT',
|
||||
'-UG_DISABLE_CAST_CHECKS',
|
||||
]
|
||||
--
|
||||
2.40.1
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
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 = "gtk+3"
|
||||
|
||||
GTKDOC_MESON_OPTION = "gtk_doc"
|
||||
|
||||
inherit gnomebase gobject-introspection gi-docgen gtk-icon-cache features_check
|
||||
|
||||
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"
|
||||
|
||||
PACKAGES =+ "${PN}-demo ${PN}-python3"
|
||||
FILES:${PN}-demo = " \
|
||||
${bindir}/peas-demo \
|
||||
${libdir}/peas-demo \
|
||||
"
|
||||
|
||||
RDEPENDS:${PN}-python3 = "python3-pygobject"
|
||||
FILES:${PN}-python3 = "${libdir}/libpeas-1.0/loaders/libpython3loader.so"
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user