commit: 4b7d4206b3c5414c6002ea06d388b1fb5c2a9621 Author: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com> AuthorDate: Tue Jul 2 15:28:40 2024 +0000 Commit: Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com> CommitDate: Tue Jul 2 15:28:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b7d4206
dev-libs/libtypec: add two more meson build fixes These are based on mturner's feedback on https://github.com/gentoo/gentoo/pull/36736 and should land soon upstream. Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com> .../libtypec-0.5.2-fix-meson-release-version.patch | 29 ++++++++++++++++++++++ ...typec-0.5.2-meson.build-fix-soversion-5-0.patch | 26 +++++++++++++++++++ ...ec-0.5.2-r1.ebuild => libtypec-0.5.2-r2.ebuild} | 5 ++++ 3 files changed, 60 insertions(+) diff --git a/dev-libs/libtypec/files/libtypec-0.5.2-fix-meson-release-version.patch b/dev-libs/libtypec/files/libtypec-0.5.2-fix-meson-release-version.patch new file mode 100644 index 000000000..7d744748b --- /dev/null +++ b/dev-libs/libtypec/files/libtypec-0.5.2-fix-meson-release-version.patch @@ -0,0 +1,29 @@ +From 3d9d6bf5c8e703b92e8779e67f05685630c782c3 Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu <adrian.ra...@collabora.com> +Date: Mon, 1 Jul 2024 19:01:25 +0300 +Subject: [PATCH] meson.build: fix 0.5.1 -> 0.5.2 release version + +0.5.2 was released, however only the version in +CMakeLists was bumped. Bump the version in meson +as well. + +Signed-off-by: Adrian Ratiu <adrian.ra...@collabora.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 903c506..3f95774 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,6 +1,6 @@ + project('libtypec','c', + license: 'MIT', +-version: '0.5.1', ++version: '0.5.2', + default_options : [ + 'warning_level=0']) + +-- +2.44.2 + diff --git a/dev-libs/libtypec/files/libtypec-0.5.2-meson.build-fix-soversion-5-0.patch b/dev-libs/libtypec/files/libtypec-0.5.2-meson.build-fix-soversion-5-0.patch new file mode 100644 index 000000000..2b5035045 --- /dev/null +++ b/dev-libs/libtypec/files/libtypec-0.5.2-meson.build-fix-soversion-5-0.patch @@ -0,0 +1,26 @@ +From f16b1bf3c938523dd896d738508586823b01170b Mon Sep 17 00:00:00 2001 +From: Adrian Ratiu <adrian.ra...@collabora.com> +Date: Tue, 2 Jul 2024 17:56:36 +0300 +Subject: [PATCH] meson.build: fix soversion 5 -> 0 + +Signed-off-by: Adrian Ratiu <adrian.ra...@collabora.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3f95774..99878d9 100644 +--- a/meson.build ++++ b/meson.build +@@ -19,7 +19,7 @@ library('typec', + 'libtypec_sysfs_ops.c', + 'libtypec_dbgfs_ops.c', + version : meson.project_version(), +- soversion : '5', ++ soversion : '0', + dependencies: libudev_dep, + install: true, + ) +-- +2.44.2 + diff --git a/dev-libs/libtypec/libtypec-0.5.2-r1.ebuild b/dev-libs/libtypec/libtypec-0.5.2-r2.ebuild similarity index 78% rename from dev-libs/libtypec/libtypec-0.5.2-r1.ebuild rename to dev-libs/libtypec/libtypec-0.5.2-r2.ebuild index 9fa0a66e6..ab0cadf47 100644 --- a/dev-libs/libtypec/libtypec-0.5.2-r1.ebuild +++ b/dev-libs/libtypec/libtypec-0.5.2-r2.ebuild @@ -11,6 +11,11 @@ SRC_URI="https://github.com/libtypec/libtypec/archive/refs/tags/${P}.tar.gz"; S="${WORKDIR}/${PN}-${P}" +PATCHES=( + "${FILESDIR}/${PN}-0.5.2-fix-meson-release-version.patch" + "${FILESDIR}/${PN}-0.5.2-meson.build-fix-soversion-5-0.patch" +) + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64"
