Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] protobuf: restructure and update to 3.12.1
@ 2020-05-21 18:33 ahesford
  2020-05-21 23:38 ` [PR PATCH] [Updated] " ahesford
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: ahesford @ 2020-05-21 18:33 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 2202 bytes --]

There is a new 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: 30730 bytes --]

From e4deeb24da4534768e24316cf99c235cdb9e522d 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/27] protobuf18: fix update version detection

---
 srcpkgs/protobuf18/template               | 8 ++------
 srcpkgs/protobuf18/update                 | 2 ++
 srcpkgs/{protobuf => protobuf22}/template | 0
 3 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/protobuf18/update
 rename srcpkgs/{protobuf => protobuf22}/template (100%)

diff --git a/srcpkgs/protobuf18/template b/srcpkgs/protobuf18/template
index 5d40bf2dda8..4ac0fd3741d 100644
--- a/srcpkgs/protobuf18/template
+++ b/srcpkgs/protobuf18/template
@@ -1,7 +1,7 @@
 # Template file for 'protobuf18'
 pkgname=protobuf18
 version=3.7.1
-revision=3
+revision=4
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
@@ -14,11 +14,9 @@ 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"
+	hostmakedepends+=" ${pkgname}"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
@@ -63,7 +61,6 @@ libprotoc18_package() {
 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
@@ -76,7 +73,6 @@ protobuf18-devel_package() {
 	 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
diff --git a/srcpkgs/protobuf18/update b/srcpkgs/protobuf18/update
new file mode 100644
index 00000000000..83ea5d6bd9b
--- /dev/null
+++ b/srcpkgs/protobuf18/update
@@ -0,0 +1,2 @@
+site="https://github.com/protocolbuffers/protobuf/tags?after=v3.8.0-rc1"
+pattern="v\K3\.7\.[\d.]*(?=.zip)"
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf22/template
similarity index 100%
rename from srcpkgs/protobuf/template
rename to srcpkgs/protobuf22/template

From 12cf5dddeddfb1567ddbcee31172703c6bf7ab18 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:19:46 -0400
Subject: [PATCH 02/27] protobuf: rename all packages with major version 22

---
 srcpkgs/libprotobuf22       |  2 +-
 srcpkgs/libprotobuf22-lite  |  2 +-
 srcpkgs/libprotoc-devel     |  1 -
 srcpkgs/libprotoc22         |  2 +-
 srcpkgs/libprotoc22-devel   |  1 +
 srcpkgs/protobuf-devel      |  1 -
 srcpkgs/protobuf-lite       |  1 -
 srcpkgs/protobuf22-devel    |  1 +
 srcpkgs/protobuf22/template | 24 +++++++++++-------------
 srcpkgs/protobuf22/update   |  2 ++
 10 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/libprotoc-devel
 create mode 120000 srcpkgs/libprotoc22-devel
 delete mode 120000 srcpkgs/protobuf-devel
 delete mode 120000 srcpkgs/protobuf-lite
 create mode 120000 srcpkgs/protobuf22-devel
 create mode 100644 srcpkgs/protobuf22/update

diff --git a/srcpkgs/libprotobuf22 b/srcpkgs/libprotobuf22
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotobuf22
+++ b/srcpkgs/libprotobuf22
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf22-lite b/srcpkgs/libprotobuf22-lite
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotobuf22-lite
+++ b/srcpkgs/libprotobuf22-lite
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/libprotoc-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc22 b/srcpkgs/libprotoc22
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotoc22
+++ b/srcpkgs/libprotoc22
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotoc22-devel b/srcpkgs/libprotoc22-devel
new file mode 120000
index 00000000000..e533946003b
--- /dev/null
+++ b/srcpkgs/libprotoc22-devel
@@ -0,0 +1 @@
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/protobuf-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/protobuf-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf22-devel b/srcpkgs/protobuf22-devel
new file mode 120000
index 00000000000..e533946003b
--- /dev/null
+++ b/srcpkgs/protobuf22-devel
@@ -0,0 +1 @@
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/protobuf22/template b/srcpkgs/protobuf22/template
index 072139255b5..da9ae727d90 100644
--- a/srcpkgs/protobuf22/template
+++ b/srcpkgs/protobuf22/template
@@ -1,7 +1,8 @@
-# Template file for 'protobuf'
-pkgname=protobuf
+# Template file for 'protobuf22'
+pkgname=protobuf22
 version=3.11.4
-revision=1
+revision=2
+wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
 makedepends="zlib-devel"
@@ -13,9 +14,11 @@ changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
 checksum=a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9
 
+conflicts="protobuf18>=0"
+
 if [ "$CROSS_BUILD" ]; then
 	# needs host protoc
-	hostmakedepends+=" protobuf"
+	hostmakedepends+=" ${pkgname}"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
@@ -61,9 +64,10 @@ libprotoc22_package() {
 	}
 }
 
-libprotoc-devel_package() {
+libprotoc22-devel_package() {
 	depends="libprotoc22-${version}_${revision}"
 	short_desc="Protocol buffers compiler library - development files"
+	conflicts="libprotoc18-devel>=0"
 	pkg_install() {
 		vmove usr/lib/libprotoc.a
 		vmove usr/lib/libprotoc.so
@@ -71,11 +75,12 @@ libprotoc-devel_package() {
 	}
 }
 
-protobuf-devel_package() {
+protobuf22-devel_package() {
 	depends="zlib-devel
 	 libprotobuf22-${version}_${revision}
 	 libprotobuf22-lite-${version}_${revision}"
 	short_desc="Protocol buffers C++ library - development files"
+	conflicts="protobuf18-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/libprotobuf.a
@@ -85,10 +90,3 @@ protobuf-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-protobuf-lite_package() {
-	build_style=meta
-	short_desc="Protocol buffers C++ library (lite version)"
-	depends="libprotobuf22-lite-${version}_${revision}"
-	archs=noarch
-}
diff --git a/srcpkgs/protobuf22/update b/srcpkgs/protobuf22/update
new file mode 100644
index 00000000000..a575dd0beea
--- /dev/null
+++ b/srcpkgs/protobuf22/update
@@ -0,0 +1,2 @@
+site="https://github.com/protocolbuffers/protobuf/tags?after=v3.12.0-rc1"
+pattern="v\K3\.11\.[\d.]*(?=.zip)"

From 79b1af42fb7c9a1e88b127c6cbd0fca3e9542b24 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 03/27] 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 3abd2bcda5e..dbcc5d03c88 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3075,6 +3075,9 @@ 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
+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..8ce2d79c5d2
--- /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="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=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>=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 8c2c0200e11ace354d4abe95750f40fba6d2a6ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:50:43 -0400
Subject: [PATCH 04/27] protobuf: upgrade to 3.12.1_1, move to meta-package

---
 srcpkgs/libprotoc-devel   |  1 +
 srcpkgs/protobuf-devel    |  1 +
 srcpkgs/protobuf-lite     |  1 +
 srcpkgs/protobuf/template | 28 ++++++++++++++++++++++++++++
 4 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/libprotoc-devel
 create mode 120000 srcpkgs/protobuf-devel
 create mode 120000 srcpkgs/protobuf-lite
 create mode 100644 srcpkgs/protobuf/template

diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotoc-devel
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/protobuf-devel
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/protobuf-lite
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
new file mode 100644
index 00000000000..8772f1f476e
--- /dev/null
+++ b/srcpkgs/protobuf/template
@@ -0,0 +1,28 @@
+# Template file for 'protobuf'
+pkgname=protobuf
+version=3.12.1
+revision=1
+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() {
+	build_style=meta
+	depends="protobuf23-devel"
+	short_desc="Protocol buffers C++ library - development files (meta package)"
+}
+
+protobuf-lite_package() {
+	build_style=meta
+	depends="libprotobuf23-lite"
+	short_desc="Protocol buffers C++ library - lite version (meta package)"
+}
+
+libprotoc-devel_package() {
+	build_style=meta
+	depends="libprotoc23-devel"
+	short_desc="Protocol buffers compiler library - development files (meta package)"
+}

From 99260f230669de6b847f14661a4b07ecbb363b61 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/27] EternalTerminal: revbump against protobuf

---
 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 59fe667e895be58ac296b10be3491df78c4f6532 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/27] astroid: revbump against protobuf

---
 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 8c6d6c16e59002d3273e3d75b70e000fa79482bb 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/27] clementine: revbump against protobuf

---
 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 6f54c516ba2f6a720724c625362c3620d464b046 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/27] cura-engine: revbump against protobuf

---
 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 47796d44fa18b0eaf09cc98e5fca4246c2cb0eaf 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/27] grpc: revbump against protobuf

---
 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 afe131b49ed1a1b21fe453add8662e4a30df464c 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 10/27] hyperion: revbump against protobuf

---
 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 cde30ba99e747227414ed7c17df5d9d9aa4bec00 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/27] kismet: revbump against protobuf

---
 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 cf8383e49b0e68bfceaa1e38ee2ce2d686114cf2 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/27] libArcus: revbump against protobuf

---
 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 70fd4360421a981117f763991cb345c7c27cc762 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/27] libcompizconfig: revbump against protobuf

---
 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 b0d2b55416e3d4f436ae083a464b573fa1f4e737 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/27] litecoin: revbump against protobuf

---
 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 b4bd433e588ebf239c310b5a1cd05c517a96ddf1 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/27] mixxx: revbump against protobuf

---
 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 7bcbce206fb96290345fcecb73ad860905372763 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/27] mosh: revbump against protobuf

---
 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 1278104e4ddff49fc5e65992cb093d005a888cbb 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 17/27] mozc: revbump against protobuf

---
 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 8882f7e68a8a1658bd7eb724583b732fcce1b1fe 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/27] mumble: revbump against protobuf

---
 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 ace2057dd62953c0e15680cd5967e565d68669be 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/27] nsjail: revbump against protobuf

---
 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 e0bca1f770ebdcaf35486f01cdf115bb02678eed 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/27] paraview: revbump against protobuf

---
 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 e3c486307b09f71a63ccb2b201241f403fbaced7 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/27] protobuf-c: revbump against protobuf

---
 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 20cf29e4564a4d5196a01921c8499f84443154db 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/27] strawberry: revbump against protobuf

---
 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 7cff57478b72753f8d919834864c07756b18076a 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/27] sysdig: revbump against protobuf

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index c360a8049c8..a2918fc7f6e 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

From 72f1c433bae98822c745cba457db400b8681913d 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 24/27] usbguard: revbump against protobuf

---
 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 2c0ca4ae1548fdab1793c13f34c6794c214a90be 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/27] vlc: revbump against protobuf

---
 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 fcbe487015a7ec3c575b03cb80185acce6ed4d3e 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 26/27] zbackup: revbump against protobuf

---
 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 f958f687cae5c141800ad6d0f569710d72b15d28 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 27/27] bitcoin: revbump against protobuf [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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 ahesford
@ 2020-05-21 23:38 ` ahesford
  2020-05-21 23:48 ` ahesford
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ahesford @ 2020-05-21 23:38 UTC (permalink / raw)
  To: ml


[-- 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: 31266 bytes --]

From e4deeb24da4534768e24316cf99c235cdb9e522d 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/27] protobuf18: fix update version detection

---
 srcpkgs/protobuf18/template               | 8 ++------
 srcpkgs/protobuf18/update                 | 2 ++
 srcpkgs/{protobuf => protobuf22}/template | 0
 3 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/protobuf18/update
 rename srcpkgs/{protobuf => protobuf22}/template (100%)

diff --git a/srcpkgs/protobuf18/template b/srcpkgs/protobuf18/template
index 5d40bf2dda8..4ac0fd3741d 100644
--- a/srcpkgs/protobuf18/template
+++ b/srcpkgs/protobuf18/template
@@ -1,7 +1,7 @@
 # Template file for 'protobuf18'
 pkgname=protobuf18
 version=3.7.1
-revision=3
+revision=4
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
@@ -14,11 +14,9 @@ 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"
+	hostmakedepends+=" ${pkgname}"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
@@ -63,7 +61,6 @@ libprotoc18_package() {
 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
@@ -76,7 +73,6 @@ protobuf18-devel_package() {
 	 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
diff --git a/srcpkgs/protobuf18/update b/srcpkgs/protobuf18/update
new file mode 100644
index 00000000000..83ea5d6bd9b
--- /dev/null
+++ b/srcpkgs/protobuf18/update
@@ -0,0 +1,2 @@
+site="https://github.com/protocolbuffers/protobuf/tags?after=v3.8.0-rc1"
+pattern="v\K3\.7\.[\d.]*(?=.zip)"
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf22/template
similarity index 100%
rename from srcpkgs/protobuf/template
rename to srcpkgs/protobuf22/template

From 12cf5dddeddfb1567ddbcee31172703c6bf7ab18 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:19:46 -0400
Subject: [PATCH 02/27] protobuf: rename all packages with major version 22

---
 srcpkgs/libprotobuf22       |  2 +-
 srcpkgs/libprotobuf22-lite  |  2 +-
 srcpkgs/libprotoc-devel     |  1 -
 srcpkgs/libprotoc22         |  2 +-
 srcpkgs/libprotoc22-devel   |  1 +
 srcpkgs/protobuf-devel      |  1 -
 srcpkgs/protobuf-lite       |  1 -
 srcpkgs/protobuf22-devel    |  1 +
 srcpkgs/protobuf22/template | 24 +++++++++++-------------
 srcpkgs/protobuf22/update   |  2 ++
 10 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/libprotoc-devel
 create mode 120000 srcpkgs/libprotoc22-devel
 delete mode 120000 srcpkgs/protobuf-devel
 delete mode 120000 srcpkgs/protobuf-lite
 create mode 120000 srcpkgs/protobuf22-devel
 create mode 100644 srcpkgs/protobuf22/update

diff --git a/srcpkgs/libprotobuf22 b/srcpkgs/libprotobuf22
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotobuf22
+++ b/srcpkgs/libprotobuf22
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf22-lite b/srcpkgs/libprotobuf22-lite
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotobuf22-lite
+++ b/srcpkgs/libprotobuf22-lite
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/libprotoc-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc22 b/srcpkgs/libprotoc22
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotoc22
+++ b/srcpkgs/libprotoc22
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotoc22-devel b/srcpkgs/libprotoc22-devel
new file mode 120000
index 00000000000..e533946003b
--- /dev/null
+++ b/srcpkgs/libprotoc22-devel
@@ -0,0 +1 @@
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/protobuf-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/protobuf-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf22-devel b/srcpkgs/protobuf22-devel
new file mode 120000
index 00000000000..e533946003b
--- /dev/null
+++ b/srcpkgs/protobuf22-devel
@@ -0,0 +1 @@
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/protobuf22/template b/srcpkgs/protobuf22/template
index 072139255b5..da9ae727d90 100644
--- a/srcpkgs/protobuf22/template
+++ b/srcpkgs/protobuf22/template
@@ -1,7 +1,8 @@
-# Template file for 'protobuf'
-pkgname=protobuf
+# Template file for 'protobuf22'
+pkgname=protobuf22
 version=3.11.4
-revision=1
+revision=2
+wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
 makedepends="zlib-devel"
@@ -13,9 +14,11 @@ changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
 checksum=a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9
 
+conflicts="protobuf18>=0"
+
 if [ "$CROSS_BUILD" ]; then
 	# needs host protoc
-	hostmakedepends+=" protobuf"
+	hostmakedepends+=" ${pkgname}"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
@@ -61,9 +64,10 @@ libprotoc22_package() {
 	}
 }
 
-libprotoc-devel_package() {
+libprotoc22-devel_package() {
 	depends="libprotoc22-${version}_${revision}"
 	short_desc="Protocol buffers compiler library - development files"
+	conflicts="libprotoc18-devel>=0"
 	pkg_install() {
 		vmove usr/lib/libprotoc.a
 		vmove usr/lib/libprotoc.so
@@ -71,11 +75,12 @@ libprotoc-devel_package() {
 	}
 }
 
-protobuf-devel_package() {
+protobuf22-devel_package() {
 	depends="zlib-devel
 	 libprotobuf22-${version}_${revision}
 	 libprotobuf22-lite-${version}_${revision}"
 	short_desc="Protocol buffers C++ library - development files"
+	conflicts="protobuf18-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/libprotobuf.a
@@ -85,10 +90,3 @@ protobuf-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-protobuf-lite_package() {
-	build_style=meta
-	short_desc="Protocol buffers C++ library (lite version)"
-	depends="libprotobuf22-lite-${version}_${revision}"
-	archs=noarch
-}
diff --git a/srcpkgs/protobuf22/update b/srcpkgs/protobuf22/update
new file mode 100644
index 00000000000..a575dd0beea
--- /dev/null
+++ b/srcpkgs/protobuf22/update
@@ -0,0 +1,2 @@
+site="https://github.com/protocolbuffers/protobuf/tags?after=v3.12.0-rc1"
+pattern="v\K3\.11\.[\d.]*(?=.zip)"

From 869dcc95e1ac6b9e2df98aac3296a28e583f4fd7 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 03/27] 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 3abd2bcda5e..dbcc5d03c88 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3075,6 +3075,9 @@ 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
+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..f88e9d4fc9e
--- /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="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=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 348bef383f4c3e1186306b7ac7c393c592add173 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:50:43 -0400
Subject: [PATCH 04/27] protobuf: upgrade to 3.12.1_1, move to meta-package

---
 srcpkgs/libprotoc-devel   |  1 +
 srcpkgs/protobuf-devel    |  1 +
 srcpkgs/protobuf-lite     |  1 +
 srcpkgs/protobuf/template | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libprotoc-devel
 create mode 120000 srcpkgs/protobuf-devel
 create mode 120000 srcpkgs/protobuf-lite
 create mode 100644 srcpkgs/protobuf/template

diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotoc-devel
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/protobuf-devel
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/protobuf-lite
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
new file mode 100644
index 00000000000..2407e30da9f
--- /dev/null
+++ b/srcpkgs/protobuf/template
@@ -0,0 +1,32 @@
+# Template file for 'protobuf'
+pkgname=protobuf
+version=3.12.1
+revision=1
+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() {
+	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 (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 06829a4e648f7974891b212341a9a415b13f3d00 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/27] EternalTerminal: revbump against protobuf

---
 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 63d86b81443d8f28d2445a81b7df138f828143a3 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/27] astroid: revbump against protobuf

---
 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 b5ed5ed8057cf13eb1b6bbb5404ec6b4c4fa1810 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/27] clementine: revbump against protobuf

---
 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 312366488ffd44b0c41b6ecf5e315395ce5be6ec 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/27] cura-engine: revbump against protobuf

---
 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 dd7d13f70cceee667af4470a955d7e8fa1035655 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/27] grpc: revbump against protobuf

---
 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 a339fa1f63b7eee664f5e5b360cbc4437d9628ac 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 10/27] hyperion: revbump against protobuf

---
 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 67186a877dc464b5f92b3cfbfa861b3a5df03d33 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/27] kismet: revbump against protobuf

---
 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 a7836e871f1bd18c1c7f4105759cf8dfa712f75d 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/27] libArcus: revbump against protobuf

---
 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 2ad1dbaea802ce4c4401cba36706f27d4e92d513 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/27] libcompizconfig: revbump against protobuf

---
 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 0ff6a9e7adcb2cd8209abc316b6f94d8db4462d9 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/27] litecoin: revbump against protobuf

---
 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 59a4fcb75a46b5ee77d237473b52221e5bede532 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/27] mixxx: revbump against protobuf

---
 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 8a53fa5eaaab033e07aadb724bf97ac4de17fee5 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/27] mosh: revbump against protobuf

---
 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 8b5b29aa30845f168927066b6e647270c24114aa 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 17/27] mozc: revbump against protobuf

---
 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 fca54bebd4c1687f46e755aaafb86cb8be9c25b4 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/27] mumble: revbump against protobuf

---
 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 3d2a7e6faedbda0d25112bc11cf860ac29cf49ac 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/27] nsjail: revbump against protobuf

---
 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 1071c399ed2333631362738a7d22067979cb3fc4 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/27] paraview: revbump against protobuf

---
 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 5a591cd7cc936f71b3b45a6b72b317b3cf03f0e4 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/27] protobuf-c: revbump against protobuf

---
 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 b8a0245311b3f6e671b35f431bb62fe6a8defee4 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/27] strawberry: revbump against protobuf

---
 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 d3f85c62911ea541fbf45d1c3690a316de56ebdf 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/27] sysdig: revbump against protobuf; 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 6c15350faef84437bf0466598e44e0192f47ce3d 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 24/27] usbguard: revbump against protobuf

---
 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 9784a54d61182cd4bdb657b4f5824c2dad2cdca8 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/27] vlc: revbump against protobuf

---
 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 53b6756dd154e6be51511407397d6d7c064efd42 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 26/27] zbackup: revbump against protobuf

---
 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 5a9cca2284ce744e4fb9934f5b9614f200e413b2 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 27/27] bitcoin: revbump against protobuf [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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 ahesford
  2020-05-21 23:38 ` [PR PATCH] [Updated] " ahesford
