From c7026d8b792b640e6d38b6636abcfef161bea966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 20 Jun 2024 07:31:35 +0700 Subject: [PATCH 1/9] New package: re2.10-2023.03.01 --- srcpkgs/libre2.10/template | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 srcpkgs/libre2.10/template diff --git a/srcpkgs/libre2.10/template b/srcpkgs/libre2.10/template new file mode 100644 index 00000000000000..26b58572de9d53 --- /dev/null +++ b/srcpkgs/libre2.10/template @@ -0,0 +1,24 @@ +# Template file for 'libre2.10' +# +# packaged to avoid rebuild electron and qt5-webengine +pkgname=libre2.10 +version=2023.03.01 +revision=1 +build_style=gnu-makefile +short_desc="Efficient, principled regular expression library" +maintainer="Orphaned " +license="BSD-3-Clause" +homepage="https://github.com/google/re2" +distfiles="https://github.com/google/re2/archive/${version//./-}.tar.gz" +checksum=7a9a4824958586980926a300b4717202485c4b4115ac031822e29aa4ef207e48 +provides="re2-${version}" + +post_install() { + # This package to provides libre2.so.10, + # those packages that aint rebuilt will use this package + # They can be rebuild with new re2-devel + rm -rf ${DESTDIR}/usr/include + rm -rf ${DESTDIR}/usr/lib/*.a + rm -rf ${DESTDIR}/usr/lib/*.so + rm -rf ${DESTDIR}/usr/lib/pkgconfig +} From c4721af62f81869cb37ad7dc196f17c1b2a1446f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 20 Jun 2024 07:49:02 +0700 Subject: [PATCH 2/9] re2: update to 2024.06.01. --- common/shlibs | 2 +- srcpkgs/re2/patches/pkg-config.patch | 24 ++++++++++++++++++++++++ srcpkgs/re2/template | 16 +++++++++++----- 3 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/re2/patches/pkg-config.patch diff --git a/common/shlibs b/common/shlibs index 4ebfd6bb20f6ad..092fd9b409d500 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1312,7 +1312,7 @@ librumpdev_audio.so.0 netbsd-rumpkernel-20140526_3 librumpclient.so.0 netbsd-rumpkernel-20140526_3 libdotconf.so.0 dotconf-1.3_1 libspeechd.so.2 speech-dispatcher-0.8_1 -libre2.so.10 re2-2023.03.01_1 +libre2.so.11 re2-2024.06.01_1 libminizip.so.1 minizip-1.2.7_1 libsrtp2.so.1 libsrtp-2.1.0_1 libjsoncpp.so.25 jsoncpp-1.9.5_1 diff --git a/srcpkgs/re2/patches/pkg-config.patch b/srcpkgs/re2/patches/pkg-config.patch new file mode 100644 index 00000000000000..48171cf4caa726 --- /dev/null +++ b/srcpkgs/re2/patches/pkg-config.patch @@ -0,0 +1,24 @@ +--- a/re2.pc.in ++++ b/re2.pc.in +@@ -3,7 +3,7 @@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + Name: re2 + Description: RE2 is a fast, safe, thread-friendly regular expression engine. +-Requires: @REQUIRES@ ++Requires: absl_base absl_core_headers absl_strings + Version: @SONAME@.0.0 + Cflags: -pthread -I${includedir} + Libs: -pthread -L${libdir} -lre2 +--- a/re2Config.cmake.in ++++ b/re2Config.cmake.in +@@ -13,10 +13,6 @@ endif() + + find_dependency(absl REQUIRED) + +-if(@RE2_USE_ICU@) +- find_dependency(ICU REQUIRED COMPONENTS uc) +-endif() +- + check_required_components(re2) + + if(TARGET re2::re2) diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template index ec6abba965ad1b..47cad9639f42c3 100644 --- a/srcpkgs/re2/template +++ b/srcpkgs/re2/template @@ -1,14 +1,20 @@ # Template file for 're2' pkgname=re2 -version=2023.03.01 +version=2024.06.01 revision=1 -build_style=gnu-makefile +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON -DRE2_USE_ICU=ON" +hostmakedepends="pkg-config" +makedepends="abseil-cpp-devel icu-devel" +# This dependency to avoid rebuild electron with new re2 +# Drop whenever those packages are rebuilt or dropped +depends="libre2.10" short_desc="Efficient, principled regular expression library" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://github.com/google/re2" distfiles="https://github.com/google/re2/archive/${version//./-}.tar.gz" -checksum=7a9a4824958586980926a300b4717202485c4b4115ac031822e29aa4ef207e48 +checksum=7326c74cddaa90b12090fcfc915fe7b4655723893c960ee3c2c66e85c5504b6c post_install() { vlicense LICENSE @@ -16,11 +22,11 @@ post_install() { re2-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}-${version}_${revision} abseil-cpp-devel" pkg_install() { vmove usr/include - vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/lib/pkgconfig + vmove usr/lib/cmake } } From 19e5176467b1a8ab10e4567d9f02c49efc95eaf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Jun 2024 08:07:54 +0700 Subject: [PATCH 3/9] bloaty: for re2-11 --- srcpkgs/bloaty/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template index 3309afa1792674..9aaead50324951 100644 --- a/srcpkgs/bloaty/template +++ b/srcpkgs/bloaty/template @@ -1,7 +1,7 @@ # Template file for 'bloaty' pkgname=bloaty version=1.1 -revision=15 +revision=16 build_style=cmake hostmakedepends="pkg-config protobuf" makedepends="capstone-devel protobuf-devel re2-devel zlib-devel" From 0bc3e7f1bd2bfc8ac31bcc4005098f43032801f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Jun 2024 08:12:31 +0700 Subject: [PATCH 4/9] cbang: for re2-11 --- srcpkgs/cbang/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template index ec8b5e77e39be2..8b2e502200eff6 100644 --- a/srcpkgs/cbang/template +++ b/srcpkgs/cbang/template @@ -1,7 +1,7 @@ # Template file for 'cbang' pkgname=cbang version=1.8.0 -revision=2 +revision=3 build_style=scons make_build_args="sharedlib=1 staticlib=1" make_install_args="${make_build_args}" From f866cb617424beb1b2d6646c439a81c8973b64e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Jun 2024 08:12:31 +0700 Subject: [PATCH 5/9] grpc: for re2-11 --- srcpkgs/grpc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index b2c090a9a2f7e3..ac9610bcf84a43 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -1,7 +1,7 @@ # Template file for 'grpc' pkgname=grpc version=1.61.1 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON -DgRPC_CARES_PROVIDER=package -DgRPC_PROTOBUF_PROVIDER=package From 26333648b9e23a86228450daa3a0f4ec36738efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Jun 2024 08:12:32 +0700 Subject: [PATCH 6/9] sysdig: for re2-11 --- srcpkgs/sysdig/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 2a02d1d115b849..aecce7de10ba4f 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig version=0.33.1 -revision=6 +revision=7 _falcover=59fb313475b82f842e9e9bbc1e0e629428c0a4cf build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF From 462436b9a5f8e89c3a5fd2ee427d1b910e3ecea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Jun 2024 08:12:32 +0700 Subject: [PATCH 7/9] dnsdist: for re2-11 --- srcpkgs/dnsdist/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dnsdist/template b/srcpkgs/dnsdist/template index 8b6c9a089ecca4..069767d9726c36 100644 --- a/srcpkgs/dnsdist/template +++ b/srcpkgs/dnsdist/template @@ -1,7 +1,7 @@ # Template file for 'dnsdist' pkgname=dnsdist version=1.9.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-pic --with-gnu-ld --with-libsodium --with-re2 --with-net-snmp --with-libcap --with-libssl --enable-dnscrypt --with-nghttp2 From 2f214acc7ded799b03a03501e2298dfdd8ebf1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Jun 2024 08:12:33 +0700 Subject: [PATCH 8/9] mtxclient: for re2-11 --- srcpkgs/mtxclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template index 77413cbf199095..99d61932d3b56b 100644 --- a/srcpkgs/mtxclient/template +++ b/srcpkgs/mtxclient/template @@ -1,7 +1,7 @@ # Template file for 'mtxclient' pkgname=mtxclient version=0.10.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF" hostmakedepends="pkg-config" From ac8845807addd21137113137555747cb1792e99d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 23 Jun 2024 08:12:33 +0700 Subject: [PATCH 9/9] python3-grpcio: for re2-11 --- srcpkgs/python3-grpcio/template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template index ee25192910a3ad..c255fca6481415 100644 --- a/srcpkgs/python3-grpcio/template +++ b/srcpkgs/python3-grpcio/template @@ -1,7 +1,7 @@ # Template file for 'python3-grpcio' pkgname=python3-grpcio version=1.60.1 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools python3-six python3-Cython0.29" makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel @@ -14,10 +14,6 @@ homepage="https://grpc.io" distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz" checksum=dd1d3a8d1d2e50ad9b59e10aa7f07c7d1be2b367f3f2d33c5fade96ed5460962 -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - makedepends+=" libexecinfo-devel" -fi - export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1 export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 export GRPC_PYTHON_BUILD_SYSTEM_CARES=1