Incorporating many fixes from konstantin gizdov

1 files changed, 16 insertions, 0 deletions

diff --git a/gflags_namespace.patch b/gflags_namespace.patch
new file mode 100644
index 000000000000..b671f2812e4f
--- /dev/null
+++ b/gflags_namespace.patch
@@ -0,0 +1,16 @@
+diff -ura old/src/hiptext.cc new/src/hiptext.cc
+--- old/src/hiptext.cc	2017-04-06 03:03:11.155197795 +0200
++++ new/src/hiptext.cc	2017-04-06 03:04:11.943077663 +0200
+@@ -197,9 +197,9 @@
+ int main(int argc, char** argv) {
+   // if (!isatty(1))
+   //   FLAGS_color = false;
+-  google::SetUsageMessage("hiptext [FLAGS]");
+-  google::SetVersionString("0.1");
+-  google::ParseCommandLineFlags(&argc, &argv, true);
++  gflags::SetUsageMessage("hiptext [FLAGS]");
++  gflags::SetVersionString("0.1");
++  gflags::ParseCommandLineFlags(&argc, &argv, true);
+   google::InitGoogleLogging(argv[0]);
+   google::InstallFailureSignalHandler();
+   const char* lang = std::getenv("LANG");