@ 2020-05-21 23:48 ` ahesford
  2020-05-22  0:31 ` q66
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ahesford @ 2020-05-21 23:48 UTC (permalink / raw)
  To: ml


[-- 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: 31427 bytes --]

From e4deeb24da4534768e24316cf99c235cdb9e522d 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/27] protobuf18: fix update version detection

---
 srcpkgs/protobuf18/template               | 8 ++------
 srcpkgs/protobuf18/update                 | 2 ++
 srcpkgs/{protobuf => protobuf22}/template | 0
 3 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/protobuf18/update
 rename srcpkgs/{protobuf => protobuf22}/template (100%)

diff --git a/srcpkgs/protobuf18/template b/srcpkgs/protobuf18/template
index 5d40bf2dda8..4ac0fd3741d 100644
--- a/srcpkgs/protobuf18/template
+++ b/srcpkgs/protobuf18/template
@@ -1,7 +1,7 @@
 # Template file for 'protobuf18'
 pkgname=protobuf18
 version=3.7.1
-revision=3
+revision=4
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
@@ -14,11 +14,9 @@ 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"
+	hostmakedepends+=" ${pkgname}"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
@@ -63,7 +61,6 @@ libprotoc18_package() {
 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
@@ -76,7 +73,6 @@ protobuf18-devel_package() {
 	 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
diff --git a/srcpkgs/protobuf18/update b/srcpkgs/protobuf18/update
new file mode 100644
index 00000000000..83ea5d6bd9b
--- /dev/null
+++ b/srcpkgs/protobuf18/update
@@ -0,0 +1,2 @@
+site="https://github.com/protocolbuffers/protobuf/tags?after=v3.8.0-rc1"
+pattern="v\K3\.7\.[\d.]*(?=.zip)"
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf22/template
similarity index 100%
rename from srcpkgs/protobuf/template
rename to srcpkgs/protobuf22/template

From 12cf5dddeddfb1567ddbcee31172703c6bf7ab18 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:19:46 -0400
Subject: [PATCH 02/27] protobuf: rename all packages with major version 22

---
 srcpkgs/libprotobuf22       |  2 +-
 srcpkgs/libprotobuf22-lite  |  2 +-
 srcpkgs/libprotoc-devel     |  1 -
 srcpkgs/libprotoc22         |  2 +-
 srcpkgs/libprotoc22-devel   |  1 +
 srcpkgs/protobuf-devel      |  1 -
 srcpkgs/protobuf-lite       |  1 -
 srcpkgs/protobuf22-devel    |  1 +
 srcpkgs/protobuf22/template | 24 +++++++++++-------------
 srcpkgs/protobuf22/update   |  2 ++
 10 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/libprotoc-devel
 create mode 120000 srcpkgs/libprotoc22-devel
 delete mode 120000 srcpkgs/protobuf-devel
 delete mode 120000 srcpkgs/protobuf-lite
 create mode 120000 srcpkgs/protobuf22-devel
 create mode 100644 srcpkgs/protobuf22/update

diff --git a/srcpkgs/libprotobuf22 b/srcpkgs/libprotobuf22
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotobuf22
+++ b/srcpkgs/libprotobuf22
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf22-lite b/srcpkgs/libprotobuf22-lite
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotobuf22-lite
+++ b/srcpkgs/libprotobuf22-lite
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/libprotoc-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc22 b/srcpkgs/libprotoc22
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotoc22
+++ b/srcpkgs/libprotoc22
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotoc22-devel b/srcpkgs/libprotoc22-devel
new file mode 120000
index 00000000000..e533946003b
--- /dev/null
+++ b/srcpkgs/libprotoc22-devel
@@ -0,0 +1 @@
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/protobuf-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/protobuf-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf22-devel b/srcpkgs/protobuf22-devel
new file mode 120000
index 00000000000..e533946003b
--- /dev/null
+++ b/srcpkgs/protobuf22-devel
@@ -0,0 +1 @@
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/protobuf22/template b/srcpkgs/protobuf22/template
index 072139255b5..da9ae727d90 100644
--- a/srcpkgs/protobuf22/template
+++ b/srcpkgs/protobuf22/template
@@ -1,7 +1,8 @@
-# Template file for 'protobuf'
-pkgname=protobuf
+# Template file for 'protobuf22'
+pkgname=protobuf22
 version=3.11.4
-revision=1
+revision=2
+wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
 makedepends="zlib-devel"
@@ -13,9 +14,11 @@ changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
 checksum=a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9
 
+conflicts="protobuf18>=0"
+
 if [ "$CROSS_BUILD" ]; then
 	# needs host protoc
-	hostmakedepends+=" protobuf"
+	hostmakedepends+=" ${pkgname}"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
@@ -61,9 +64,10 @@ libprotoc22_package() {
 	}
 }
 
-libprotoc-devel_package() {
+libprotoc22-devel_package() {
 	depends="libprotoc22-${version}_${revision}"
 	short_desc="Protocol buffers compiler library - development files"
+	conflicts="libprotoc18-devel>=0"
 	pkg_install() {
 		vmove usr/lib/libprotoc.a
 		vmove usr/lib/libprotoc.so
@@ -71,11 +75,12 @@ libprotoc-devel_package() {
 	}
 }
 
-protobuf-devel_package() {
+protobuf22-devel_package() {
 	depends="zlib-devel
 	 libprotobuf22-${version}_${revision}
 	 libprotobuf22-lite-${version}_${revision}"
 	short_desc="Protocol buffers C++ library - development files"
+	conflicts="protobuf18-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/libprotobuf.a
@@ -85,10 +90,3 @@ protobuf-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-protobuf-lite_package() {
-	build_style=meta
-	short_desc="Protocol buffers C++ library (lite version)"
-	depends="libprotobuf22-lite-${version}_${revision}"
-	archs=noarch
-}
diff --git a/srcpkgs/protobuf22/update b/srcpkgs/protobuf22/update
new file mode 100644
index 00000000000..a575dd0beea
--- /dev/null
+++ b/srcpkgs/protobuf22/update
@@ -0,0 +1,2 @@
+site="https://github.com/protocolbuffers/protobuf/tags?after=v3.12.0-rc1"
+pattern="v\K3\.11\.[\d.]*(?=.zip)"

From 869dcc95e1ac6b9e2df98aac3296a28e583f4fd7 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 03/27] 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 3abd2bcda5e..dbcc5d03c88 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3075,6 +3075,9 @@ 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
+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..f88e9d4fc9e
--- /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="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=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 348bef383f4c3e1186306b7ac7c393c592add173 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:50:43 -0400
Subject: [PATCH 04/27] protobuf: upgrade to 3.12.1_1, move to meta-package

---
 srcpkgs/libprotoc-devel   |  1 +
 srcpkgs/protobuf-devel    |  1 +
 srcpkgs/protobuf-lite     |  1 +
 srcpkgs/protobuf/template | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libprotoc-devel
 create mode 120000 srcpkgs/protobuf-devel
 create mode 120000 srcpkgs/protobuf-lite
 create mode 100644 srcpkgs/protobuf/template

diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotoc-devel
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/protobuf-devel
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/protobuf-lite
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
new file mode 100644
index 00000000000..2407e30da9f
--- /dev/null
+++ b/srcpkgs/protobuf/template
@@ -0,0 +1,32 @@
+# Template file for 'protobuf'
+pkgname=protobuf
+version=3.12.1
+revision=1
+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() {
+	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 (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 e182ce3dd47c826cf40054565002f428aa0ff267 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/27] EternalTerminal: revbump against protobuf 3.12.x

---
 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 4b74348a5ce60db8f84c69d5ba8f0b15bfff5eeb 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/27] astroid: revbump against protobuf 3.12.x

---
 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 918f968cbd46e36853fcd6b5ddfb8a06ccb5af78 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/27] clementine: revbump against protobuf 3.12.x

---
 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 4b0d99bbf894e445d4848b52f0cda1083b810bc9 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/27] cura-engine: revbump against protobuf 3.12.x

---
 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 a084c2cbacd0936a44f2e417f09e9080a5863f1b 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/27] grpc: revbump against protobuf 3.12.x

---
 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 e9aa164df9eb4a3fdc86a64692abfbfa3acc2eff 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 10/27] hyperion: revbump against protobuf 3.12.x

