gentoo auto-resync : 29:11:2024 - 02:06:03

4 files changed, 79 insertions, 4 deletions

diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest
index 3080d9d9b11f..8e52b6140908 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -1,7 +1,9 @@
 AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3039 BLAKE2B 3df4edd58d1aa8380a722baab1b09d6d93d3750bd87d45e7496f81e3115ade12d925f4a4804f467d9a114a753ddbd78651f56b2b78076f026b8f85e7bbcd7d24 SHA512 362f1bc727e38bf17c68df90d33aa229b9ffd60618e80ed26d8127f2d80fee4792ea7179039ad8bd109c87cbfcc40fe2d9e6104397b63ee5221f8cc5b4b599d9
 AUX glog-0.5.0-vmodule_levels_changeability.patch 5980 BLAKE2B e6d57f0570e7ef849a52cf1cba91f1b39e7a8e08e994585dee7948effe54c9a53fcbf50468891d1122b1fbbd9763bf5b51a2a37c34035fc7380d90076cd3b8bc SHA512 53ff691227f8c9386ddc1b223001021ab31fbf8ccc2fe06a0372952e66ebe4903e99ccb4139c65efd06b1ccd9a5c73592466195de263b69f3c45ce89ea9517f8
+AUX glog-0.6.0-disable-symbolize-test.patch 892 BLAKE2B 3c8334d33462744c9a0579550989fbb9c4fa9b911ca5242ee86f9fc605284cbe586676a3417cc38792e717b1ab259fca68007491c27fbc461dcf3e596d213b1f SHA512 c84cb1f9c088e4d7f8f9b5bc4ee4f6a313928afc3974ecec20ca61bde734cd6f08e1391d1890f12bec275cd4e103c91419c7c204cb08e421d45b83a8c78d4d1a
+AUX glog-0.6.0-try-fix-logging-test.patch 1030 BLAKE2B ebbd43baa67bf3d109de5d7fca45ffa17c159b5accfa60a01b9d9b23ffe5ef3e26d836eb88211b8b0111debf924737cabc55ae8d9b94f48897cd9203cf05f3f6 SHA512 24af313bfb671d53a75f31cb050b1114e671ba8f6a77d3f9bd5cd90b5290ff83823f15f612023312a59d0e8c0c64dd1006882d96940e55c3cc55f7727bb9e5a3
 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
 DIST glog-0.6.0.tar.gz 193267 BLAKE2B b42112cdfd54280ce7a9592c3af6b6e10dcb854fe9dbe0db7445c60801d1c12a240c4b3709b45e41aedeb8876d2e08fc3368296e088be6a66126858888cc274e SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226
 EBUILD glog-0.5.0.ebuild 1500 BLAKE2B 38909cbdb53082c12d6532c6bf319dfaa0650d82406039d3b9fc28b8a98f64c782712a2576befa1d1eba9987e2e50690cb85d6d61235bcb9df4364ac2dbe0405 SHA512 195f6e70efceebc2453c07f8b086e50552add1e28b418b49eadb91140b236b1283ac61e4e84c7159d298b5268e1d874b1223efa6c060dee4c1d3da931ae34de3
-EBUILD glog-0.6.0.ebuild 1216 BLAKE2B b4d8a24e3d5bac1c325041eab17fa0872a80e258c10ac5ed9c28ea39a6b78ce27a77d7b9991d2fc27ca5deb31447eba7b46100138b65713119157573caf8c09e SHA512 7f51f57f79c79b00c3b6ee160dc0088d5ddc2ee25cc45845436464205e1e4347e8aa5865ee78d4645735aa3c0a6f10cb35133b16ed912930e15802f0c0f91c3f
+EBUILD glog-0.6.0.ebuild 1340 BLAKE2B d048bdb8fcf86fa3fae56bf909d4897d42e7d70ae727563727a957de4447139e7f5708237b02cbcbb66e0a25e9556144780ea9e035dc397e16b2661dd0ec9ad6 SHA512 cab866678f68bf8cdd6e71acc248da47d8c8cc489231eb5d9a7199edfdbd70ef5fa35e7ffe62a5443206d1e3579e8c36f77ab480bf602dc4eb6c3b68d72fbb4d
 MISC metadata.xml 590 BLAKE2B af2c7346ac5b7fd48346a2ff37ceaabe6a165004ec0dc6763a96bfdc31436c2d874d0c8f603c841b2bfe74d911b53000b9958c24bcb2c355b7de485185d83043 SHA512 e7d7e16afaba5d5961ff6fe9ea673ec1c26f5a2d502edb428bfc1bbd7b226ee25cf7abb296c8827404c65ad692d09966be37c95d0d7e4c56e5191df5b3367e8f
