diff mbox series

[meta-networking] libcacard: fix version string in libcacard.pc

Message ID 20231123123302.1989816-1-f_l_k@t-online.de
State Accepted
Headers show
Series [meta-networking] libcacard: fix version string in libcacard.pc | expand

Commit Message

Markus Volk Nov. 23, 2023, 12:33 p.m. UTC 
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...n.build-set-hardcoded-version-string.patch | 34 +++++++++++++++++++
 .../recipes-support/spice/libcacard_2.8.1.bb  |  5 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch

Comments

Khem Raj Nov. 26, 2023, 6:39 p.m. UTC | #1 
On Thu, 23 Nov 2023 13:33:02 +0100, Markus Volk wrote:
> 


Applied, thanks!

[1/1] libcacard: fix version string in libcacard.pc
      commit: 45ce72729513da4aaa0033ad767c25ff5840f751

Best regards,
diff mbox series

Patch

diff --git a/meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch b/meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch
new file mode 100644
index 000000000..b9d31c458
--- /dev/null
+++ b/meta-networking/recipes-support/spice/libcacard/0001-meson.build-set-hardcoded-version-string.patch
@@ -0,0 +1,34 @@ 
+From dbfc08b9dc879e21bfacbd153948d21db36d50cd Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Thu, 23 Nov 2023 13:20:40 +0100
+Subject: [PATCH] meson.build: set hardcoded version string
+
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
+
+This fixes version string in the pkgconfig file and thus unbreaks spice build
+| spice-common| Run-time dependency libcacard found: NO
+| 
+| ../git/subprojects/spice-common/meson.build:144:16: ERROR: Dependency lookup for libcacard with method 'pkgconfig' failed: Invalid version, need 'libcacard' ['>= 2.5.1'] found 'UNKNOWN'.
+| 
+| A full log can be found at /home/flk/poky/build/tmp/work/corei7-64-poky-linux/spice/0.15.2/build/meson-logs/meson-log.txt
+| ERROR: meson failed
+
+Upstream-Status: Inappropriate [oe-specific]
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 9cfe248..00745e5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,5 +1,5 @@
+ project('libcacard', 'c', 'cpp',
+-  version: run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), check: true).stdout().strip(),
++  version: '2.8.1',
+   license: 'LGPLv2.1',
+   default_options: ['warning_level=2'],
+ )
+-- 
+2.42.0
+
diff --git a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
index c81322e68..44cccba9d 100644
--- a/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
+++ b/meta-networking/recipes-support/spice/libcacard_2.8.1.bb
@@ -6,7 +6,10 @@  DEPENDS = "glib-2.0 pcsc-lite nss"
 
 SRCREV = "7b07684ea6698d4885ff2062350ad8798a04de42"
 
-SRC_URI = "git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master"
+SRC_URI = " \
+	git://gitlab.freedesktop.org/spice/libcacard.git;protocol=https;branch=master \
+	file://0001-meson.build-set-hardcoded-version-string.patch \
+"
 
 S = "${WORKDIR}/git"