diff mbox series

libmatchbox: fix version mismatch

Message ID 20250430003941.561146-1-yi.zhao@windriver.com
State New
Headers show
Series libmatchbox: fix version mismatch | expand

Commit Message

Yi Zhao April 30, 2025, 12:39 a.m. UTC 
Backport a patch to update version to 1.13 to match current version.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 ...ate-version-to-match-the-tag-version.patch | 30 +++++++++++++++++++
 .../libmatchbox/libmatchbox_1.13.bb           |  3 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/libmatchbox/files/0001-configure.ac-update-version-to-match-the-tag-version.patch

Comments

Gyorgy Sarvari April 30, 2025, 8:32 a.m. UTC | #1 
On 4/30/25 02:39, Yi Zhao via lists.openembedded.org wrote:
> Backport a patch to update version to 1.13 to match current version.
>
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
>  ...ate-version-to-match-the-tag-version.patch | 30 +++++++++++++++++++
>  .../libmatchbox/libmatchbox_1.13.bb           |  3 +-
>  2 files changed, 32 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-graphics/libmatchbox/files/0001-configure.ac-update-version-to-match-the-tag-version.patch
>
> diff --git a/meta/recipes-graphics/libmatchbox/files/0001-configure.ac-update-version-to-match-the-tag-version.patch b/meta/recipes-graphics/libmatchbox/files/0001-configure.ac-update-version-to-match-the-tag-version.patch
> new file mode 100644
> index 0000000000..093adc89ae
> --- /dev/null
> +++ b/meta/recipes-graphics/libmatchbox/files/0001-configure.ac-update-version-to-match-the-tag-version.patch
> @@ -0,0 +1,30 @@
> +From 18a5c0969cdf2e6e2e20ad29e7b23c6fb58dcd6c Mon Sep 17 00:00:00 2001
> +From: Yi Zhao <yi.zhao@eng.windriver.com>
> +Date: Tue, 29 Apr 2025 10:25:29 +0800
> +Subject: [PATCH] configure.ac: update version to match the tag version
> +
> +Update version to 1.13 to match the current tag.
> +
> +Upstream-Status: Backport
> +[https://git.yoctoproject.org/libmatchbox/commit/?id=18a5c0969cdf2e6e2e20ad29e7b23c6fb58dcd6c]
> +
> +Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> +---
> + configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/configure.ac b/configure.ac
> +index ab9f60f..0ef4977 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -1,5 +1,5 @@
> + AC_PREREQ(2.53)
> +-AC_INIT([libmatchbox], 1.12, [yocto@yoctoproject.org])
> ++AC_INIT([libmatchbox], 1.13, [yocto@yoctoproject.org])
> + AC_CONFIG_SRCDIR([libmb/mbtray.c])
> + 
> + AC_CONFIG_AUX_DIR(.)
> +-- 
> +2.34.1
> +

I wonder if instead of carrying a patch in master branch for a
Yocto-internal project wouldn't it be better to create a new tag with
the correct version info.

> diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb
> index f212eb5e96..af3aa23110 100644
> --- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb
> +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb
> @@ -14,7 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=87712c91ca9a2c2d475a0604c00f8f54 \
>  DEPENDS = "virtual/libx11 libxext"
>  
>  SRCREV = "35cd78efa3120efc46497f55c04382be960d1864"
> -SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https;tag=${PV}"
> +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https;tag=${PV} \
> +           file://0001-configure.ac-update-version-to-match-the-tag-version.patch"
>  
>  S = "${WORKDIR}/git"
>
Richard Purdie April 30, 2025, 10:20 a.m. UTC | #2 
On Wed, 2025-04-30 at 10:32 +0200, Gyorgy Sarvari via
lists.openembedded.org wrote:
On 4/30/25 02:39, Yi Zhao via lists.openembedded.org wrote:
Backport a patch to update version to 1.13 to match current version.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 ...ate-version-to-match-the-tag-version.patch | 30 +++++++++++++++++++
 .../libmatchbox/libmatchbox_1.13.bb           |  3 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-graphics/libmatchbox/files/0001-
configure.ac-update-version-to-match-the-tag-version.patch

diff --git a/meta/recipes-graphics/libmatchbox/files/0001-configure.ac-
update-version-to-match-the-tag-version.patch b/meta/recipes-
graphics/libmatchbox/files/0001-configure.ac-update-version-to-match-
the-tag-version.patch
new file mode 100644
index 0000000000..093adc89ae
--- /dev/null
+++ b/meta/recipes-graphics/libmatchbox/files/0001-configure.ac-update-
version-to-match-the-tag-version.patch
@@ -0,0 +1,30 @@
+From 18a5c0969cdf2e6e2e20ad29e7b23c6fb58dcd6c Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@eng.windriver.com>
+Date: Tue, 29 Apr 2025 10:25:29 +0800
+Subject: [PATCH] configure.ac: update version to match the tag version
+
+Update version to 1.13 to match the current tag.
+
+Upstream-Status: Backport
+[https://git.yoctoproject.org/libmatchbox/commit/?id=18a5c0969cdf2e6e2
e20ad29e7b23c6fb58dcd6c]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ab9f60f..0ef4977 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_PREREQ(2.53)
+-AC_INIT([libmatchbox], 1.12, [yocto@yoctoproject.org])
++AC_INIT([libmatchbox], 1.13, [yocto@yoctoproject.org])
+ AC_CONFIG_SRCDIR([libmb/mbtray.c])
+ 
+ AC_CONFIG_AUX_DIR(.)
+-- 
+2.34.1
+

I wonder if instead of carrying a patch in master branch for a
Yocto-internal project wouldn't it be better to create a new tag with
the correct version info.

FWIW I agree. I'll create a 1.14.

Cheers,

Richard
> 
>
diff mbox series

Patch

diff --git a/meta/recipes-graphics/libmatchbox/files/0001-configure.ac-update-version-to-match-the-tag-version.patch b/meta/recipes-graphics/libmatchbox/files/0001-configure.ac-update-version-to-match-the-tag-version.patch
new file mode 100644
index 0000000000..093adc89ae
--- /dev/null
+++ b/meta/recipes-graphics/libmatchbox/files/0001-configure.ac-update-version-to-match-the-tag-version.patch
@@ -0,0 +1,30 @@ 
+From 18a5c0969cdf2e6e2e20ad29e7b23c6fb58dcd6c Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@eng.windriver.com>
+Date: Tue, 29 Apr 2025 10:25:29 +0800
+Subject: [PATCH] configure.ac: update version to match the tag version
+
+Update version to 1.13 to match the current tag.
+
+Upstream-Status: Backport
+[https://git.yoctoproject.org/libmatchbox/commit/?id=18a5c0969cdf2e6e2e20ad29e7b23c6fb58dcd6c]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ab9f60f..0ef4977 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_PREREQ(2.53)
+-AC_INIT([libmatchbox], 1.12, [yocto@yoctoproject.org])
++AC_INIT([libmatchbox], 1.13, [yocto@yoctoproject.org])
+ AC_CONFIG_SRCDIR([libmb/mbtray.c])
+ 
+ AC_CONFIG_AUX_DIR(.)
+-- 
+2.34.1
+
diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb
index f212eb5e96..af3aa23110 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.13.bb
@@ -14,7 +14,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=87712c91ca9a2c2d475a0604c00f8f54 \
 DEPENDS = "virtual/libx11 libxext"
 
 SRCREV = "35cd78efa3120efc46497f55c04382be960d1864"
-SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https;tag=${PV}"
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https;tag=${PV} \
+           file://0001-configure.ac-update-version-to-match-the-tag-version.patch"
 
 S = "${WORKDIR}/git"