protobuf v4.23.3 (#192)

automerged PR by conda-forge/automerge-action

recipe/meta.yaml

@@ -1,5 +1,5 @@
 # keep this without major version to let the bot pick it up
-{% set version = "23.2" %}
+{% set version = "23.3" %}
 # protobuf doesn't add the major version in the tag, it's defined per language in
 # https://github.com/protocolbuffers/protobuf/blob/main/version.json
 {% set major = "4" %}
@@ -12,17 +12,16 @@ package:
 
 source:
   url: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v{{ version }}.tar.gz
-  sha256: 0b0395d34e000f1229679e10d984ed7913078f3dd7f26cf0476467f5e65716f4
+  sha256: 4e176116949be52b0408dfd24f8925d1eb674a781ae242a75296b17a1c721395
   patches:
     - patches/0001-do-not-link-msvc-runtime-statically.patch
     - patches/0002-fix-paths-for-include-lib-directories.patch
     - patches/0003-correctly-link-to-protobuf-abseil.patch
     - patches/0004-use-C-17-everywhere.patch
-    - patches/0005-set-PROTOBUF_USE_DLLS-clean-up-other-symbols-on-win.patch
-    - patches/0006-be-more-lenient-with-abseil-version.patch
+    - patches/0005-set-PROTOBUF_USE_DLLS-on-windows.patch
 
 build:
-  number: 1
+  number: 0
   script:
     - cd python
     - export PROTOC=$PREFIX/bin/protoc        # [unix and (build_platform == target_platform)]
@@ -51,6 +50,7 @@ test:
   imports:
     - google
     - google.protobuf
+    - google.protobuf.descriptor
     - google.protobuf.internal
     - google.protobuf.pyext
     - google.protobuf.pyext._message

recipe/patches/0001-do-not-link-msvc-runtime-statically.patch

@@ -1,7 +1,7 @@
-From 84acb1e50bd44c4f68e339757491ffe55e0a67a6 Mon Sep 17 00:00:00 2001
+From c2212240eb6161e31fb995a1446562acd22c1066 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sun, 4 Sep 2022 18:14:41 +0200
-Subject: [PATCH 1/6] do not link msvc runtime statically
+Subject: [PATCH 1/5] do not link msvc runtime statically
 
 ---
  python/setup.py | 4 ----

recipe/patches/0002-fix-paths-for-include-lib-directories.patch

@@ -1,7 +1,7 @@
-From 41c8f95c5715a0eb009de81678fcb154cf6de91b Mon Sep 17 00:00:00 2001
+From fc05924f4174d570d5ea17803f48b6333b2f6ae7 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sun, 4 Sep 2022 18:42:34 +0200
-Subject: [PATCH 2/6] fix paths for include & lib directories
+Subject: [PATCH 2/5] fix paths for include & lib directories
 
 ---
  python/setup.py | 12 ++++++++++--

recipe/patches/0003-correctly-link-to-protobuf-abseil.patch

@@ -1,7 +1,7 @@
-From af2add83f961394eb805900c93faafcac3403d25 Mon Sep 17 00:00:00 2001
+From 441ce78767779ba0a8f64241ffcd353a731679cf Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Sun, 4 Sep 2022 19:42:16 +0200
-Subject: [PATCH 3/6] correctly link to protobuf & abseil
+Subject: [PATCH 3/5] correctly link to protobuf & abseil
 
 ---
  python/setup.py | 8 +++++++-

recipe/patches/0004-use-C-17-everywhere.patch

@@ -1,7 +1,7 @@
-From 8518738ff4fb3d41d9431dbd9ce3373e3444dc76 Mon Sep 17 00:00:00 2001
+From 025938fdbfa0ed950afedd9d773e1f6b499950bd Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Thu, 18 May 2023 17:14:37 +1100
-Subject: [PATCH 4/6] use C++17 everywhere
+Subject: [PATCH 4/5] use C++17 everywhere
 
 ---
  python/setup.py | 4 +++-

recipe/patches/0005-set-PROTOBUF_USE_DLLS-clean-up-other-symbols-on-win.patch → recipe/patches/0005-set-PROTOBUF_USE_DLLS-on-windows.patch

@@ -1,26 +1,30 @@
-From 0cb65e0e0c6c82ce5459e15a5054df5e2fb5a527 Mon Sep 17 00:00:00 2001
+From 08872c74b481fe335272733494dfbe3844b755a8 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Thu, 18 May 2023 18:49:27 +1100
-Subject: [PATCH 5/6] set PROTOBUF_USE_DLLS; clean up other symbols on win
+Subject: [PATCH 5/5] set PROTOBUF_USE_DLLS on windows
 
+the other symbols can be removed because they're only
+relevant for MinGW (check the issue links); also evident
+from the gcc-style `-Dsymbol` instead of MSVC's `/Dsymbol`.
 ---
- python/setup.py | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
+ python/setup.py | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/python/setup.py b/python/setup.py
-index d6f99ab3d..fdf416a14 100755
+index d6f99ab3d..e5be7a309 100755
 --- a/python/setup.py
 +++ b/python/setup.py
-@@ -399,11 +399,8 @@ if __name__ == '__main__':
+@@ -397,13 +397,8 @@ if __name__ == '__main__':
+             r'macosx-[0-9]+\.[0-9]+-(.+)', r'macosx-10.9-\1',
+             util.get_platform())
 
-     # https://github.com/Theano/Theano/issues/4926
+-    # https://github.com/Theano/Theano/issues/4926
      if sys.platform == 'win32':
 -      extra_compile_args.append('-D_hypot=hypot')
 -
 -    # https://github.com/tpaviot/pythonocc-core/issues/48
 -    if sys.platform == 'win32' and  '64 bit' in sys.version:
 -      extra_compile_args.append('-DMS_WIN64')
-+      extra_compile_args.append('/D_hypot=hypot')
 +      extra_compile_args.append('/DPROTOBUF_USE_DLLS')
 
      if 'clang' in os.popen('$CC --version 2> /dev/null').read():