From 22e59a9f869a42e71a6b9e47b66374982d824354 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 21 May 2020 11:15:53 -0400 Subject: [PATCH] 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 477ce5f2d3..4f3f7197ea 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 a7f3e3e0d0..0000000000 --- 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 a7f3e3e0d0..0000000000 --- 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 a7f3e3e0d0..0000000000 --- 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 a7f3e3e0d0..0000000000 --- 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 a7f3e3e0d0..0000000000 --- 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 a7f3e3e0d0..0000000000 --- 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 09343ed071..0000000000 --- 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 - #elif defined(__APPLE__) - #include --#elif defined(__GLIBC__) || defined(__BIONIC__) || defined(__CYGWIN__) -+#elif defined(__linux__) || defined(__BIONIC__) || defined(__CYGWIN__) - #include // 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(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8)); diff --git a/srcpkgs/protobuf18/template b/srcpkgs/protobuf18/template deleted file mode 100644 index 5d40bf2dda..0000000000 --- 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 " -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 -}