commit 3d2e9d1afe4d42d48c724d7831a681b2af63d172 Author: Tom Callaway <spot(a)fedoraproject.org&gt; Date: Wed Jun 12 17:08:39 2019 -0400 rename function to avoid conflict with rawhide glibc "gettid()" chromium-75.0.3770.80-grpc-gettid-fix.patch | 22 ++++++++++++++++++++++ chromium.spec | 4 ++++ 2 files changed, 26 insertions(+) --- diff --git a/chromium-75.0.3770.80-grpc-gettid-fix.patch b/chromium-75.0.3770.80-grpc-gettid-fix.patch new file mode 100644 index 0000000..c526f4a --- /dev/null +++ b/chromium-75.0.3770.80-grpc-gettid-fix.patch @@ -0,0 +1,22 @@ +diff -up chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc.gettid-fix chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc +--- chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc.gettid-fix 2019-06-12 17:05:01.720907204 -0400 ++++ chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc 2019-06-12 17:06:01.000671370 -0400 +@@ -40,7 +40,8 @@ + #include <time.h> + #include <unistd.h> + +-static long gettid(void) { return syscall(__NR_gettid); } ++/* renamed to avoid conflict with glibc 'gettid()' */ ++static long gettid_gpr(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +71,7 @@ void gpr_default_log(gpr_log_func_args* + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = gettid_gpr(); + + timer = static_cast<time_t>(now.tv_sec); + final_slash = strrchr(args->file, '/'); diff --git a/chromium.spec b/chromium.spec index cc6fbd7..b1a8228 100644 --- a/chromium.spec +++ b/chromium.spec @@ -335,6 +335,9 @@ Patch143: chromium-75.0.3770.80-revert-daff6b.patch # Avoid pure virtual crash destroying RenderProcessUserData # https://chromium.googlesource.com/chromium/src/+/cdf306db81efaaaa95448758... Patch144: chromium-75.0.3770.80-pure-virtual-crash-fix.patch +# rename function to avoid conflict with rawhide glibc "gettid()" +Patch145: chromium-75.0.3770.80-grpc-gettid-fix.patch + # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -917,6 +920,7 @@ udev. %patch142 -p1 -b .gcc-dcheck_ne-fix %patch143 -p1 -b .revert-daff6b %patch144 -p1 -b .pure-virtual-fix +%patch145 -p1 -b .gettid-fix # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works