summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-01-17 02:02:30 -0800
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-01-17 02:20:09 -0800
commit259e0aaf3b1456fb350a8aef6555cb9696b08d81 (patch)
tree9fa7e62e196f042d5b3c1a02a52af2f0982e05dd
parentmedia-gfx/plantuml: removed old (0.8046) (diff)
downloadgentoo-259e0aaf3b1456fb350a8aef6555cb9696b08d81.tar.gz
gentoo-259e0aaf3b1456fb350a8aef6555cb9696b08d81.tar.bz2
gentoo-259e0aaf3b1456fb350a8aef6555cb9696b08d81.zip
net-libs/grpc: revbump 1.26.0, fix odr violation
Bug: https://bugs.gentoo.org/705574 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
-rw-r--r--net-libs/grpc/Manifest1
-rw-r--r--net-libs/grpc/grpc-1.26.0-r1.ebuild (renamed from net-libs/grpc/grpc-1.26.0.ebuild)6
2 files changed, 5 insertions, 2 deletions
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 1b87058b8c7..520b37eb8e6 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -8,4 +8,5 @@ DIST grpc-1.22.1.tar.gz 15083781 BLAKE2B 5f1bc2fc638cfa2f97df9dfba3c927ae0c7871b
DIST grpc-1.23.0.tar.gz 15212436 BLAKE2B 119a62e6573a1c7785934f7752d9bf2fc0f503a268e439ce143d6730994e3fc154ffd558a2fb3776a77f5f36798baac334f50d1c612ae5564c3c2f110df8b42c SHA512 4770651bd73b71735152155327c44d59125442b405157ffea8fb80b6f16406dd388474394e44ef620e2a777018121988a3a7a552a42141650d7cac263ab499a0
DIST grpc-1.24.3.tar.gz 15364420 BLAKE2B 7a1262ee931c2578399e7373e25fefb7a4329a2c0f139b17fbd4073406a931730393016455ff3ddee8b686ebb7903a898ca532972f57369c7658c68643b6d715 SHA512 19afa8b1fd64c429317c85d8cf42d01af0ac6aec82508740c176e1fd4f92dea9531ea9812523215ed67466bae93a75e14dc34cd9cce5987a13c0104e0313c69c
DIST grpc-1.25.0.tar.gz 16460163 BLAKE2B a581b1db459468e7c01af579da39cc111825931eee21d9af13833b1d65e448ee2024d86edb95e7acb705ad427f793d7911d6fb66418155e75f5e1f0e6116578a SHA512 7d9e126eafdfefe9b5c2eacf9c082b972115f231a55cff53386305f2df68037e2593eedc3f27fe0eaeb7fbe78b28f6b87607cdeccf59929b9a9b33bf74ab5c92
+DIST grpc-1.26-fix-odr-violation.patch.bz2 6320 BLAKE2B d7551a54c7a846cd8545a9cb0204e28f1d94b6a0a28b9093be1337127e76256c29e2ff9739ef1791740371d4b30520305c3c5908216030f4b23488c250248256 SHA512 c020eb40a3a494f8ef4a0ab6efc7a832c844c365d006a1d9512f0451af4ff33a11a185cd0ecd1afa0c546b190efcf8a0fef9e543f8fac35e65da10a2df34cd61
DIST grpc-1.26.0.tar.gz 16673794 BLAKE2B f72d1997366e5e6e8b6b554149f90a187cbaea65da0070f4525739db38c053c6b280509f2faf2ec0e283ab9b7d000efda46b90b18143cd5ef8c1ec0881e00d3d SHA512 4f7d067c582d0a9be7b7d4dd1e08acdbe6ff0686dfe92b5db5b7927f779410a4237acfd1c61d9f79eb2d00f86cf93cc7492fa372c1877e57c1aa23e9bb2648bb
diff --git a/net-libs/grpc/grpc-1.26.0.ebuild b/net-libs/grpc/grpc-1.26.0-r1.ebuild
index 0a1213a0a71..d9352892adf 100644
--- a/net-libs/grpc/grpc-1.26.0.ebuild
+++ b/net-libs/grpc/grpc-1.26.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,8 @@ MY_PV="${PV//_pre/-pre}"
DESCRIPTION="Modern open source high performance RPC framework"
HOMEPAGE="https://www.grpc.io"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~gyakovlev/distfiles/grpc-1.26-fix-odr-violation.patch.bz2"
LICENSE="Apache-2.0"
SLOT="0"
@@ -32,6 +33,7 @@ BDEPEND="virtual/pkgconfig"
RESTRICT="test"
PATCHES=(
+ "${WORKDIR}/grpc-1.26-fix-odr-violation.patch" #705574
"${FILESDIR}/grpc-1.21.0-fix-host-ar-handling.patch"
"${FILESDIR}/grpc-1.3.0-Don-t-run-ldconfig.patch"
"${FILESDIR}/grpc-1.25.0-pkgconfig-libdir.patch"