diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-08-31 17:43:38 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2024-08-31 17:43:38 +0000 |
| commit | 412a1aebf2d42bd445cbab49579ab78161cb6442 (patch) | |
| tree | 431ce14376061c8493cbdf42b1ff1e4630a38a82 /dev-cpp | |
| parent | 89907c7305cab927d3baf32314224cc51dfeaa22 (diff) | |
| download | baldeagleos-repo-412a1aebf2d42bd445cbab49579ab78161cb6442.tar.gz baldeagleos-repo-412a1aebf2d42bd445cbab49579ab78161cb6442.tar.xz baldeagleos-repo-412a1aebf2d42bd445cbab49579ab78161cb6442.zip | |
Adding metadata
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild | 2 | ||||
| -rw-r--r-- | dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch | 47 | ||||
| -rw-r--r-- | dev-cpp/libcmis/libcmis-0.6.2.ebuild | 8 | ||||
| -rw-r--r-- | dev-cpp/tree/tree-3.18.ebuild | 2 |
4 files changed, 55 insertions, 4 deletions
diff --git a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild index 58484ff9a28a..d632e23ff827 100644 --- a/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild +++ b/dev-cpp/abseil-cpp/abseil-cpp-20240116.2-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/abseil/abseil-cpp/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="Apache-2.0" SLOT="0/${PV%%.*}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" IUSE="test" RDEPEND=">=dev-cpp/gtest-1.13.0[${MULTILIB_USEDEP}]" diff --git a/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch new file mode 100644 index 000000000000..5d2a9ba404e3 --- /dev/null +++ b/dev-cpp/libcmis/files/libcmis-0.6.2-boost-1.86.patch @@ -0,0 +1,47 @@ +https://github.com/tdf/libcmis/issues/67 +https://github.com/tdf/libcmis/pull/68 + +From dfcb642a491f7ec2ae52e3e83d31bb6cdf3670c2 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Sat, 31 Aug 2024 12:39:39 +0200 +Subject: [PATCH] Fix boost 1.86 breakage + +The fix does not break building against <1.86 since we're now accessing the +object representation of the return value. + +Fixes #67 +--- + src/libcmis/xml-utils.cxx | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx +index e487d17..cdf088f 100644 +--- a/src/libcmis/xml-utils.cxx ++++ b/src/libcmis/xml-utils.cxx +@@ -531,16 +531,22 @@ namespace libcmis + boost::uuids::detail::sha1 sha1; + sha1.process_bytes( str.c_str(), str.size() ); + +- unsigned int digest[5]; ++ // on boost < 1.86.0, digest_type is typedef'd as unsigned int[5] ++ // on boost >= 1.86.0, digest_type is typedef'd as unsigned char[20] ++ boost::uuids::detail::sha1::digest_type digest; + sha1.get_digest( digest ); + ++ // by using a pointer to unsigned char, we can read the ++ // object representation of either typedef. ++ const unsigned char* ptr = reinterpret_cast<const unsigned char*>( digest ); ++ + stringstream out; +- // Setup writing mode. Every number must produce eight ++ // Setup writing mode. Every number must produce two + // hexadecimal digits, including possible leading 0s, or we get + // less than 40 digits as result. + out << hex << setfill('0') << right; +- for ( int i = 0; i < 5; ++i ) +- out << setw(8) << digest[i]; ++ for ( int i = 0; i < sizeof( digest ); ++ptr, ++i ) ++ out << setw(2) << static_cast<int>( *ptr ); + return out.str(); + } + diff --git a/dev-cpp/libcmis/libcmis-0.6.2.ebuild b/dev-cpp/libcmis/libcmis-0.6.2.ebuild index c20057c85432..5130a7ba2744 100644 --- a/dev-cpp/libcmis/libcmis-0.6.2.ebuild +++ b/dev-cpp/libcmis/libcmis-0.6.2.ebuild @@ -41,8 +41,12 @@ BDEPEND=" ) " -# https://github.com/tdf/libcmis/pull/52 -PATCHES=( "${FILESDIR}/${P}-libxml2-2.12.patch" ) # bug 917523 +PATCHES=( + # https://github.com/tdf/libcmis/pull/52 + "${FILESDIR}"/${P}-libxml2-2.12.patch # bug 917523 + # https://github.com/tdf/libcmis/pull/68 + "${FILESDIR}"/${P}-boost-1.86.patch +) src_prepare() { default diff --git a/dev-cpp/tree/tree-3.18.ebuild b/dev-cpp/tree/tree-3.18.ebuild index 33b480f4a325..917ad3c60aed 100644 --- a/dev-cpp/tree/tree-3.18.ebuild +++ b/dev-cpp/tree/tree-3.18.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.hh-${PV}" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos" src_configure() { tc-export CXX |
