CVS commit: pkgsrc/devel/protobuf

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 14 19:36:47 UTC 2021

Modified Files:
        pkgsrc/devel/protobuf: distinfo
Added Files:
        pkgsrc/devel/protobuf/patches: patch-src_google_protobuf_stubs_port.h

Log Message:
protobuf: fix build on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/protobuf/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_port.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/protobuf/distinfo
diff -u pkgsrc/devel/protobuf/distinfo:1.50 pkgsrc/devel/protobuf/distinfo:1.51
--- pkgsrc/devel/protobuf/distinfo:1.50 Thu May 13 12:16:54 2021
+++ pkgsrc/devel/protobuf/distinfo      Fri May 14 19:36:47 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.50 2021/05/13 12:16:54 adam Exp $
+$NetBSD: distinfo,v 1.51 2021/05/14 19:36:47 wiz Exp $
 
 SHA1 (protobuf-cpp-3.17.0.tar.gz) = aa0c0e46f06adbb199f45fcb69a115b7344ada79
 RMD160 (protobuf-cpp-3.17.0.tar.gz) = 691ee68e6a5e59bd5e4b9b7361d481c38ae7c691
@@ -6,4 +6,5 @@ SHA512 (protobuf-cpp-3.17.0.tar.gz) = 9f
 Size (protobuf-cpp-3.17.0.tar.gz) = 4688814 bytes
 SHA1 (patch-configure) = 22a1fc4e701b348772b3e2e4c68aad3b97032cc5
 SHA1 (patch-src_google_protobuf_port__def.inc) = c65c327878691dcd7d3c7be496c51ca4ff8ae776
+SHA1 (patch-src_google_protobuf_stubs_port.h) = cc09f2d6507ef11adb158226b33a282063e0b453
 SHA1 (patch-third__party_googletest_googlemock_configure) = fe3b812e819130d87d99316144507d2454461cd1

Added files:

Index: pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_port.h
diff -u /dev/null pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_port.h:1.1
--- /dev/null   Fri May 14 19:36:47 2021
+++ pkgsrc/devel/protobuf/patches/patch-src_google_protobuf_stubs_port.h        Fri May 14 19:36:47 2021
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_google_protobuf_stubs_port.h,v 1.1 2021/05/14 19:36:47 wiz Exp $
+
+Fix parentheses.
+
+--- src/google/protobuf/stubs/port.h.orig      2021-05-12 23:23:56.000000000 +0000
++++ src/google/protobuf/stubs/port.h
+@@ -263,14 +263,14 @@ static inline uint32 bswap_32(uint32 x) 
+ 
+ #ifndef bswap_64
+ static inline uint64 bswap_64(uint64 x) {
+-  return (((x & uint64_t{0xFFu)) << 56) |
+-          ((x & uint64_t{0xFF00u)) << 40) |
+-          ((x & uint64_t{0xFF0000u)) << 24) |
+-          ((x & uint64_t{0xFF000000u)) << 8) |
+-          ((x & uint64_t{0xFF00000000u)) >> 8) |
+-          ((x & uint64_t{0xFF0000000000u)) >> 24) |
+-          ((x & uint64_t{0xFF000000000000u)) >> 40) |
+-          ((x & uint64_t{0xFF00000000000000u)) >> 56));
++  return (((x & uint64_t{0xFFu}) << 56) |
++          ((x & uint64_t{0xFF00u}) << 40) |
++          ((x & uint64_t{0xFF0000u}) << 24) |
++          ((x & uint64_t{0xFF000000u}) << 8) |
++          ((x & uint64_t{0xFF00000000u}) >> 8) |
++          ((x & uint64_t{0xFF0000000000u}) >> 24) |
++          ((x & uint64_t{0xFF000000000000u}) >> 40) |
++          ((x & uint64_t{0xFF00000000000000u}) >> 56));
+ }
+ #define bswap_64(x) bswap_64(x)
+ #endif