---
 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 a975d0249c45dfd886b4045868d104e18845cd2b 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/27] kismet: revbump against protobuf 3.12.x

---
 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 51a09fa7285f981408d02bfcfd82aff8a59db213 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/27] libArcus: revbump against protobuf 3.12.x

---
 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 75d7e44abedc5f2a6b10d43866a6c7ba3cbad739 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/27] libcompizconfig: revbump against protobuf 3.12.x

---
 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 76134b933422cab99cf0161e831639658fe1411b 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/27] litecoin: revbump against protobuf 3.12.x

---
 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 932390d9bd4ab247412e36b7e20b9144be649827 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/27] mixxx: revbump against protobuf 3.12.x

---
 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 48b44f863ffc160c484fda09cdcc49d580375194 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/27] mosh: revbump against protobuf 3.12.x

---
 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 390b2e97156ada471e32f2603815a14e80f70845 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 17/27] mozc: revbump against protobuf 3.12.x

---
 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 493d777ed1ef46999e1b2dbaaee2e3be2901d193 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/27] mumble: revbump against protobuf 3.12.x

---
 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 79f16ea41eb717fd33f4396256e15baa76c686e7 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/27] nsjail: revbump against protobuf 3.12.x

---
 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 dd79c68b14696bc0d588eb4e69aeb0cb2b34058c 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/27] paraview: revbump against protobuf 3.12.x

