Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/cereal/, dev-libs/cereal/files/
Date: Mon, 21 Feb 2022 22:11:21
Message-Id: 1645481456.883b91e25e9f99aed36ed5db29ca34c002a4b614.sam@gentoo
1 commit: 883b91e25e9f99aed36ed5db29ca34c002a4b614
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 21 22:10:56 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 21 22:10:56 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=883b91e2
7
8 dev-libs/cereal: fix version in headers
9
10 Closes: https://bugs.gentoo.org/833817
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../cereal/{cereal-1.3.1.ebuild => cereal-1.3.1-r1.ebuild} | 4 ++++
14 dev-libs/cereal/files/cereal-1.3.1-fix-version.patch | 14 ++++++++++++++
15 2 files changed, 18 insertions(+)
16
17 diff --git a/dev-libs/cereal/cereal-1.3.1.ebuild b/dev-libs/cereal/cereal-1.3.1-r1.ebuild
18 similarity index 93%
19 rename from dev-libs/cereal/cereal-1.3.1.ebuild
20 rename to dev-libs/cereal/cereal-1.3.1-r1.ebuild
21 index b8f35d34d146..5e128446aca6 100644
22 --- a/dev-libs/cereal/cereal-1.3.1.ebuild
23 +++ b/dev-libs/cereal/cereal-1.3.1-r1.ebuild
24 @@ -17,6 +17,10 @@ RESTRICT="!test? ( test )"
25
26 BDEPEND="doc? ( app-doc/doxygen )"
27
28 +PATCHES=(
29 + "${FILESDIR}"/${PN}-1.3.1-fix-version.patch
30 +)
31 +
32 src_prepare() {
33 if ! use doc ; then
34 sed -i -e '/add_subdirectory(doc/d' CMakeLists.txt || die
35
36 diff --git a/dev-libs/cereal/files/cereal-1.3.1-fix-version.patch b/dev-libs/cereal/files/cereal-1.3.1-fix-version.patch
37 new file mode 100644
38 index 000000000000..9a9fa109b39d
39 --- /dev/null
40 +++ b/dev-libs/cereal/files/cereal-1.3.1-fix-version.patch
41 @@ -0,0 +1,14 @@
42 +https://github.com/USCiLab/cereal/issues/748
43 +https://github.com/symengine/symengine/issues/1886
44 +https://bugs.gentoo.org/833817
45 +--- a/include/cereal/version.hpp
46 ++++ b/include/cereal/version.hpp
47 +@@ -42,7 +42,7 @@
48 + //! The minor version
49 + #define CEREAL_VERSION_MINOR 3
50 + //! The patch version
51 +-#define CEREAL_VERSION_PATCH 0
52 ++#define CEREAL_VERSION_PATCH 1
53 +
54 + //! The full version as a single number
55 + #define CEREAL_VERSION (CEREAL_VERSION_MAJOR * 10000 \