summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2022-10-30 12:12:41 +0100
committerDavid Seifert <soap@gentoo.org>2022-10-30 12:12:41 +0100
commitb5479fa19d05218a3b5fc8289ebfa49eef07793a (patch)
tree1e0b7dbdcc2c417879f850a549dc3284095f0e02 /dev-cpp
parentdev-cpp/clucene: [QA] use git-format-patch style patches (diff)
downloadgentoo-b5479fa19d05218a3b5fc8289ebfa49eef07793a.tar.gz
gentoo-b5479fa19d05218a3b5fc8289ebfa49eef07793a.tar.bz2
gentoo-b5479fa19d05218a3b5fc8289ebfa49eef07793a.zip
dev-cpp/glog/files: [QA] use git-format-patch style patches
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-cpp')
-rw-r--r--dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch20
-rw-r--r--dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch12
2 files changed, 16 insertions, 16 deletions
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).