---
 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 4eb9deaee17005e25cb9fba190cec11327ea9f31 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/27] protobuf-c: revbump against protobuf 3.12.x

---
 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 a4c25331fb4e0b99938d040cbcfb0508fccc6a4f 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/27] strawberry: revbump against protobuf 3.12.x

---
 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 939b18b1791a4180b7ffa71a0fe0940c824caed7 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/27] sysdig: revbump against protobuf 3.12.x; 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 bfb5f60a1e37a7077f07ce146162462ca5e6ab4b 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 24/27] usbguard: revbump against protobuf 3.12.x

---
 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 09d1c7f0461483b969c9035027f3cfaadf435cea 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/27] vlc: revbump against protobuf 3.12.x

---
 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 9937ba6ae2b86b147b75f6c70a3c37ce88381d04 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 26/27] zbackup: revbump against protobuf 3.12.x

---
 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 ec731b44d7a20b28cc14e77ef68fa7b4c4ef0e80 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 27/27] bitcoin: revbump against protobuf 3.12.x [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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 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
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: q66 @ 2020-05-22  0:31 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 372 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/22175#issuecomment-632414047

Comment:
I see no point to this, just keep the names the same, bump the soname versions and bump packages that depended on the old soname. I see no reason to keep protobuf18 either, why do we have that in the first place? Nothing depends on it.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 ahesford
                   ` (2 preceding siblings ...)
  2020-05-22  0:31 ` q66
@ 2020-05-22  2:04 ` q66
  2020-05-22  2:09 ` ahesford
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: q66 @ 2020-05-22  2:04 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/22175#issuecomment-632437382

Comment:
On another thought, just keep the PR as is but drop protobuf22, as nothing depends on that so there is no point in keeping it. The versioning is still potentially useful in case it becomes necessary to have multiple versions at some point, though for now it's not.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 ahesford
                   ` (3 preceding siblings ...)
  2020-05-22  2:04 ` q66
@ 2020-05-22  2:09 ` ahesford
  2020-05-22  2:14 ` [PR PATCH] [Updated] " ahesford
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ahesford @ 2020-05-22  2:09 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/22175#issuecomment-632438523

Comment:
I see no real problem dropping protobuf22 (and protobuf18 for that matter), but I'll defer to others if there are reasonable objections to dropping them.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 ahesford
                   ` (4 preceding siblings ...)
  2020-05-22  2:09 ` ahesford
@ 2020-05-22  2:14 ` ahesford
  2020-05-22  2:58 ` ahesford
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ahesford @ 2020-05-22  2:14 UTC (permalink / raw)
  To: ml


[-- 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: 31414 bytes --]

From 60daf0ecc191e27673222fa5adbc2bc4e53948ac 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/27] protobuf18: fix update version detection

