Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/glog/files/
Date: Sun, 30 Oct 2022 11:13:17
Message-Id: 1667128361.b5479fa19d05218a3b5fc8289ebfa49eef07793a.soap@gentoo
1 commit: b5479fa19d05218a3b5fc8289ebfa49eef07793a
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 30 11:12:41 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 11:12:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5479fa1
7
8 dev-cpp/glog/files: [QA] use git-format-patch style patches
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 ...log-0.5.0-IsGoogleLoggingInitialized_public.patch | 20 ++++++++++----------
13 .../glog-0.5.0-vmodule_levels_changeability.patch | 12 ++++++------
14 2 files changed, 16 insertions(+), 16 deletions(-)
15
16 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
17 index a19ebdcf0fac..d08e4b17882f 100644
18 --- a/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch
19 +++ b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch
20 @@ -2,8 +2,8 @@ https://github.com/google/glog/issues/125
21 https://github.com/google/glog/pull/651
22 https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
23
24 ---- /src/glog/logging.h.in
25 -+++ /src/glog/logging.h.in
26 +--- a/src/glog/logging.h.in
27 ++++ b/src/glog/logging.h.in
28 @@ -594,6 +594,9 @@
29 void* prefix_callback_data = NULL);
30 #endif
31 @@ -14,8 +14,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
32 // Shutdown google's logging library.
33 GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging();
34
35 ---- /src/logging_custom_prefix_unittest.cc
36 -+++ /src/logging_custom_prefix_unittest.cc
37 +--- a/src/logging_custom_prefix_unittest.cc
38 ++++ b/src/logging_custom_prefix_unittest.cc
39 @@ -221,11 +221,15 @@
40 LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
41 const string early_stderr = GetCapturedTestStderr();
42 @@ -43,8 +43,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
43 }
44
45 _START_GOOGLE_NAMESPACE_
46 ---- /src/logging_unittest.cc
47 -+++ /src/logging_unittest.cc
48 +--- a/src/logging_unittest.cc
49 ++++ b/src/logging_unittest.cc
50 @@ -197,8 +197,12 @@
51 LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors"
52 const string early_stderr = GetCapturedTestStderr();
53 @@ -69,8 +69,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
54 }
55
56 _START_GOOGLE_NAMESPACE_
57 ---- /src/utilities.cc
58 -+++ /src/utilities.cc
59 +--- a/src/utilities.cc
60 ++++ b/src/utilities.cc
61 @@ -62,6 +62,10 @@
62
63 static const char* g_program_invocation_short_name = NULL;
64 @@ -93,8 +93,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1
65 #ifdef OS_WINDOWS
66 struct timeval {
67 long tv_sec, tv_usec;
68 ---- /src/utilities.h
69 -+++ /src/utilities.h
70 +--- a/src/utilities.h
71 ++++ b/src/utilities.h
72 @@ -163,8 +163,6 @@
73
74 const char* ProgramInvocationShortName();
75
76 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
77 index f9b90c1521aa..ed1f6a17d8df 100644
78 --- a/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch
79 +++ b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch
80 @@ -2,8 +2,8 @@ https://github.com/google/glog/issues/649
81 https://github.com/google/glog/pull/650
82 https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c
83
84 ---- /src/glog/vlog_is_on.h.in
85 -+++ /src/glog/vlog_is_on.h.in
86 +--- a/src/glog/vlog_is_on.h.in
87 ++++ b/src/glog/vlog_is_on.h.in
88 @@ -81,10 +81,10 @@
89 // parsing of --vmodule flag and/or SetVLOGLevel calls.
90 #define VLOG_IS_ON(verboselevel) \
91 @@ -41,8 +41,8 @@ https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c
92 @ac_google_namespace@::int32* site_default,
93 const char* fname,
94 @ac_google_namespace@::int32 verbose_level);
95 ---- /src/logging_unittest.cc
96 -+++ /src/logging_unittest.cc
97 +--- a/src/logging_unittest.cc
98 ++++ b/src/logging_unittest.cc
99 @@ -98,6 +98,7 @@
100 static void TestRawLogging();
101 static void LogWithLevels(int v, int severity, bool err, bool alsoerr);
102 @@ -84,8 +84,8 @@ https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c
103 TEST(DeathRawCHECK, logging) {
104 ASSERT_DEATH(RAW_CHECK(false, "failure 1"),
105 "RAW: Check false failed: failure 1");
106 ---- /src/vlog_is_on.cc
107 -+++ /src/vlog_is_on.cc
108 +--- a/src/vlog_is_on.cc
109 ++++ b/src/vlog_is_on.cc
110 @@ -125,6 +125,8 @@
111 // Pointer to head of the VModuleInfo list.
112 // It's a map from module pattern to logging level for those module(s).