diff --git a/recipes-extended/gmobile/gmobile/0001-meson.build-create-a-pkgconfig-.pc-file.patch b/recipes-extended/gmobile/gmobile/0001-meson.build-create-a-pkgconfig-.pc-file.patch deleted file mode 100644 index 8140176..0000000 --- a/recipes-extended/gmobile/gmobile/0001-meson.build-create-a-pkgconfig-.pc-file.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a9c5d3add6550e27636de3ef86d6eb8bad41874d Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Tue, 15 Aug 2023 07:36:31 +0200 -Subject: [PATCH] meson.build: add a pkgconfig .pc file - - - fix version - - build shared lib and install - - install headers - -Upstream-Status: Inappropriate - -Signed-off-by: Markus Volk ---- - meson.build | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index e9f6c62..7e94496 100644 ---- a/meson.build -+++ b/meson.build -@@ -99,3 +99,7 @@ summary({ - bool_yn: true, - section: 'Build', - ) -+ -+install_headers('src/gmobile.h' , 'src/gm-cutout.h', 'src/gm-device-info.h', 'src/gm-device-tree.h', 'src/gm-display-panel.h', 'src/gm-error.h', 'src/gm-main.h', 'src/gm-timeout.h', 'src/gm-rect.h') -+pkg = import('pkgconfig') -+pkg.generate(gm_lib) -diff --git a/src/meson.build b/src/meson.build -index ee98a39..8d8fd7d 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -37,12 +37,15 @@ gm_c_args = [ - '-DG_LOG_DOMAIN="gmobile"', - ] - --gm_lib = static_library( -+gm_lib = shared_library( - 'gmobile', - gm_sources, - include_directories: root_inc, - c_args: gm_c_args, -- dependencies: gm_deps) -+ dependencies: gm_deps, -+ version: meson.project_version(), -+ install: true, -+) - - gmobile_dep = declare_dependency( - include_directories: [root_inc, include_directories('.')], --- -2.41.0 - diff --git a/recipes-extended/gmobile/gmobile_git.bb b/recipes-extended/gmobile/gmobile_git.bb index ef08d2c..2ec1db0 100644 --- a/recipes-extended/gmobile/gmobile_git.bb +++ b/recipes-extended/gmobile/gmobile_git.bb @@ -2,17 +2,14 @@ SUMMARY = "gmobile carries some helpers for GNOME on mobile devices" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://src/gm-cutout.c;beginline=1;endline=5;md5=fdd1e77039fe571c0c9aa6280a7e7903" -inherit meson pkgconfig +inherit meson pkgconfig gobject-introspection DEPENDS = "glib-2.0 json-glib" -SRC_URI = " \ - git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main \ - file://0001-meson.build-create-a-pkgconfig-.pc-file.patch \ -" +SRC_URI = "git://gitlab.gnome.org/World/Phosh/gmobile.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "d5ed9ed758bf0deeb050d861fb08518295a42767" -PV = "0.0.4" +SRCREV = "3f3a8c70f6106e00388075c77982876857b321d8" +PV = "0.2.0" do_install:append() { install -m 0644 ${B}/gm-config.h ${D}${includedir}