---
 srcpkgs/protobuf18/template | 8 ++------
 srcpkgs/protobuf18/update   | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/protobuf18/update

diff --git a/srcpkgs/protobuf18/template b/srcpkgs/protobuf18/template
index 5d40bf2dda8..4ac0fd3741d 100644
--- a/srcpkgs/protobuf18/template
+++ b/srcpkgs/protobuf18/template
@@ -1,7 +1,7 @@
 # Template file for 'protobuf18'
 pkgname=protobuf18
 version=3.7.1
-revision=3
+revision=4
 wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
@@ -14,11 +14,9 @@ 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"
+	hostmakedepends+=" ${pkgname}"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
@@ -63,7 +61,6 @@ libprotoc18_package() {
 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
@@ -76,7 +73,6 @@ protobuf18-devel_package() {
 	 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
diff --git a/srcpkgs/protobuf18/update b/srcpkgs/protobuf18/update
new file mode 100644
index 00000000000..83ea5d6bd9b
--- /dev/null
+++ b/srcpkgs/protobuf18/update
@@ -0,0 +1,2 @@
+site="https://github.com/protocolbuffers/protobuf/tags?after=v3.8.0-rc1"
+pattern="v\K3\.7\.[\d.]*(?=.zip)"

From 4ea4e0cb3ed4a5be8186b698927130328061d44d 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 02/27] protobuf: rename all packages with major version 22

---
 srcpkgs/libprotobuf22                     |  2 +-
 srcpkgs/libprotobuf22-lite                |  2 +-
 srcpkgs/libprotoc-devel                   |  1 -
 srcpkgs/libprotoc22                       |  2 +-
 srcpkgs/libprotoc22-devel                 |  1 +
 srcpkgs/protobuf-devel                    |  1 -
 srcpkgs/protobuf-lite                     |  1 -
 srcpkgs/protobuf22-devel                  |  1 +
 srcpkgs/{protobuf => protobuf22}/template | 24 +++++++++++------------
 srcpkgs/protobuf22/update                 |  2 ++
 10 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/libprotoc-devel
 create mode 120000 srcpkgs/libprotoc22-devel
 delete mode 120000 srcpkgs/protobuf-devel
 delete mode 120000 srcpkgs/protobuf-lite
 create mode 120000 srcpkgs/protobuf22-devel
 rename srcpkgs/{protobuf => protobuf22}/template (86%)
 create mode 100644 srcpkgs/protobuf22/update

diff --git a/srcpkgs/libprotobuf22 b/srcpkgs/libprotobuf22
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotobuf22
+++ b/srcpkgs/libprotobuf22
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotobuf22-lite b/srcpkgs/libprotobuf22-lite
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotobuf22-lite
+++ b/srcpkgs/libprotobuf22-lite
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/libprotoc-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/libprotoc22 b/srcpkgs/libprotoc22
index 779a5a300bc..e533946003b 120000
--- a/srcpkgs/libprotoc22
+++ b/srcpkgs/libprotoc22
@@ -1 +1 @@
-protobuf
\ No newline at end of file
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/libprotoc22-devel b/srcpkgs/libprotoc22-devel
new file mode 120000
index 00000000000..e533946003b
--- /dev/null
+++ b/srcpkgs/libprotoc22-devel
@@ -0,0 +1 @@
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/protobuf-devel
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
deleted file mode 120000
index 779a5a300bc..00000000000
--- a/srcpkgs/protobuf-lite
+++ /dev/null
@@ -1 +0,0 @@
-protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf22-devel b/srcpkgs/protobuf22-devel
new file mode 120000
index 00000000000..e533946003b
--- /dev/null
+++ b/srcpkgs/protobuf22-devel
@@ -0,0 +1 @@
+protobuf22
\ No newline at end of file
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf22/template
similarity index 86%
rename from srcpkgs/protobuf/template
rename to srcpkgs/protobuf22/template
index 072139255b5..da9ae727d90 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf22/template
@@ -1,7 +1,8 @@
-# Template file for 'protobuf'
-pkgname=protobuf
+# Template file for 'protobuf22'
+pkgname=protobuf22
 version=3.11.4
-revision=1
+revision=2
+wrksrc="protobuf-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config automake libtool"
 makedepends="zlib-devel"
@@ -13,9 +14,11 @@ changelog="https://raw.githubusercontent.com/google/protobuf/master/CHANGES.txt"
 distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.gz"
 checksum=a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9
 
+conflicts="protobuf18>=0"
+
 if [ "$CROSS_BUILD" ]; then
 	# needs host protoc
-	hostmakedepends+=" protobuf"
+	hostmakedepends+=" ${pkgname}"
 	configure_args+=" --with-protoc=/usr/bin/protoc"
 fi
 
@@ -61,9 +64,10 @@ libprotoc22_package() {
 	}
 }
 
