3 files changed, 44 insertions, 9 deletions
diff --git a/python/python3-grpcio/protobuf-reenable-private-headers.patch b/python/python3-grpcio/protobuf-reenable-private-headers.patch
new file mode 100644
index 0000000000..1f3dba1905
--- /dev/null
+++ b/python/python3-grpcio/protobuf-reenable-private-headers.patch
@@ -0,0 +1,25 @@
+diff --git a/cmake/installed_include_golden.txt b/cmake/installed_include_golden.txt
+index 20ad3219b6..0562066bd7 100644
+--- a/cmake/installed_include_golden.txt
++++ b/cmake/installed_include_golden.txt
+@@ -35,6 +35,8 @@ google/protobuf/compiler/php/php_generator.h
+ google/protobuf/compiler/plugin.h
+ google/protobuf/compiler/plugin.pb.h
+ google/protobuf/compiler/plugin.proto
++google/protobuf/compiler/python/generator.h
++google/protobuf/compiler/python/pyi_generator.h
+ google/protobuf/compiler/retention.h
+ google/protobuf/compiler/scc.h
+ google/protobuf/compiler/subprocess.h
+diff --git a/src/file_lists.cmake b/src/file_lists.cmake
+index d74a982f79..36984247bf 100644
+--- a/src/file_lists.cmake
++++ b/src/file_lists.cmake
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.pb.h
++  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.h
++  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/retention.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/scc.h
+   ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/subprocess.h
diff --git a/python/python3-grpcio/python3-grpcio.SlackBuild b/python/python3-grpcio/python3-grpcio.SlackBuild
index ed8152d0df..ee82179fd3 100644
--- a/python/python3-grpcio/python3-grpcio.SlackBuild
+++ b/python/python3-grpcio/python3-grpcio.SlackBuild
@@ -16,7 +16,7 @@
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 #  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
 #  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
@@ -26,11 +26,12 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=python3-grpcio
 VERSION=${VERSION:-1.71.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=grpc
+PROTOVER=${PROTOVER:-30.1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -57,6 +58,13 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
+
+# Extract protobuf tarball
+tar xvf $CWD/protobuf-$PROTOVER.tar.gz
+cd protobuf-$PROTOVER
+patch -p1 < $CWD/protobuf-reenable-private-headers.patch
+cd ..
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -87,11 +95,11 @@ sed -r -i \
     tools/distrib/python/grpcio_tools/protoc_lib_deps.py
 ln -s ../../../.. tools/distrib/python/grpcio_tools/grpc_root
 
-# Build python3-grcpio_tools
-#cd tools/distrib/python/grpcio_tools
-#GRPC_PYTHON_CFLAGS="-fno-wrapv -frtti $(pkg-config --cflags protobuf)" \
-#  GRPC_PYTHON_LDFLAGS="$(pkg-config --libs protobuf) -lprotoc" \
-#  python3 setup.py install --root=$PKG
+# Build python3-grcpio-tools
+cd tools/distrib/python/grpcio_tools
+GRPC_PYTHON_CFLAGS="-fno-wrapv -frtti $(pkg-config --cflags protobuf) -I$TMP/$SRCNAM-$VERSION/protobuf-$PROTOVER/src" \
+  GRPC_PYTHON_LDFLAGS="$(pkg-config --libs protobuf) -lprotoc" \
+  python3 setup.py install --root=$PKG
 cd $TMP/$SRCNAM-$VERSION
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/python/python3-grpcio/python3-grpcio.info b/python/python3-grpcio/python3-grpcio.info
index c68beee2e1..5e64b015c1 100644
--- a/python/python3-grpcio/python3-grpcio.info
+++ b/python/python3-grpcio/python3-grpcio.info
@@ -1,8 +1,10 @@
 PRGNAM="python3-grpcio"
 VERSION="1.71.0"
 HOMEPAGE="https://grpc.io/"
-DOWNLOAD="https://github.com/grpc/grpc/archive/v1.71.0/grpc-1.71.0.tar.gz"
-MD5SUM="89ad442e1b174bc5d55c554aec583fa0"
+DOWNLOAD="https://github.com/grpc/grpc/archive/v1.71.0/grpc-1.71.0.tar.gz \
+          https://github.com/google/protobuf/archive/v30.1/protobuf-30.1.tar.gz"
+MD5SUM="89ad442e1b174bc5d55c554aec583fa0 \
+        3f3792f866d8dc5820ce9fdc10b33bf8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="protobuf3 re2"