diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-09-01 12:01:16 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-01 12:01:16 +0100 |
| commit | 4d37b8aa4c6b04fa417e8f87f276f7e08a411ee0 (patch) | |
| tree | a53cac2dfa1e2a70dea6c0d6d6e1d7ff3bde743d /dev-cpp/libcmis | |
| parent | 5b7f6475da27c05b30659a00ecb49636aca2bece (diff) | |
gentoo auto-resync : 01:09:2024 - 12:01:15
Diffstat (limited to 'dev-cpp/libcmis')
| -rw-r--r-- | dev-cpp/libcmis/Manifest | 3 | ||||
| -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 |
3 files changed, 55 insertions, 3 deletions
diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest index d59c05a45365..44f857ca8f13 100644 --- a/dev-cpp/libcmis/Manifest +++ b/dev-cpp/libcmis/Manifest @@ -1,5 +1,6 @@ +AUX libcmis-0.6.2-boost-1.86.patch 1841 BLAKE2B a452e78528c6b46c5518044b8d3a5c2cb082a0fcd3fa21d897f8e5b626497472f960458a8b1ef4731da46351b3f58e3f78160154dd2d1c05490574838e55f4ef SHA512 310d7eb9093f40cbbd2280dd805305a535ce5ed3d9baebb6a71ae17961be768042c659c529c99a2b7132248d1450f45861b85ec5ad03c9bf1d123ac2fcc3e4e6 AUX libcmis-0.6.2-libxml2-2.12.patch 762 BLAKE2B 1c63319f018b94e4c5609b7ae53faead48afd611613d2dca5b15ac67ef83546e4e7b70a9bb9eb6576697f85019d9358ae96cdd0a8bebbc09458aa2376e1f38a0 SHA512 06e9b18d1459858692c5cc07fb6243ba0ff6af475db6f8c8fd5c7f96ca086222ecfc36043a4bb0e27e3fbce671a12d0f852dd69d6473675ea637db21bc99a66f DIST libcmis-0.6.2.tar.gz 296218 BLAKE2B faad99e09b2721cd56b0d47d2a9589e06222ee7881006e936d0943d5e8afc588fcda721ef282ad7d55c785407a9885c90cbce1d172ca012c4a13cc51da0c15b6 SHA512 a75a69623f34149c39c382c357396b8dd719d589a78424fc3b5d9de84ffbf3f889bcaaed9a01f91b491a507c189347d3d9252db238fddbb522ff8ba9ce7b5ade -EBUILD libcmis-0.6.2.ebuild 1201 BLAKE2B 8f0352f030d38c03c485e2a53ef4b472c4192db3cc48abd0fdb928127ca5f28b7b4a2110b5dd2f162b2d09fb2b2b72a08df477900decfd3d30a4b59d3f281764 SHA512 aa505b451f07f73b088c9b286b7f432a99700288962fdca8b9f24dc13e92c834fe5fef7f85d74895727cc777f3d66d021b6ad329c3886c5a34fb910f36112e1b +EBUILD libcmis-0.6.2.ebuild 1282 BLAKE2B 31c8f79601a070144d9e4043beae5d7a059f8edba78d1453876dfdfd62398d727cb1af35007f7275ccacc510ad922cd587c1e428d90820a050028d0eded3bb3d SHA512 c64595419c5e79e1df8575dbc385bbc2233ba886ca9d8b16c75bb1587f7793d7b37b3f3e3bbfe7813809b13edb22f27653751a03ff318336beb855fa36ac283e EBUILD libcmis-9999.ebuild 1100 BLAKE2B 1eb20b6836ef2caed2f8bc6e0af59fed9257c4c0e930befc2f5e19dda96dfe408d3878a51d50390d98f27580ee2fc44e33290a309d192b6f992d8461ce40a637 SHA512 e7a7638e8035e76cec570ddb37bc77e2531e0dc53918205b72120b18dbeaa6bdf82f395ddf49eca0c25c8e2930a1bcc996cccaf6be3bb57202e6af68be6b222e MISC metadata.xml 426 BLAKE2B 182f7dffcb4df586fdf436512fdff32b98308711021e4a307c3c61262c5e68495da7d4ce833695bec7ea3f098e20fa067817895e7b4420ec19b920b249318527 SHA512 10ed11b843ba2c39fcd0519997fec47647bb45eabd0b5f6df0994748c0fb876216e7f451851dbe84a112468a7d6b38c5608c7ac7ada2ee08549ab1801ce81cc8 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 |