-libprotoc-devel_package() {
+libprotoc22-devel_package() {
 	depends="libprotoc22-${version}_${revision}"
 	short_desc="Protocol buffers compiler library - development files"
+	conflicts="libprotoc18-devel>=0"
 	pkg_install() {
 		vmove usr/lib/libprotoc.a
 		vmove usr/lib/libprotoc.so
@@ -71,11 +75,12 @@ libprotoc-devel_package() {
 	}
 }
 
-protobuf-devel_package() {
+protobuf22-devel_package() {
 	depends="zlib-devel
 	 libprotobuf22-${version}_${revision}
 	 libprotobuf22-lite-${version}_${revision}"
 	short_desc="Protocol buffers C++ library - development files"
+	conflicts="protobuf18-devel>=0"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/libprotobuf.a
@@ -85,10 +90,3 @@ protobuf-devel_package() {
 		vmove usr/lib/pkgconfig
 	}
 }
-
-protobuf-lite_package() {
-	build_style=meta
-	short_desc="Protocol buffers C++ library (lite version)"
-	depends="libprotobuf22-lite-${version}_${revision}"
-	archs=noarch
-}
diff --git a/srcpkgs/protobuf22/update b/srcpkgs/protobuf22/update
new file mode 100644
index 00000000000..a575dd0beea
--- /dev/null
+++ b/srcpkgs/protobuf22/update
@@ -0,0 +1,2 @@
+site="https://github.com/protocolbuffers/protobuf/tags?after=v3.12.0-rc1"
+pattern="v\K3\.11\.[\d.]*(?=.zip)"

From 187c386743a5c9b4cd980a211a789064def5a20b 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 03/27] 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 3abd2bcda5e..dbcc5d03c88 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3075,6 +3075,9 @@ 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
+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..f88e9d4fc9e
--- /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="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=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 5716ef86611c0d317130797de498f502e9e9c023 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 21 May 2020 11:50:43 -0400
Subject: [PATCH 04/27] protobuf: upgrade to 3.12.1, move to meta-package

---
 srcpkgs/libprotoc-devel   |  1 +
 srcpkgs/protobuf-devel    |  1 +
 srcpkgs/protobuf-lite     |  1 +
 srcpkgs/protobuf/template | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libprotoc-devel
 create mode 120000 srcpkgs/protobuf-devel
 create mode 120000 srcpkgs/protobuf-lite
 create mode 100644 srcpkgs/protobuf/template

diff --git a/srcpkgs/libprotoc-devel b/srcpkgs/libprotoc-devel
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/libprotoc-devel
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-devel b/srcpkgs/protobuf-devel
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/protobuf-devel
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf-lite b/srcpkgs/protobuf-lite
new file mode 120000
index 00000000000..779a5a300bc
--- /dev/null
+++ b/srcpkgs/protobuf-lite
@@ -0,0 +1 @@
+protobuf
\ No newline at end of file
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
new file mode 100644
index 00000000000..2407e30da9f
--- /dev/null
+++ b/srcpkgs/protobuf/template
@@ -0,0 +1,32 @@
+# Template file for 'protobuf'
+pkgname=protobuf
+version=3.12.1
+revision=1
+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() {
+	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 (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 f9f8c4f5a103f7dac8de5c4f64ee0ba6ee4caddc 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/27] EternalTerminal: revbump against protobuf 3.12.x

---
 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 5a31c788a9e513282206e913d500d0b4c87bf423 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/27] astroid: revbump against protobuf 3.12.x

---
 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 4f211b4a47d998da1f166dd4cbe9d4ea5fb7e789 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/27] clementine: revbump against protobuf 3.12.x

---
 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 2cc9cf130b66697f89187fb859c7c35d7073a239 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/27] cura-engine: revbump against protobuf 3.12.x