diff --git a/dev-cpp/glog/files/glog-0.6.0-disable-symbolize-test.patch b/dev-cpp/glog/files/glog-0.6.0-disable-symbolize-test.patch
new file mode 100644
index 000000000000..8e9abc0ecd62
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.6.0-disable-symbolize-test.patch
@@ -0,0 +1,30 @@
+From 9ad08ac6cc7899947deb934a695d150f0ae360d0 Mon Sep 17 00:00:00 2001
+From: Rodrigo Queiro <rodrigoq@google.com>
+Date: Tue, 13 Sep 2022 11:53:24 +0200
+Subject: [PATCH] Remove symbolize Bazel test
+
+It is broken on Windows CI (#859) in a way that I don't understand.
+
+* asturmlechner 2024-11-28: backported to cmake
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/CMakeLists.txt	2022-04-05 00:03:27.000000000 +0200
++++ b/CMakeLists.txt	2024-11-28 22:58:18.584982147 +0100
+@@ -804,13 +804,13 @@
+       GLOG_STL_LOGGING_FOR_EXT_SLIST)
+   endif (HAVE_EXT_SLIST)
+ 
+-  if (HAVE_SYMBOLIZE)
++  if (0)
+     add_executable (symbolize_unittest
+       src/symbolize_unittest.cc
+     )
+ 
+     target_link_libraries (symbolize_unittest PRIVATE ${_GLOG_TEST_LIBS})
+-  endif (HAVE_SYMBOLIZE)
++  endif ()
+ 
+   add_executable (demangle_unittest
+     src/demangle_unittest.cc
diff --git a/dev-cpp/glog/files/glog-0.6.0-try-fix-logging-test.patch b/dev-cpp/glog/files/glog-0.6.0-try-fix-logging-test.patch
new file mode 100644
index 000000000000..b3bec4801f28
--- /dev/null
+++ b/dev-cpp/glog/files/glog-0.6.0-try-fix-logging-test.patch
@@ -0,0 +1,36 @@
+From 45d7978dafceca8200fa4434d762f62642dc7cb4 Mon Sep 17 00:00:00 2001
+From: Sergiu Deitsch <sergiud@users.noreply.github.com>
+Date: Tue, 2 Jan 2024 13:01:42 +0100
+Subject: [PATCH] fix(tests): prevent clang from optimizing new away (#1017)
+
+---
+ src/logging_unittest.cc | 13 +++++++++++--
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/src/logging_unittest.cc b/src/logging_unittest.cc
+index cb1c657e7..40da9a44d 100644
+--- a/src/logging_unittest.cc
++++ b/src/logging_unittest.cc
+@@ -355,12 +355,19 @@ struct NewHook {
+   }
+ };
+ 
++namespace {
++int* allocInt() { return new int; }
++}  // namespace
++
+ TEST(DeathNoAllocNewHook, logging) {
+   // tests that NewHook used below works
+   NewHook new_hook;
+-  ASSERT_DEATH({
+-    new int;
+-  }, "unexpected new");
++  // Avoid unused warnings under MinGW
++  //
++  // NOTE MSVC produces warning C4551 here if we do not take the address of the
++  // function explicitly.
++  (void)&allocInt;
++  ASSERT_DEATH({ allocInt(); }, "unexpected new");
+ }
+ 
+ void TestRawLogging() {
diff --git a/dev-cpp/glog/glog-0.6.0.ebuild b/dev-cpp/glog/glog-0.6.0.ebuild
index 069eec682395..7dccfa1a63d5 100644
--- a/dev-cpp/glog/glog-0.6.0.ebuild
+++ b/dev-cpp/glog/glog-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2023 Gentoo Authors
+# Copyright 2011-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -29,9 +29,16 @@ RDEPEND="gflags? ( dev-cpp/gflags:0=[${MULTILIB_USEDEP}] )
 	libunwind? (
 		llvm-libunwind? ( sys-libs/llvm-libunwind:0=[${MULTILIB_USEDEP}] )
 		!llvm-libunwind? ( sys-libs/libunwind:0=[${MULTILIB_USEDEP}] )
-	)"
+	)
+"
 DEPEND="${RDEPEND}
-	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )"
+	test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-symbolize-test.patch" # bug 863599
+	"${FILESDIR}/${P}-try-fix-logging-test.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(