From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] protobuf: restructure and update to 3.12.1
Date: Fri, 22 May 2020 04:58:20 +0200 [thread overview]
Message-ID: <20200522025820.EGUzrJnKnsBPm-S66O9GkjplI7zLgiKV2O1juDn6-7I@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22175@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2207 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages protobuf
https://github.com/void-linux/void-packages/pull/22175
protobuf: restructure and update to 3.12.1
This package updates `protobuf` to 3.12.1, which causes an SO version bump that ripples through a bunch of dependents, as always. I've made a few changes in the package structure:
1. Move unversioned `protobuf` and `protobuf-devel` (which was SO version 22) to versioned `protobuf22{,-devel}`; this mirrors the previous move from unversioned to SO version 18.
2. Do *NOT* create a versioned `protobuf22-lite` subpackage. There is a versioned `protobuf18-lite`, but it is just a meta that pulls in `libprotobuf18-lite`, so it is pointless. No need to repeat that mistake for `protobuf22`.
3. Create versioned `protobuf23` and subpackages that follow the same structure as `protobuf22`, but using Protocol Buffers version 3.12.1 with SO version 23. This *will not provied* the unversioned packages that `protobuf22` used to.
4. Create meta-packages `protobuf`, `protobuf-devel`, `protobuf-lite` and `libprotoc-devel` that pull in the right versioned packages.
In the last update, there was a big dance to rename the unversioned `protobuf` subpackages from PB version 3.7.1 (SO version 18) to versioned `protobuf18` and the like, then create new unversioned packages for SO version 22 provided by PB version 3.11.x. With a standalone meta, we create the new versioned packages *once*, and just bump the dependents in the `protobuf` meta-package to point to the latest one. This mimics the LLVM meta/provider structure and makes updates a little less painful.
I'm currently rebuilding all of the revbumps on all supported archs because Travis will time out; when the builds are all done, I'll drop draft status and post an update.
@the-maldridge: I mentioned this on IRC, but let me know if you are swamped with other things and want me to take ownership of the `protobuf` packages. I use them regularly and have a vested interest in tracking new updates.
A patch file from https://github.com/void-linux/void-packages/pull/22175.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-protobuf-22175.patch --]
[-- Type: text/x-diff, Size: 33630 bytes --]
From 0665ae9aea2de84ae4a56d20ae95d497897c466c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:15:53 -0400
Subject: [PATCH 01/26] protobuf18: remove package
---
common/shlibs | 3 -
srcpkgs/libprotobuf18 | 1 -
srcpkgs/libprotobuf18-lite | 1 -
srcpkgs/libprotoc18 | 1 -
srcpkgs/libprotoc18-devel | 1 -
srcpkgs/protobuf18-devel | 1 -
srcpkgs/protobuf18-lite | 1 -
srcpkgs/protobuf18/patches/musl-fix.patch | 22 ------
srcpkgs/protobuf18/template | 95 -----------------------
9 files changed, 126 deletions(-)
delete mode 120000 srcpkgs/libprotobuf18
delete mode 120000 srcpkgs/libprotobuf18-lite
delete mode 120000 srcpkgs/libprotoc18
delete mode 120000 srcpkgs/libprotoc18-devel
delete mode 120000 srcpkgs/protobuf18-devel
delete mode 120000 srcpkgs/protobuf18-lite
delete mode 100644 srcpkgs/protobuf18/patches/musl-fix.patch
delete mode 100644 srcpkgs/protobuf18/template
diff --git a/common/shlibs b/common/shlibs
index 3abd2bcda5e..2ee5ec97791 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3069,9 +3069,6 @@ 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.18 libprotobuf18-lite-3.7.1_3
-libprotoc.so.18 libprotoc18-3.7.0_1
-libprotobuf.so.18 libprotobuf18-3.7.0_1
libprotobuf-lite.so.22 libprotobuf22-lite-3.11.2_1
libprotoc.so.22 libprotoc22-3.11.2_1
libprotobuf.so.22 libprotobuf22-3.11.2_1
diff --git a/srcpkgs/libprotobuf18 b/srcpkgs/libprotobuf18
deleted file mode 120000
index a7f3e3e0d06..00000000000
--- a/srcpkgs/libprotobuf18
+++ /dev/null
@@ -1 +0,0 @@
-protobuf18
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf18-lite b/srcpkgs/libprotobuf18-lite
deleted file mode 120000
index a7f3e3e0d06..00000000000
--- a/srcpkgs/libprotobuf18-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf18
\ No newline at end of file
diff --git a/srcpkgs/libprotoc18 b/srcpkgs/libprotoc18
deleted file mode 120000
index a7f3e3e0d06..00000000000
--- a/srcpkgs/libprotoc18
+++ /dev/null
@@ -1 +0,0 @@
-protobuf18
\ No newline at end of file
diff --git a/srcpkgs/libprotoc18-devel b/srcpkgs/libprotoc18-devel
deleted file mode 120000
index a7f3e3e0d06..00000000000
--- a/srcpkgs/libprotoc18-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf18
\ No newline at end of file
diff --git a/srcpkgs/protobuf18-devel b/srcpkgs/protobuf18-devel
deleted file mode 120000
index a7f3e3e0d06..00000000000
--- a/srcpkgs/protobuf18-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf18
\ No newline at end of file
diff --git a/srcpkgs/protobuf18-lite b/srcpkgs/protobuf18-lite
deleted file mode 120000
index a7f3e3e0d06..00000000000
--- a/srcpkgs/protobuf18-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf18
\ No newline at end of file
diff --git a/srcpkgs/protobuf18/patches/musl-fix.patch b/srcpkgs/protobuf18/patches/musl-fix.patch
deleted file mode 100644
index 09343ed0715..00000000000
--- a/srcpkgs/protobuf18/patches/musl-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-seems like both musl libc and android has byteswap.h
-
---- ./src/google/protobuf/stubs/port.h.orig 2018-07-01 12:46:31.204740205 +0200
-+++ ./src/google/protobuf/stubs/port.h 2018-07-01 12:46:00.245986923 +0200
-@@ -94,7 +94,7 @@
- #include <intrin.h>
- #elif defined(__APPLE__)
- #include <libkern/OSByteOrder.h>
--#elif defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__)
-+#elif defined(__linux__) || defined(__BIONIC__) || defined(__CYGWIN__)
- #include <byteswap.h> // IWYU pragma: export
- #endif
-
-@@ -380,7 +380,7 @@ inline void GOOGLE_UNALIGNED_STORE64(voi
- #define bswap_32(x) OSSwapInt32(x)
- #define bswap_64(x) OSSwapInt64(x)
-
--#elif !defined(__GLIBC__) && !defined(__BIONIC__) && !defined(__CYGWIN__)
-+#elif !defined(__linux__) && !defined(__BIONIC__) && !defined(__CYGWIN__)
-
- static inline uint16 bswap_16(uint16 x) {
- return static_cast<uint16>(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8));
diff --git a/srcpkgs/protobuf18/template b/srcpkgs/protobuf18/template
deleted file mode 100644
index 5d40bf2dda8..00000000000
--- a/srcpkgs/protobuf18/template
+++ /dev/null
@@ -1,95 +0,0 @@
-# Template file for 'protobuf18'
-pkgname=protobuf18
-version=3.7.1
-revision=3
-wrksrc="protobuf-${version}"
-build_style=gnu-configure
-hostmakedepends="pkg-config automake libtool"
-makedepends="zlib-devel"
-short_desc="Protocol buffers compiler"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://developers.google.com/protocol-buffers/"
-changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
-distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=f1748989842b46fa208b2a6e4e2785133cfcc3e4d43c17fecb023733f0f5443f
-
-conflicts="protobuf>=3.11.2"
-
-if [ "$CROSS_BUILD" ]; then
- # needs host protoc
- hostmakedepends+=" protobuf"
- configure_args+=" --with-protoc=/usr/bin/protoc"
-fi
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- LDFLAGS+=" -latomic"
-fi
-
-pre_configure() {
- autoreconf -fi
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-libprotobuf18_package() {
- short_desc="Protocol buffers C++ library"
- pkg_install() {
- vmove "usr/lib/libprotobuf.so.*"
- vlicense LICENSE
- }
-}
-
-libprotobuf18-lite_package() {
- short_desc="Protocol buffers C++ library (lite version)"
- replaces="libprotobuf-lite18>=0"
- pkg_install() {
- vmove "usr/lib/libprotobuf-lite.so.*"
- vlicense LICENSE
- }
-}
-
-libprotoc18_package() {
- short_desc="Protocol buffers compiler library"
- pkg_install() {
- vmove "usr/lib/libprotoc*.so.*"
- vlicense LICENSE
- }
-}
-
-libprotoc18-devel_package() {
- depends="libprotoc18-${version}_${revision}"
- short_desc="Protocol buffers compiler library - development files"
- conflicts="libprotoc-devel>=3.11.2"
- pkg_install() {
- vmove usr/lib/libprotoc.a
- vmove usr/lib/libprotoc.so
- vmove usr/include/google/protobuf/compiler
- }
-}
-
-protobuf18-devel_package() {
- depends="zlib-devel
- libprotobuf18-${version}_${revision}
- libprotobuf18-lite-${version}_${revision}"
- short_desc="Protocol buffers C++ library - development files"
- conflicts="protobuf-devel>=3.11.2"
- 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
- }
-}
-
-protobuf18-lite_package() {
- build_style=meta
- short_desc="Protocol buffers C++ library (lite version)"
- depends="libprotobuf18-lite-${version}_${revision}"
- archs=noarch
-}
From e9da05dd145e74aad00071882d81f2d381a693a8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:48:39 -0400
Subject: [PATCH 02/26] New package: protobuf23-3.12.1
---
common/shlibs | 3 ++
srcpkgs/libprotobuf23 | 1 +
srcpkgs/libprotobuf23-lite | 1 +
srcpkgs/libprotoc23 | 1 +
srcpkgs/libprotoc23-devel | 1 +
srcpkgs/protobuf23-devel | 1 +
srcpkgs/protobuf23/template | 92 +++++++++++++++++++++++++++++++++++++
7 files changed, 100 insertions(+)
create mode 120000 srcpkgs/libprotobuf23
create mode 120000 srcpkgs/libprotobuf23-lite
create mode 120000 srcpkgs/libprotoc23
create mode 120000 srcpkgs/libprotoc23-devel
create mode 120000 srcpkgs/protobuf23-devel
create mode 100644 srcpkgs/protobuf23/template
diff --git a/common/shlibs b/common/shlibs
index 2ee5ec97791..14235227b3b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3072,6 +3072,9 @@ libm17n.so.0 m17n-lib-1.7.0_1
libprotobuf-lite.so.22 libprotobuf22-lite-3.11.2_1
libprotoc.so.22 libprotoc22-3.11.2_1
libprotobuf.so.22 libprotobuf22-3.11.2_1
+libprotobuf-lite.so.23 libprotobuf23-lite-3.12.1_1
+libprotoc.so.23 libprotoc23-3.12.1_1
+libprotobuf.so.23 libprotobuf23-3.12.1_1
libsombok.so.3 sombok-2.4.0_1
libdeviceclient.so.0 pragha-1.3.3_1
libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
diff --git a/srcpkgs/libprotobuf23 b/srcpkgs/libprotobuf23
new file mode 120000
index 00000000000..519d8fd3126
--- /dev/null
+++ b/srcpkgs/libprotobuf23
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf23-lite b/srcpkgs/libprotobuf23-lite
new file mode 120000
index 00000000000..519d8fd3126
--- /dev/null
+++ b/srcpkgs/libprotobuf23-lite
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/libprotoc23 b/srcpkgs/libprotoc23
new file mode 120000
index 00000000000..519d8fd3126
--- /dev/null
+++ b/srcpkgs/libprotoc23
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/libprotoc23-devel b/srcpkgs/libprotoc23-devel
new file mode 120000
index 00000000000..519d8fd3126
--- /dev/null
+++ b/srcpkgs/libprotoc23-devel
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/protobuf23-devel b/srcpkgs/protobuf23-devel
new file mode 120000
index 00000000000..519d8fd3126
--- /dev/null
+++ b/srcpkgs/protobuf23-devel
@@ -0,0 +1 @@
+protobuf23
\ No newline at end of file
diff --git a/srcpkgs/protobuf23/template b/srcpkgs/protobuf23/template
new file mode 100644
index 00000000000..3e1787767e0
--- /dev/null
+++ b/srcpkgs/protobuf23/template
@@ -0,0 +1,92 @@
+# Template file for 'protobuf23'
+pkgname=protobuf23
+version=3.12.1
+revision=1
+wrksrc="protobuf-${version}"
+build_style=gnu-configure
+hostmakedepends="pkg-config automake libtool"
+makedepends="zlib-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"
+distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
+checksum=cb9b3f9d625b5739a358268eb3421de11cacd90025f5f7672c3930553eca810e
+
+conflicts="protobuf18>=0 protobuf22>=0"
+
+if [ "$CROSS_BUILD" ]; then
+ # needs host protoc
+ hostmakedepends+=" ${pkgname}"
+ configure_args+=" --with-protoc=/usr/bin/protoc"
+fi
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+ LDFLAGS+=" -latomic"
+fi
+
+pre_configure() {
+ autoreconf -fi
+}
+
+do_configure() {
+ # configure doesn't set proper linker flags when discovering pthread
+ PTHREAD_LIBS="-pthread" PTHREAD_CFLAGS="-pthread" ./configure ${configure_args}
+}
+
+post_install() {
+ vlicense LICENSE
+}
+
+libprotobuf23_package() {
+ short_desc="Protocol buffers C++ library"
+ pkg_install() {
+ vmove "usr/lib/libprotobuf.so.*"
+ vlicense LICENSE
+ }
+}
+
+libprotobuf23-lite_package() {
+ short_desc="Protocol buffers C++ library (lite version)"
+ pkg_install() {
+ vmove "usr/lib/libprotobuf-lite.so.*"
+ vlicense LICENSE
+ }
+}
+
+libprotoc23_package() {
+ short_desc="Protocol buffers compiler library"
+ pkg_install() {
+ vmove "usr/lib/libprotoc*.so.*"
+ vlicense LICENSE
+ }
+}
+
+libprotoc23-devel_package() {
+ depends="libprotoc23-${version}_${revision}"
+ short_desc="Protocol buffers compiler library - development files"
+ conflicts="libprotoc18-devel>=0 libprotoc22-devel>=0"
+ pkg_install() {
+ vmove usr/lib/libprotoc.a
+ vmove usr/lib/libprotoc.so
+ vmove usr/include/google/protobuf/compiler
+ }
+}
+
+protobuf23-devel_package() {
+ depends="zlib-devel
+ libprotobuf23-${version}_${revision}
+ libprotobuf23-lite-${version}_${revision}"
+ short_desc="Protocol buffers C++ library - development files"
+ conflicts="protobuf18-devel>=0 protobuf22-devel>=0"
+ 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
+ }
+}
From 411c2f719b81ac571a42d7c82041e4043eb40ec3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 22:11:58 -0400
Subject: [PATCH 03/26] protobuf: upgrade to 3.12.1, move to meta-package
---
common/shlibs | 3 --
srcpkgs/libprotobuf22 | 1 -
srcpkgs/libprotobuf22-lite | 1 -
srcpkgs/libprotoc22 | 1 -
srcpkgs/protobuf/template | 104 ++++++++-----------------------------
5 files changed, 21 insertions(+), 89 deletions(-)
delete mode 120000 srcpkgs/libprotobuf22
delete mode 120000 srcpkgs/libprotobuf22-lite
delete mode 120000 srcpkgs/libprotoc22
diff --git a/common/shlibs b/common/shlibs
index 14235227b3b..3edf60c1f90 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3069,9 +3069,6 @@ 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.22 libprotobuf22-lite-3.11.2_1
-libprotoc.so.22 libprotoc22-3.11.2_1
-libprotobuf.so.22 libprotobuf22-3.11.2_1
libprotobuf-lite.so.23 libprotobuf23-lite-3.12.1_1
libprotoc.so.23 libprotoc23-3.12.1_1
libprotobuf.so.23 libprotobuf23-3.12.1_1
diff --git a/srcpkgs/libprotobuf22 b/srcpkgs/libprotobuf22
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/libprotobuf22
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf22-lite b/srcpkgs/libprotobuf22-lite
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/libprotobuf22-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc22 b/srcpkgs/libprotoc22
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/libprotoc22
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 072139255b5..2407e30da9f 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,94 +1,32 @@
# Template file for 'protobuf'
pkgname=protobuf
-version=3.11.4
+version=3.12.1
revision=1
-build_style=gnu-configure
-hostmakedepends="pkg-config automake libtool"
-makedepends="zlib-devel"
-short_desc="Protocol buffers compiler"
-maintainer="Michael Aldridge <maldridge@voidlinux.org>"
-license="BSD-3-Clause"
-homepage="https://developers.google.com/protocol-buffers/"
-changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
-distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
-checksum=a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9
-
-if [ "$CROSS_BUILD" ]; then
- # needs host protoc
- hostmakedepends+=" protobuf"
- configure_args+=" --with-protoc=/usr/bin/protoc"
-fi
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- makedepends+=" libatomic-devel"
- LDFLAGS+=" -latomic"
-fi
-
-pre_configure() {
- autoreconf -fi
-}
-
-do_configure() {
- # configure doesn't set proper linker flags when discovering pthread
- PTHREAD_LIBS="-pthread" PTHREAD_CFLAGS="-pthread" ./configure ${configure_args}
-}
-
-post_install() {
- vlicense LICENSE
-}
-
-libprotobuf22_package() {
- short_desc="Protocol buffers C++ library"
- pkg_install() {
- vmove "usr/lib/libprotobuf.so.*"
- vlicense LICENSE
- }
-}
-
-libprotobuf22-lite_package() {
- short_desc="Protocol buffers C++ library (lite version)"
- pkg_install() {
- vmove "usr/lib/libprotobuf-lite.so.*"
- vlicense LICENSE
- }
-}
-
-libprotoc22_package() {
- short_desc="Protocol buffers compiler library"
- pkg_install() {
- vmove "usr/lib/libprotoc*.so.*"
- vlicense LICENSE
- }
-}
-
-libprotoc-devel_package() {
- depends="libprotoc22-${version}_${revision}"
- short_desc="Protocol buffers compiler library - development files"
- pkg_install() {
- vmove usr/lib/libprotoc.a
- vmove usr/lib/libprotoc.so
- vmove usr/include/google/protobuf/compiler
- }
-}
+archs=noarch
+build_style=meta
+depends="protobuf23"
+short_desc="Protocol buffers compiler (meta package)"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Public Domain"
+homepage="https://www.voidlinux.org"
protobuf-devel_package() {
- depends="zlib-devel
- libprotobuf22-${version}_${revision}
- libprotobuf22-lite-${version}_${revision}"
- short_desc="Protocol buffers C++ library - development files"
- 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
- }
+ archs=noarch
+ build_style=meta
+ short_desc="Protocol buffers C++ library - development files (meta package)"
+ depends="protobuf23-devel"
}
protobuf-lite_package() {
+ archs=noarch
build_style=meta
- short_desc="Protocol buffers C++ library (lite version)"
- depends="libprotobuf22-lite-${version}_${revision}"
+ short_desc="Protocol buffers C++ library - lite version (meta package)"
+ depends="libprotobuf23-lite"
+}
+
+libprotoc-devel_package() {
archs=noarch
+ build_style=meta
+ short_desc="Protocol buffers compiler library - development files (meta package)"
+ depends="libprotoc23-devel"
}
From 849fcb857a706ed11bc02792ed9808eb3404e5b7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:24 -0400
Subject: [PATCH 04/26] EternalTerminal: revbump against protobuf 3.12.1
---
srcpkgs/EternalTerminal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index c1cd574bf51..cf8eef864e1 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
# Template file for 'EternalTerminal'
pkgname=EternalTerminal
version=6.0.5
-revision=3
+revision=4
wrksrc="${pkgname}-et-v${version}"
build_style=cmake
hostmakedepends="protobuf"
From f91987e946f755b0580a4ce6bddc0ab2be66d193 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:24 -0400
Subject: [PATCH 05/26] astroid: revbump against protobuf 3.12.1
---
srcpkgs/astroid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index e0c486a4a72..1b16201e5a0 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
# Template file for 'astroid'
pkgname=astroid
version=0.15
-revision=3
+revision=4
build_style=cmake
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
From 883a71044fd6723ff2af37e473888afc457c8ef5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:24 -0400
Subject: [PATCH 06/26] clementine: revbump against protobuf 3.12.1
---
srcpkgs/clementine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index 93c5a221dfc..52a025ea8d7 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
# Template file for 'clementine'
pkgname=clementine
version=1.3.1
-revision=23
+revision=24
_commit=75f18dab23f0842713a4200a7e362efd51b12e31
wrksrc="Clementine-${_commit}"
build_style=cmake
From 1fa539c8cbea1bdfb45acafcab403c3fde3ad36a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:24 -0400
Subject: [PATCH 07/26] cura-engine: revbump against protobuf 3.12.1
---
srcpkgs/cura-engine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 219f497f3cb..232aa6628c3 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
# Template file for 'cura-engine'
pkgname=cura-engine
version=4.6.1
-revision=1
+revision=2
wrksrc="CuraEngine-${version}"
build_style=cmake
configure_args="-DCURA_ENGINE_VERSION=${version}"
From c7a29daae19e65e1b322a363eaf25dffa8c8273e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:24 -0400
Subject: [PATCH 08/26] grpc: revbump against protobuf 3.12.1
---
srcpkgs/grpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index aeef3cb0836..3541d1370cf 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
# Template file for 'grpc'
pkgname=grpc
version=1.27.3
-revision=1
+revision=2
_abseilver=37dd2562ec830d547a1524bb306be313ac3f2556
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
From c59015eded3734ad9502eb91790ba8a892a35f5e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:24 -0400
Subject: [PATCH 09/26] hyperion: revbump against protobuf 3.12.1
---
srcpkgs/hyperion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hyperion/template b/srcpkgs/hyperion/template
index 09a2110bbac..77ee0545d08 100644
--- a/srcpkgs/hyperion/template
+++ b/srcpkgs/hyperion/template
@@ -1,7 +1,7 @@
# Template file for 'hyperion'
pkgname=hyperion
version=1.03.2
-revision=4
+revision=5
build_style=cmake
configure_args="-DUSE_SYSTEM_PROTO_LIBS=ON -DENABLE_QT5=ON
-DPROTOBUF_PROTOC_EXECUTABLE=/usr/bin/protoc -DENABLE_AMLOGIC=ON
From 548e4e8e7bec655eb5104e4a5fdd390558810320 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:25 -0400
Subject: [PATCH 10/26] kismet: revbump against protobuf 3.12.1
---
srcpkgs/kismet/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index c859b8652aa..b72b3ece0a2 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
# Template file for 'kismet'
pkgname=kismet
version=2020.04.R3
-revision=1
+revision=2
_realver="${version//./-}"
wrksrc="${pkgname}-${_realver}"
build_style=gnu-configure
From e9b2d97c2a97d32631f961d2db5f9cfe81978df3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:25 -0400
Subject: [PATCH 11/26] libArcus: revbump against protobuf 3.12.1
---
srcpkgs/libArcus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 7677d4cc138..214628d6b00 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
# Template file for 'libArcus'
pkgname=libArcus
version=4.6.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_EXAMPLES=OFF"
hostmakedepends="protobuf python3-sip-devel"
From 0d0a305d0e5e55c3c1a4f9fbb35bf9bac532f123 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:25 -0400
Subject: [PATCH 12/26] libcompizconfig: revbump against protobuf 3.12.1
---
srcpkgs/libcompizconfig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template
index 16b1de55edc..3008f197e44 100644
--- a/srcpkgs/libcompizconfig/template
+++ b/srcpkgs/libcompizconfig/template
@@ -1,7 +1,7 @@
# Template file for 'libcompizconfig'
pkgname=libcompizconfig
version=0.8.18
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="automake intltool libtool pkg-config protobuf"
From 3b9960baafcb5f843ef3fe58d2b08d8b1479212d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:25 -0400
Subject: [PATCH 13/26] litecoin: revbump against protobuf 3.12.1
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 207b0bff782..c1f9eb22977 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.17.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-libressl"
From 00967342cf2cf8df141206a5a66393a4742bfd6a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:25 -0400
Subject: [PATCH 14/26] mixxx: revbump against protobuf 3.12.1
---
srcpkgs/mixxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 1b0b06a1a63..9d1e32b4536 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
# Template file for 'mixxx'
pkgname=mixxx
version=2.2.3
-revision=2
+revision=3
wrksrc="mixxx-release-${version}"
build_style=scons
hostmakedepends="pkg-config protobuf"
From 7d88216a09da387cf00a5b15c524f620778049a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:25 -0400
Subject: [PATCH 15/26] mosh: revbump against protobuf 3.12.1
---
srcpkgs/mosh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index ad93d97a071..780f0475149 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
# Template file for 'mosh'
pkgname=mosh
version=1.3.2
-revision=15
+revision=16
build_style=gnu-configure
hostmakedepends="pkg-config protobuf"
makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
From a1c8a5118c7031bbe4401dc758953c2b1624fa31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:25 -0400
Subject: [PATCH 16/26] mozc: revbump against protobuf 3.12.1
---
srcpkgs/mozc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 69db0175f4b..82d137afca7 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -1,7 +1,7 @@
# Template file for 'mozc'
pkgname=mozc
version=2.23.2815.102
-revision=6
+revision=7
create_wrksrc=yes
build_wrksrc=mozc/src
hostmakedepends="gettext ninja pkg-config protobuf protobuf-devel python which"
From 59582dab92ea515e303ea0cd054b725131cb4761 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:26 -0400
Subject: [PATCH 17/26] mumble: revbump against protobuf 3.12.1
---
srcpkgs/mumble/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index acb8674c9ca..224a2713ebd 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
# Template file for 'mumble'
pkgname=mumble
version=1.3.0
-revision=4
+revision=5
build_style=qmake
configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
From 01f2ca4cde722c74e256489aba131145976d6709 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:26 -0400
Subject: [PATCH 18/26] nsjail: revbump against protobuf 3.12.1
---
srcpkgs/nsjail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index 37e7ea17517..81025a90a8a 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
# Template file for 'nsjail'
pkgname=nsjail
version=2.9
-revision=3
+revision=4
build_style=gnu-makefile
hostmakedepends="bison flex pkg-config protobuf which"
makedepends="libnl3-devel protobuf-devel"
From a63b4bc89d23cd2d5359b686a5e2c0e55879ed81 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:26 -0400
Subject: [PATCH 19/26] paraview: revbump against protobuf 3.12.1
---
srcpkgs/paraview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index 0d84e89aa1c..6a9fb234ab8 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.6.1
-revision=4
+revision=5
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DPARAVIEW_ENABLE_FFMPEG=ON
From 42084278547d1ce896ef1fff3014117ca9c9e091 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:26 -0400
Subject: [PATCH 20/26] protobuf-c: revbump against protobuf 3.12.1
---
srcpkgs/protobuf-c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template
index ee1d252ac3c..88cfe98147f 100644
--- a/srcpkgs/protobuf-c/template
+++ b/srcpkgs/protobuf-c/template
@@ -1,7 +1,7 @@
# Template file for 'protobuf-c'
pkgname=protobuf-c
version=1.3.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="$(vopt_enable protoc)"
hostmakedepends="pkg-config protobuf"
From a1bdd30b4e08234a9706dca351fa759cc829af23 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:26 -0400
Subject: [PATCH 21/26] strawberry: revbump against protobuf 3.12.1
---
srcpkgs/strawberry/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 265063fe2fe..32c68417fb2 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
# Template file for 'strawberry'
pkgname=strawberry
version=0.6.10
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf gettext"
makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel
From 75efa70d6bead8eb1561aedad46bd740eb868ef5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:26 -0400
Subject: [PATCH 22/26] sysdig: revbump against protobuf 3.12.1; fix checksum
---
srcpkgs/sysdig/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index c360a8049c8..b7f3c671bff 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.26.7
-revision=1
+revision=2
archs="i686 x86_64 ppc64le"
build_style=cmake
configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
@@ -19,7 +19,7 @@ license="Apache-2.0, MIT, GPL-2.0-only"
homepage="http://www.sysdig.org/"
changelog="https://github.com/draios/sysdig/releases"
distfiles="https://github.com/draios/${pkgname}/archive/${version}.tar.gz"
-checksum=db9792847eceda29971c34fe1af4231ce719235382847850528c7f7b13dcdfc0
+checksum=c82aa4201e8ad37e22c780c27c28ac28359a8e677b4dc0ea295eb1452115d6c0
disable_parallel_build=yes
dkms_modules="sysdig ${version}"
nocross=yes
From 78f45bc93064cd6375403da090cd9a789df71925 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:26 -0400
Subject: [PATCH 23/26] usbguard: revbump against protobuf 3.12.1
---
srcpkgs/usbguard/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index 6c40641ea3b..648100e36f0 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
# Template file for 'usbguard'
pkgname=usbguard
version=0.7.6
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
conf_files="/etc/usbguard/*"
From a3f6a9e81ae118589c2dce715eb4432b4753a330 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:27 -0400
Subject: [PATCH 24/26] vlc: revbump against protobuf 3.12.1
---
srcpkgs/vlc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index cc3631b09bc..03b262edf0c 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
# Template file for 'vlc'
pkgname=vlc
version=3.0.10
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gme --disable-libtar --enable-jack
--enable-live555 --disable-fluidsynth --enable-dvdread
From dc15ca73917f0d9b2f8ffc78096dacbeb4cc24fd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:54:27 -0400
Subject: [PATCH 25/26] zbackup: revbump against protobuf 3.12.1
---
srcpkgs/zbackup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index 9f2b7f8d236..ceea4527ffb 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,7 +1,7 @@
# Template file for 'zbackup'
pkgname=zbackup
version=1.4.4
-revision=16
+revision=17
build_style=cmake
hostmakedepends="protobuf"
makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
From 9185b33f578cccdc225d4eb924629ad3713f9603 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:58:23 -0400
Subject: [PATCH 26/26] bitcoin: revbump against protobuf 3.12.1 [ci skip]
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 7f21abcfb15..4b74e47916c 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=0.19.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
next prev parent reply other threads:[~2020-05-22 2:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 18:33 [PR PATCH] " ahesford
2020-05-21 23:38 ` [PR PATCH] [Updated] " ahesford
2020-05-21 23:48 ` ahesford
2020-05-22 0:31 ` q66
2020-05-22 2:04 ` q66
2020-05-22 2:09 ` ahesford
2020-05-22 2:14 ` [PR PATCH] [Updated] " ahesford
2020-05-22 2:58 ` ahesford [this message]
2020-05-22 3:32 ` ahesford
2020-05-23 3:17 ` ahesford
2020-05-23 3:55 ` [PR PATCH] [Closed]: " q66
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200522025820.EGUzrJnKnsBPm-S66O9GkjplI7zLgiKV2O1juDn6-7I@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).