---
 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 9db0bc115c5e9746cfc1c2f3ec19e5cb5b9c4b9e 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/27] grpc: revbump against protobuf 3.12.x

---
 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 d0d63584b83af14188a5ec22c1d0b720a2db0af9 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 10/27] hyperion: revbump against protobuf 3.12.x

---
 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 bc4b638edf91c751a23f91c5f14bdf747d399ad1 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/27] kismet: revbump against protobuf 3.12.x

---
 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 843062e7970bb2185933df4f5807c6875ae61363 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/27] libArcus: revbump against protobuf 3.12.x

---
 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 d8e43e095a6007d2b949959b8601b3ef970390ff 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/27] libcompizconfig: revbump against protobuf 3.12.x

---
 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 71dfca60f802f5b69d11deb0b9f44db999676070 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/27] litecoin: revbump against protobuf 3.12.x

---
 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 a11f426762737c24faff53a6b1bd1549c194aae2 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/27] mixxx: revbump against protobuf 3.12.x

---
 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 d6415d4dd8389564e83a6ba4491b5a36342f08c2 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/27] mosh: revbump against protobuf 3.12.x

---
 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 be29bd5742ec416edb7f18bb314ba8d87280561c 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 17/27] mozc: revbump against protobuf 3.12.x

---
 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 36a8ac4d516e5d045ae178b5be711da3f284e8b0 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/27] mumble: revbump against protobuf 3.12.x

---
 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 ec83080e330ec6b31908e2c5e12922f8ba16d4fb 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/27] nsjail: revbump against protobuf 3.12.x

---
 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 0314914a5da9fc5763a8a1dcf52cb855fb53f168 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/27] paraview: revbump against protobuf 3.12.x

---
 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 9ab315aca9b995181a85ce8d1dc2ce299aef5ad2 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/27] protobuf-c: revbump against protobuf 3.12.x

---
 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 ced55df3bcf31183e3eadda65019c430ed0c0075 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/27] strawberry: revbump against protobuf 3.12.x

---
 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 b0e6a43177973d727664d4861b8f273acf3abdc1 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/27] sysdig: revbump against protobuf 3.12.x; 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 347d9b463688e65d77938d22a0c1bb9e6f57d307 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 24/27] usbguard: revbump against protobuf 3.12.x

---
 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 5e226edc4a27aadf47b718c6b7d7fe2a3747bea2 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/27] vlc: revbump against protobuf 3.12.x

---
 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 57c938be09fc3cc5558da388590bbbada0cb4cb3 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 26/27] zbackup: revbump against protobuf 3.12.x

