diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-10-30 15:03:33 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-30 15:03:33 +0000 |
commit | c9388864702fdd7b0b56c049eddb41bdb9054dcb (patch) | |
tree | 3595822471cd11e6f9f92565ab81ab9c5ee39c3f /dev-cpp | |
parent | a41f630aea0b4b71a6c9a088571f1eaaf8413d53 (diff) |
gentoo auto-resync : 30:10:2022 - 15:03:33
Diffstat (limited to 'dev-cpp')
-rw-r--r-- | dev-cpp/Manifest.gz | bin | 12919 -> 12924 bytes | |||
-rw-r--r-- | dev-cpp/abseil-cpp/Manifest | 6 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch | 4 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch | 7 | ||||
-rw-r--r-- | dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch | 2 | ||||
-rw-r--r-- | dev-cpp/clucene/Manifest | 2 | ||||
-rw-r--r-- | dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch | 12 | ||||
-rw-r--r-- | dev-cpp/glog/Manifest | 4 | ||||
-rw-r--r-- | dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch | 20 | ||||
-rw-r--r-- | dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch | 12 |
10 files changed, 30 insertions, 39 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz Binary files differindex 98c0ce29cc4c..8503ef37224b 100644 --- a/dev-cpp/Manifest.gz +++ b/dev-cpp/Manifest.gz diff --git a/dev-cpp/abseil-cpp/Manifest b/dev-cpp/abseil-cpp/Manifest index 078d8d2b040c..77e7e7c940b8 100644 --- a/dev-cpp/abseil-cpp/Manifest +++ b/dev-cpp/abseil-cpp/Manifest @@ -1,7 +1,7 @@ -AUX abseil-cpp-20200923-arm_no_crypto.patch 1038 BLAKE2B 2443144b968f22e29503fb4a58ac45b623c104d298445b68b5ab34a5a08a5398a9b16cf6563e3127dfc4ba7ed211d53c2e1fb8f72fb120749065dce77fb67158 SHA512 5e2c192379d7190d97065973861d76e3680728a2e723c7cfb8b9ead4e02c94c3b12061c75f2f619cf1c9c217c3f29eaa36b59ff73e23417bf56f600a97128ff3 +AUX abseil-cpp-20200923-arm_no_crypto.patch 1040 BLAKE2B f46ebc05b370e8ecfdaf0a6b409fd08c2a384eb16224709802d7a9e84f038ae0ab51c4638297ed3abb9f6dded86833b710871d3f38d33de4843d5dfcdc149d03 SHA512 fea33008cdab6e229b074f6683f3f688a59d291038d89d96a62e91fee571cc885baf84b8a1435b8f757bb26a2a65b8383b49c874c9e472d229d14b259de874df AUX abseil-cpp-20210324.1-glibc-2.34.patch 720 BLAKE2B d24511a6b929d8bc15fce316f46ce6a3f8686357f72d97f2ebc8365ac04cc93afbf801c24ad8a488a4cbefa615ddc3141ccd25890b005bfba8e53e45276ec664 SHA512 05e53e5175328c2907a346ed01163bf8d0c6d51ffb85c58aeed507ca10444fde29adc86dfd259f9cbaafa35aa6723f531fdf05749b6c1248f094ed672d74fa14 -AUX abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch 2439 BLAKE2B 7640ea553046a8935b173d2043dbf2cd0fc26c4918fed0387f8cfdb924a897dba6b25165d154a9bc351d44dd01b971cbbe2705745eaecc432beee32030fa66df SHA512 ab0461284e0e3a1e40a3bf727d52ca6a6fa77b1cb36565cd7466aaba8064522195f0e22217603f4ceb304eb75170418e3fcb5e3a114c58aab29f46a33ad1f99d -AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 866 BLAKE2B 18c6ebc915080d4851a13763c30f9e3edc8224640546ac0b4cbc26671498bca2b69f55628ec889b00be76ba7a6246684c6273eaf00a967b96faa42c6882afa2b SHA512 b56cd0bd7accd243c0a8b0b759fb1e0c51e6167d8a9882513ed2b21760414b3f3dd329f5965f4c914b16f6d2a2ebe5c34b469401432e2914b5a10316f86a6be2 +AUX abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch 2138 BLAKE2B c52ca02f2cdfe8a843416011f171a1e957321e1a75f2e7f06aaf1591b2144731a6db0c2d65f400af041d25319d5fcce4cbbab75373260719633d82e63e96e665 SHA512 5a9f0a0289a2b7d808fe64cbd4e9bc02a78b50641314a510f66e90bb5f2bb3be9287f0892c93263a914ffa216916a0a154b2631f502b51564a90fb5294257711 +AUX abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch 741 BLAKE2B 22bc89e5b0edbcfcb4d4c7552e591d43742f399e6939b8dbf80c8c40e8ba46076265a374dd3d889a77ba9ab4ce747803aa031fe631898d9d90f3a6a30fb88023 SHA512 a4924d9e95c1ec8c1f31a1ead48063a7a6d6295bfa4dbe6ad3902c459e23973e75ec961eeb4ba6c17518cf48d7edeff315e65d0f5c6d3d6f07154127f370977b AUX abseil-cpp-20211102.0-r2-gcc-13.patch 951 BLAKE2B ad2a13d2260d7cfdfe95b07f1582bbf5ce627d8d8bf1e32b70834611065359b95d17b198c2b0aef70ff353dc289903c70ee9be95d40ef38f75c1872f08987eb1 SHA512 73aae8c3c90d87da47a8a37b68721fa06f44abcf02e829fecdcc076999f420a513005e946662bfeb073cf19a06916b1b400b3f35811ddfbe9b0fde75b4d87a53 AUX abseil-cpp-20211102.0-r2-loong.patch 739 BLAKE2B a3082b6da75719f57287dfac5b67e70ced0ebdbf3e2682c273d7022b024a92fedc8d33c781bafe167675a6a1cd592dbaf915c4031e6dca6aca2513451717cdc8 SHA512 d77e896e145e71b96be32779adb12cbaeabb3a69e5e57a0f47fdf428baf3b6ea22484e9a02979bf15f839417b13e74d0629a6d7207ad0bfa4f44eb9e1eb82867 DIST abseil-cpp-20200923.3.tar.gz 1783980 BLAKE2B 66d46fd6aafe0bf0d3fccd8a4e0a72fb0545a405d9c92d36ffcb1cf791b6d0eb85fd55218f740ba34c05c7bc952ad1aeaa367963b1f540f03a4f510fd02cd6d5 SHA512 7d9e2bc001a397b983afe1e5ca4d779bd27d0d30fad7f44e564a675e228f2fc29c203ef89dd1b0ff4a1832c6d99ae7627c9103a0daa6cccb426472528109ef85 diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch index 762476a10184..d9e9963f5bae 100644 --- a/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20200923-arm_no_crypto.patch @@ -5,8 +5,8 @@ extensions (by passing -DABSL_ARCH_ARM_NO_CRYPTO). This could be done by the build system instead in future. https://bugs.gentoo.org/778926 ---- /absl/random/internal/randen_hwaes.cc -+++ /absl/random/internal/randen_hwaes.cc +--- a/absl/random/internal/randen_hwaes.cc ++++ b/absl/random/internal/randen_hwaes.cc @@ -50,8 +50,11 @@ (defined(__ARM_NEON) && defined(__ARM_FEATURE_CRYPTO)) #define ABSL_RANDEN_HWAES_IMPL 1 diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch index 45a9fc5406e8..0933c62660a6 100644 --- a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-fix-cuda-nvcc-build.patch @@ -25,13 +25,6 @@ Our Linux CI does this, but for some reason was never enabled on macOS PiperOrigin-RevId: 425668638 GitOrigin-RevId: 121db1a08321eaa3006726cc32b459cf17880e35 Change-Id: Id51645df90b6a0808dd5b18eb636a10f798e24ea ---- - absl/container/internal/inlined_vector.h | 8 ++++---- - ci/macos_xcode_bazel.sh | 10 +++++++++- - 2 files changed, 13 insertions(+), 5 deletions(-) - -diff --git a/absl/container/internal/inlined_vector.h b/absl/container/internal/inlined_vector.h -index cd34a413a..2baf26f3e 100644 --- a/absl/container/internal/inlined_vector.h +++ b/absl/container/internal/inlined_vector.h @@ -925,8 +925,8 @@ auto Storage<T, N, A>::Swap(Storage* other_storage_ptr) -> void { diff --git a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch index 59efc0f321e3..28347d489c17 100644 --- a/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch +++ b/dev-cpp/abseil-cpp/files/abseil-cpp-20211102.0-r2-cuda11.6-compile-fix.patch @@ -1,5 +1,3 @@ -diff --git a/absl/strings/internal/string_constant.h b/absl/strings/internal/string_constant.h -index a11336b..e1596b1 100644 --- a/absl/strings/internal/string_constant.h +++ b/absl/strings/internal/string_constant.h @@ -35,12 +35,18 @@ namespace strings_internal { diff --git a/dev-cpp/clucene/Manifest b/dev-cpp/clucene/Manifest index ad2ab0ae7c2e..9b430c0b3fd9 100644 --- a/dev-cpp/clucene/Manifest +++ b/dev-cpp/clucene/Manifest @@ -1,5 +1,5 @@ AUX clucene-2.3.3.4-contrib.patch 1697 BLAKE2B 2aebc143ff0dafb2765cb3bd5d8e5183bdcfa7cb51a6109e957650412394796c7825c38dab9f1f9637c436b10714624dcbcfd3b6ab88dbfef9c5de9582e65ccc SHA512 0aa92635949089196e4e7c579e78761e8751987ef5036320a161a4aaa67da3c63756398c903419c76ea0fbdc8a949e871fcb65be98179a9853a24a5a4cacfde3 -AUX clucene-2.3.3.4-fix-clang.patch 2219 BLAKE2B 7572c05d9e2676eedb3aabc8030eea6b97a19af9f02eb1c336b40606105bc89800a8da8ea6f899ef550fa114776133fec962622ac3e337ca0f52fc0305c81bd3 SHA512 f3822c5d127b37fdb0a405a3fa0a2d2a168133da106a222de0311c2074aaacb7d9651a1be7ad7afda44da22cc2c8baa8d5db756aaaef5c344e12d52625e2c2e1 +AUX clucene-2.3.3.4-fix-clang.patch 1982 BLAKE2B 2b330b21715d29a1c825d16cb8309319af4267812a68dea4ff045c3a4aaf0e258b22457d7635dc63886bd8856bccad2f8602432b889449b67fb7490c2f604763 SHA512 26e3705682ad970a012a38188ccc8cac89ab22a509474c4401a57200c98b49423ccf63fb70ccbd57265dd62ec2944fe498b217911d1886ea924881699c9968dc AUX clucene-2.3.3.4-gcc6.patch 1102 BLAKE2B c7a264585532237d38ad5d06d1e1b96559e47145dc9ecbfe73ec6b8a493fd9c0eef73611305de213e432dd94736dc49dbc140b47d0c65081228989aa21a3fe62 SHA512 367e97d9b5d59bca880d8ec70b37078406f581267a896ff6b35cd3ab21f983f4b21152482bb34fb813e426b4cae14a6d319ccdb08e3bf968de8ece3c28a18722 AUX clucene-2.3.3.4-gmtime.patch 477 BLAKE2B 0c453684f6850ad7eb2eeff2624a9d23c7ea5f78321447b75acea625add44b7cae8c8c220c8848ed8ac39c66f8329f20e9c60005a1e2d237097771ecb0c2370f SHA512 1c23c08edf5512c29a061e4a8515dfa209151af83e46680842f0aeee1269d529a14fd4a89aab7c25312fd7dbb9daf80912a265d21fcf08ac892a467be4a59a60 AUX clucene-2.3.3.4-libcxx.patch 1486 BLAKE2B 237f5a6b674a56c238ffb42282b610d92f8500e5dad4423536ef1dd7184fbbfadd223ac5e79794370c086780ae91863bb3f5444cc0ad8aebc77512b33b6cd487 SHA512 7602a10f3fdd5f4a40a10603abf65f2661eb3cddda9d2c38382f7d362564c0eb8ca1968755090ae78ec5a9a9e6c7d3f889c11fefe9f140c10818c824c7c5f77f diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch index f743fa8c4480..f81f812c4978 100644 --- a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch +++ b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch @@ -1,5 +1,5 @@ ---- /src/core/CLucene/queryParser/QueryParser.cpp.original 2018-08-02 15:11:33.157174224 +0200 -+++ /src/core/CLucene/queryParser/QueryParser.cpp 2018-08-02 15:12:33.189175705 +0200 +--- a/src/core/CLucene/queryParser/QueryParser.cpp ++++ b/src/core/CLucene/queryParser/QueryParser.cpp @@ -79,7 +79,7 @@ _T("<RANGEEX_GOOP>") }; @@ -9,8 +9,8 @@ const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0}; struct QueryParser::JJCalls { ---- /src/core/CLucene/queryParser/QueryParserTokenManager.cpp.original 2018-08-02 15:14:27.104178515 +0200 -+++ /src/core/CLucene/queryParser/QueryParserTokenManager.cpp 2018-08-02 15:15:10.399179583 +0200 +--- a/src/core/CLucene/queryParser/QueryParserTokenManager.cpp ++++ b/src/core/CLucene/queryParser/QueryParserTokenManager.cpp @@ -15,9 +15,9 @@ CL_NS_DEF(queryParser) @@ -23,8 +23,8 @@ }; const int32_t QueryParserTokenManager::jjnextStates[]={ 15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27, ---- /src/core/CLucene/document/DateTools.cpp.original 2018-08-02 15:20:28.903187441 +0200 -+++ /src/core/CLucene/document/DateTools.cpp 2018-08-02 15:20:35.441187602 +0200 +--- a/src/core/CLucene/document/DateTools.cpp ++++ b/src/core/CLucene/document/DateTools.cpp @@ -8,6 +8,7 @@ #include "DateTools.h" diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest index f7f3b6c1b3c8..77d5f2c07827 100644 --- a/dev-cpp/glog/Manifest +++ b/dev-cpp/glog/Manifest @@ -1,8 +1,8 @@ AUX glog-0.4.0-errnos.patch 4580 BLAKE2B 9a7f86fb2dbcab68948914dcef74e1e08750462e58f56b3f337ad845e1ff4bcdf831e7e231e274bce7db9a4228c307b6bb3baa85ce6cb3eee8625414da6273c9 SHA512 8be72be6d6c27bdbe74dbb95cc2534dcfcd7adc1d85fc5f7022a2b7599ae6b148431623140141ed9863d54febaa414673d18b8fbc8c5aea7f0e43b0f92a54432 AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea113d93dedb2710fc1cf12fafc700702eb8be5812b73ea4b941355ec948d4659963e1bc7829df12a4da9ba7b80caa3d6ca20e7 SHA512 dd787c363a08810abec89f64b5aa0f77206a0963af1a0fcf5b91549528df875e83cf736cfc2d9eff63007c2d25d0ba71092368272bb5588525cf9af6300ea9a0 AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d04fd36dfc6f06e19426d980127b505a68fc8044b62b04fee5a9b218167a2e119307ea4ec1915807ee6a3ebf89aea83a9 SHA512 2c0bd65824e0ed9923c328554a6dad25d9a02b776e465044a8197416a14da5d986ea9b9394e2da2e6981a1d4149ad67d22b753566177da8c13c0e481432f4e54 -AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3029 BLAKE2B 3b46cca54d2fdfdb51a64d9322246c26848c876c19c6aa13cd344d56fb938879339f41aa89348a1ed5fd7d52182f2803be00033052e7460d9776211df2f6448f SHA512 e83c818d4307ded63c6ee750c76f48594f8dc484b45c56b344a761ab4ed4d9e3c3fa66c78456c40d60ed19a9b0b5e07946de6971285d3779704e85eeb95dea98 -AUX glog-0.5.0-vmodule_levels_changeability.patch 5974 BLAKE2B 1ba487bdc097f6ec021d44496c72beaca0239445eadb4bd11f022d6abdfdb5b97bc9e8bebc5f79255999bf655fde5572009e6fa71e7d8a0af785581a574cc5ec SHA512 db883cd941cab39954f06a75929520c94d824344de81c712d495d03bdd438a2cd79a1d975330848c84f0b482bcbf8c4fb120c45171e51c37dce960bf9cf4c2d5 +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 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a DIST glog-0.6.0.tar.gz 193267 BLAKE2B b42112cdfd54280ce7a9592c3af6b6e10dcb854fe9dbe0db7445c60801d1c12a240c4b3709b45e41aedeb8876d2e08fc3368296e088be6a66126858888cc274e SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226 diff --git a/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch index a19ebdcf0fac..d08e4b17882f 100644 --- a/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch +++ b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch @@ -2,8 +2,8 @@ https://github.com/google/glog/issues/125 https://github.com/google/glog/pull/651 https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 ---- /src/glog/logging.h.in -+++ /src/glog/logging.h.in +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in @@ -594,6 +594,9 @@ void* prefix_callback_data = NULL); #endif @@ -14,8 +14,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 // Shutdown google's logging library. GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging(); ---- /src/logging_custom_prefix_unittest.cc -+++ /src/logging_custom_prefix_unittest.cc +--- a/src/logging_custom_prefix_unittest.cc ++++ b/src/logging_custom_prefix_unittest.cc @@ -221,11 +221,15 @@ LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors" const string early_stderr = GetCapturedTestStderr(); @@ -43,8 +43,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 } _START_GOOGLE_NAMESPACE_ ---- /src/logging_unittest.cc -+++ /src/logging_unittest.cc +--- a/src/logging_unittest.cc ++++ b/src/logging_unittest.cc @@ -197,8 +197,12 @@ LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors" const string early_stderr = GetCapturedTestStderr(); @@ -69,8 +69,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 } _START_GOOGLE_NAMESPACE_ ---- /src/utilities.cc -+++ /src/utilities.cc +--- a/src/utilities.cc ++++ b/src/utilities.cc @@ -62,6 +62,10 @@ static const char* g_program_invocation_short_name = NULL; @@ -93,8 +93,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 #ifdef OS_WINDOWS struct timeval { long tv_sec, tv_usec; ---- /src/utilities.h -+++ /src/utilities.h +--- a/src/utilities.h ++++ b/src/utilities.h @@ -163,8 +163,6 @@ const char* ProgramInvocationShortName(); diff --git a/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch index f9b90c1521aa..ed1f6a17d8df 100644 --- a/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch +++ b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch @@ -2,8 +2,8 @@ https://github.com/google/glog/issues/649 https://github.com/google/glog/pull/650 https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c ---- /src/glog/vlog_is_on.h.in -+++ /src/glog/vlog_is_on.h.in +--- a/src/glog/vlog_is_on.h.in ++++ b/src/glog/vlog_is_on.h.in @@ -81,10 +81,10 @@ // parsing of --vmodule flag and/or SetVLOGLevel calls. #define VLOG_IS_ON(verboselevel) \ @@ -41,8 +41,8 @@ https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c @ac_google_namespace@::int32* site_default, const char* fname, @ac_google_namespace@::int32 verbose_level); ---- /src/logging_unittest.cc -+++ /src/logging_unittest.cc +--- a/src/logging_unittest.cc ++++ b/src/logging_unittest.cc @@ -98,6 +98,7 @@ static void TestRawLogging(); static void LogWithLevels(int v, int severity, bool err, bool alsoerr); @@ -84,8 +84,8 @@ https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c TEST(DeathRawCHECK, logging) { ASSERT_DEATH(RAW_CHECK(false, "failure 1"), "RAW: Check false failed: failure 1"); ---- /src/vlog_is_on.cc -+++ /src/vlog_is_on.cc +--- a/src/vlog_is_on.cc ++++ b/src/vlog_is_on.cc @@ -125,6 +125,8 @@ // Pointer to head of the VModuleInfo list. // It's a map from module pattern to logging level for those module(s). |