protobuf: update to 23.4.

- switch to cmake buildstyle
- grpc needs the .cmake files to find protobuf
- newer version of protobuf will drop autoconf

common/shlibs

@@ -3115,9 +3115,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
 libm17n-gui.so.0 m17n-lib-1.7.0_1
 libm17n-core.so.0 m17n-lib-1.7.0_1
 libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.32 libprotobuf-lite-21.4_1
+libprotobuf-lite.so.23.4.0 libprotobuf-lite-23.4_1
-libprotoc.so.32 libprotoc-21.4_1
+libprotoc.so.23.4.0 libprotoc-23.4_1
-libprotobuf.so.32 libprotobuf-21.4_1
+libprotobuf.so.23.4.0 libprotobuf-23.4_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
 libykclient.so.3 ykclient-2.15_1

srcpkgs/protobuf/template

@@ -1,22 +1,22 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=21.12
+version=23.4
 revision=1
-create_wrksrc="yes"
+build_style=cmake
-build_wrksrc="${pkgname}-${version}"
+configure_args="-Dprotobuf_BUILD_SHARED_LIBS=ON -Dprotobuf_USE_EXTERNAL_GTEST=ON
-build_style=gnu-configure
+ -Dprotobuf_BUILD_LIBPROTOC=ON -Dprotobuf_ABSL_PROVIDER=package
-hostmakedepends="pkg-config automake libtool"
+ -Dprotobuf_BUILD_TESTS=OFF"
-makedepends="zlib-devel"
+# XXX: Tests require that the abseil-cpp provides absl::scoped_mock_log
+hostmakedepends="pkg-config"
+makedepends="zlib-devel gtest-devel libatomic-devel
+ abseil-cpp-devel"
 short_desc="Protocol buffers compiler"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://developers.google.com/protocol-buffers/"
 changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
-_googletest_commit="5ec7f0c4a113e2f18ac2c6cc7df51ad6afc24081"
+distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz
+checksum=a700a49470d301f1190a487a923b5095bf60f08f4ae4cac9f5f7c36883d17971
- https://github.com/google/googletest/archive/${_googletest_commit}.tar.gz"
-checksum="22fdaf641b31655d4b2297f9981fa5203b2866f8332d3c6333f6b0107bb320de
- 0e2f36e8e403c125fd0ab02171bdb786d3b6b3875b6ccf3b2eb7969be8faecd0"
 
 # Switch to versioned package
 conflicts="protobuf18>=0 protobuf23>=0 protobuf24>=0
@@ -26,24 +26,11 @@ replaces="${conflicts}"
 if [ "$CROSS_BUILD" ]; then
 	# needs host protoc
 	hostmakedepends+=" ${pkgname}"
-	configure_args+=" --with-protoc=/usr/bin/protoc"
+	configure_args+=" -Dprotobuf_PROTOC_EXE=/usr/bin/protoc"
 fi
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-fi
-
-post_extract() {
-	rmdir "${build_wrksrc}/third_party/googletest"
-	mv "googletest-${_googletest_commit}" "${build_wrksrc}/third_party/googletest"
-}
-
-pre_configure() {
-	autoreconf -fi
-}
-
 post_install() {
+	rm -rf "${DESTDIR}/usr/lib/cmake"
 	vlicense LICENSE
 }
 
@@ -80,7 +67,6 @@ libprotoc-devel_package() {
 	 libprotoc26-devel>=0 libprotoc28-devel>=0"
 	replaces="${conflicts}"
 	pkg_install() {
-		vmove usr/lib/libprotoc.a
 		vmove usr/lib/libprotoc.so
 		vmove usr/include/google/protobuf/compiler
 	}
@@ -89,7 +75,8 @@ libprotoc-devel_package() {
 protobuf-devel_package() {
 	depends="zlib-devel
 	 libprotobuf-${version}_${revision}
-	 libprotobuf-lite-${version}_${revision}"
+	 libprotobuf-lite-${version}_${revision}
+	 abseil-cpp-devel"
 	short_desc="Protocol buffers C++ library - development files"
 	# Switch to versioned package
 	conflicts="protobuf18-devel>=0 protobuf23-devel>=0
@@ -98,10 +85,9 @@ protobuf-devel_package() {
 	replaces="${conflicts}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/libprotobuf.a
-		vmove usr/lib/libprotobuf-lite.a
 		vmove usr/lib/libprotobuf.so
 		vmove usr/lib/libprotobuf-lite.so
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
 	}
 }