---
 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 a8670869e9b3de2927af65c72f51cd0becf427aa 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 27/27] bitcoin: revbump against protobuf 3.12.x [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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 ahesford
                   ` (5 preceding siblings ...)
  2020-05-22  2:14 ` [PR PATCH] [Updated] " ahesford
@ 2020-05-22  2:58 ` ahesford
  2020-05-22  3:32 ` ahesford
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ahesford @ 2020-05-22  2:58 UTC (permalink / raw)
  To: ml


[-- 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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 ahesford
                   ` (6 preceding siblings ...)
  2020-05-22  2:58 ` ahesford
@ 2020-05-22  3:32 ` ahesford
  2020-05-23  3:17 ` ahesford
  2020-05-23  3:55 ` [PR PATCH] [Closed]: " q66
  9 siblings, 0 replies; 11+ messages in thread
From: ahesford @ 2020-05-22  3:32 UTC (permalink / raw)
  To: ml


[-- 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: 33778 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 63d99de48839be8dfd5702f3cc4465fb29b2b4b3 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 | 98 +++++++++++++++++++++++++++++++++++++
 7 files changed, 106 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..22a58a5a7e5
--- /dev/null
+++ b/srcpkgs/protobuf23/template
@@ -0,0 +1,98 @@
+# 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
+
+# Switch to versioned package
+replaces="protobuf<=3.11.4_1"
+conflicts="protobuf18>=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"
+	# Switch to versioned package
+	replaces="libprotoc-devel<=3.11.4_1"
+	conflicts="libprotoc18-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"
+	# Switch to versioned package
+	replaces="protobuf-devel<=3.11.4_1"
+	conflicts="protobuf18-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 da306d6151328b03920cc4f07b3a13ecb2128c0e 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 fb0438353134b11dd4c2479950a56a46ebdb99d2 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 b96c28025ab2c743f41f4f56ec7a77657e214eca 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 f8bdfa25fa034c93b3de91c2501d1144a396ab05 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 c29dffeb7e12a30c338969e123ef36a982b98d16 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 e17f2eadc18131c3fc80fea17b82007a07386512 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 29ff0ace951e2c108940ba0e706e91d5f332ff13 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 653a973c9603ad9c519e22de2a7accabc5f3db14 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 ab19b3f8fa2129762f8f2d269b700c517e7f154e 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 cf3ca08a79b5ceb7cf3c782fc2508672f619ffc7 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 ea08e824e9b6c427be5827ea7087111e14dd2212 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 c81894c6bf48e4a3d7fd6ae4268ec730dc08de4e 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 cbade63a41c197ea96af325bc8622b5faf836162 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 39dc8e28b6c7b3ca4d3c70cf9d7306d12b0a2b06 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 22f721ccda53f4fedeee36db7a128b4ba97b941f 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 117c2d7214d1610a3355a6f8e7bda1bd1770d411 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 9b17accfba95c180a6f76cc92d0cb3390d7f67f8 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 8fbfd97b8a5ac7feb3dc179fb7d30ca6d5e1c074 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 0da612ac9b78be2d2e32fb6503d7f59f9ce62495 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 a0f4fd8a0dbee9b506f08ed585bb1e65c5dfdc84 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 7c958ce38a02b7da00438c87412e53f172ac4513 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 50f8efc693e13fc970537e00a194a5db3bb4cdee 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 c0c0129bb2f27fc46bd6f6b782430cebf6038935 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 37d63dab7dc5158fb350b63b4d41ec1bd70aab31 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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 ahesford
                   ` (7 preceding siblings ...)
  2020-05-22  3:32 ` ahesford
@ 2020-05-23  3:17 ` ahesford
  2020-05-23  3:55 ` [PR PATCH] [Closed]: " q66
  9 siblings, 0 replies; 11+ messages in thread
From: ahesford @ 2020-05-23  3:17 UTC (permalink / raw)
  To: ml


[-- 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: 34024 bytes --]

From 23f0f641538577ac423e496273ee2962a731e644 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 477ce5f2d3f..4f3f7197ea0 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 2d137cc655ba49a5d0be985c73cdb94af4d4a68c 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 | 98 +++++++++++++++++++++++++++++++++++++
 7 files changed, 106 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 4f3f7197ea0..6fe3715505f 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..22a58a5a7e5
--- /dev/null
+++ b/srcpkgs/protobuf23/template
@@ -0,0 +1,98 @@
+# 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
+
+# Switch to versioned package
+replaces="protobuf<=3.11.4_1"
+conflicts="protobuf18>=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"
+	# Switch to versioned package
+	replaces="libprotoc-devel<=3.11.4_1"
+	conflicts="libprotoc18-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"
+	# Switch to versioned package
+	replaces="protobuf-devel<=3.11.4_1"
+	conflicts="protobuf18-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 3cda9132b563cee69bb850fa3f8cd50121e04365 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 6fe3715505f..cef6ff07222 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 f5d474ba1d9265d322dfd468d8a40c5d1401bfde 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 59318e25385338536bbfd0b82a20e6b74628c74c 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 14cced12f51c614380097e7085131205eb792ba1 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 d85509382c6ee1465473d85200f8e4bcda988e74 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 ec58f787fab49256ec121dfdeb2a1015e815a303 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 29d6d719e56c317ff0e31da44a1b8f4eafb7c350 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 c62c6b14b6244e969340df540039b058cb469185 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 b91b925868ffaae3193b054faa03817310033f26 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 fec169fb628a55ca93a6bcb3f76a44f83f2d0835 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 b5dc30889f02a4b73f266231df93eaad85494dda 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 90a362fcac2b088b0746c9f855ac2f2c4393fa16 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 c8b7da1273766b19885ce28fbebdca268a91be14 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 c28110ec8b1efb1c15e5c27662140f70b21f2c08 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 fa1700e799561e5fb203ccc92991e8999b837803 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 30dab8e5c5f7bdae19b36a844280a9429bf0871d 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 8669947e1858807d450b119b8275c2bda341dbb7 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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index 0d84e89aa1c..bdf09f218df 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
@@ -59,6 +59,9 @@ patch_args="-Np1"
 CFLAGS="-D_GNU_SOURCE"
 CXXFLAGS="-D_GNU_SOURCE"
 
+# qtchooser seems to select wrong version; force qt5
+export QT_SELECT=5
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi

From a18b8fcb410bb2ed32547d5ccf6e8711ee39fc21 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 db452d7f646441a5ec1ab9b1d31e024d5ae21a22 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 118c8c737af1723198119813e80fb206ab070486 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 8c5f91ed4a1069e0b2947604c612d97dca3b4502 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 2e051a09dbf6e92011aacde9495eb7cabebe0173 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 ffc0aea6bca673e532897c33e6ea883e28c5fa21 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 562ef6a7aa2ad49caf0e8ece569c94837b0c7ba1 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"

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Closed]: protobuf: restructure and update to 3.12.1
  2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 ahesford
                   ` (8 preceding siblings ...)
  2020-05-23  3:17 ` ahesford
@ 2020-05-23  3:55 ` q66
  9 siblings, 0 replies; 11+ messages in thread
From: q66 @ 2020-05-23  3:55 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 2048 bytes --]

There's a closed pull request on the void-packages repository

protobuf: restructure and update to 3.12.1
https://github.com/void-linux/void-packages/pull/22175

Description:
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.

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, back to index

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-21 18:33 [PR PATCH] protobuf: restructure and update to 3.12.1 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
2020-05-22  3:32 ` ahesford
2020-05-23  3:17 ` ahesford
2020-05-23  3:55 ` [PR PATCH] [Closed]: " q66

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git