From 8b475aa4b7963041184013ae2a464ac71184d820 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 1 Feb 2020 08:15:05 -0500 Subject: [PATCH] protobuf: rename all packages with major version 18 --- common/shlibs | 2 +- srcpkgs/libprotobuf-lite18 | 1 - srcpkgs/libprotobuf18 | 2 +- srcpkgs/libprotobuf18-lite | 1 + srcpkgs/libprotoc-devel | 1 - srcpkgs/libprotoc18 | 2 +- srcpkgs/libprotoc18-devel | 1 + srcpkgs/protobuf-devel | 1 - srcpkgs/protobuf-lite | 1 - srcpkgs/protobuf18-devel | 1 + srcpkgs/protobuf18-lite | 1 + .../patches/musl-fix.patch | 0 srcpkgs/{protobuf => protobuf18}/template | 24 ++++++++++++------- 13 files changed, 22 insertions(+), 16 deletions(-) delete mode 120000 srcpkgs/libprotobuf-lite18 create mode 120000 srcpkgs/libprotobuf18-lite delete mode 120000 srcpkgs/libprotoc-devel create mode 120000 srcpkgs/libprotoc18-devel delete mode 120000 srcpkgs/protobuf-devel delete mode 120000 srcpkgs/protobuf-lite create mode 120000 srcpkgs/protobuf18-devel create mode 120000 srcpkgs/protobuf18-lite rename srcpkgs/{protobuf => protobuf18}/patches/musl-fix.patch (100%) rename srcpkgs/{protobuf => protobuf18}/template (81%) diff --git a/common/shlibs b/common/shlibs index df42ed3c435..b6aff24075b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2997,7 +2997,7 @@ 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 libprotobuf-lite18-3.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 libsombok.so.3 sombok-2.4.0_1 diff --git a/srcpkgs/libprotobuf-lite18 b/srcpkgs/libprotobuf-lite18 deleted file mode 120000 index 779a5a300bc..00000000000 --- a/srcpkgs/libprotobuf-lite18 +++ /dev/null @@ -1 +0,0 @@ -protobuf \ No newline at end of file diff --git a/srcpkgs/libprotobuf18 b/srcpkgs/libprotobuf18 index 779a5a300bc..a7f3e3e0d06 120000 --- a/srcpkgs/libprotobuf18 +++ b/srcpkgs/libprotobuf18 @@ -1 +1 @@ -protobuf \ No newline at end of file +protobuf18 \ No newline at end of file diff --git a/srcpkgs/libprotobuf18-lite b/srcpkgs/libprotobuf18-lite new file mode 120000 index 00000000000..a7f3e3e0d06 --- /dev/null +++ b/srcpkgs/libprotobuf18-lite @@ -0,0 +1 @@ +protobuf18 \ 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/libprotoc18 b/srcpkgs/libprotoc18 index 779a5a300bc..a7f3e3e0d06 120000 --- a/srcpkgs/libprotoc18 +++ b/srcpkgs/libprotoc18 @@ -1 +1 @@ -protobuf \ No newline at end of file +protobuf18 \ No newline at end of file diff --git a/srcpkgs/libprotoc18-devel b/srcpkgs/libprotoc18-devel new file mode 120000 index 00000000000..a7f3e3e0d06 --- /dev/null +++ b/srcpkgs/libprotoc18-devel @@ -0,0 +1 @@ +protobuf18 \ 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/protobuf18-devel b/srcpkgs/protobuf18-devel new file mode 120000 index 00000000000..a7f3e3e0d06 --- /dev/null +++ b/srcpkgs/protobuf18-devel @@ -0,0 +1 @@ +protobuf18 \ No newline at end of file diff --git a/srcpkgs/protobuf18-lite b/srcpkgs/protobuf18-lite new file mode 120000 index 00000000000..a7f3e3e0d06 --- /dev/null +++ b/srcpkgs/protobuf18-lite @@ -0,0 +1 @@ +protobuf18 \ No newline at end of file diff --git a/srcpkgs/protobuf/patches/musl-fix.patch b/srcpkgs/protobuf18/patches/musl-fix.patch similarity index 100% rename from srcpkgs/protobuf/patches/musl-fix.patch rename to srcpkgs/protobuf18/patches/musl-fix.patch diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf18/template similarity index 81% rename from srcpkgs/protobuf/template rename to srcpkgs/protobuf18/template index 3e542cf7bb3..5d40bf2dda8 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf18/template @@ -1,7 +1,8 @@ -# Template file for 'protobuf' -pkgname=protobuf +# Template file for 'protobuf18' +pkgname=protobuf18 version=3.7.1 -revision=2 +revision=3 +wrksrc="protobuf-${version}" build_style=gnu-configure hostmakedepends="pkg-config automake libtool" makedepends="zlib-devel" @@ -13,6 +14,8 @@ 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" @@ -40,8 +43,9 @@ libprotobuf18_package() { } } -libprotobuf-lite18_package() { +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 @@ -56,9 +60,10 @@ libprotoc18_package() { } } -libprotoc-devel_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 @@ -66,11 +71,12 @@ libprotoc-devel_package() { } } -protobuf-devel_package() { +protobuf18-devel_package() { depends="zlib-devel libprotobuf18-${version}_${revision} - libprotobuf-lite18-${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 @@ -81,9 +87,9 @@ protobuf-devel_package() { } } -protobuf-lite_package() { +protobuf18-lite_package() { build_style=meta short_desc="Protocol buffers C++ library (lite version)" - depends="libprotobuf-lite18-${version}_${revision}" + depends="libprotobuf18-lite-${version}_${revision}" archs=noarch }