| 1 |
commit: 49efb943a46068b3f6a00220947ac0b16668d757 |
| 2 |
Author: Kenton Groombridge <concord <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 14:23:12 2022 +0000 |
| 4 |
Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 14:50:28 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49efb943 |
| 7 |
|
| 8 |
net-voip/murmur: fix ODR violations, apply crypto threads patch |
| 9 |
|
| 10 |
Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org> |
| 11 |
|
| 12 |
net-voip/murmur/Manifest | 2 ++ |
| 13 |
.../murmur/{murmur-1.4.274.ebuild => murmur-1.4.274-r1.ebuild} | 8 ++++++-- |
| 14 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest |
| 17 |
index f05002991fd7..ae1e2cd591a5 100644 |
| 18 |
--- a/net-voip/murmur/Manifest |
| 19 |
+++ b/net-voip/murmur/Manifest |
| 20 |
@@ -1,5 +1,7 @@ |
| 21 |
DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3 |
| 22 |
DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68 |
| 23 |
+DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe272870a8e6a8bec542c163c6f63e9c80157329ce07e3d8753aa4c29429980903207c457c6488ff81d7dffcc48426a022a8d1767 SHA512 981db1f7d877fa9ab92875449486074c31ea269a48db49cafa9e37380dfb1140d7d4a225765d2f5333b27aa2d271427287ac5c7d32a525eded455d734aca7d8b |
| 24 |
+DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15 |
| 25 |
DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a |
| 26 |
DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53 |
| 27 |
DIST mumble-1.4.274.tar.gz 9446657 BLAKE2B db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660 SHA512 6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2 |
| 28 |
|
| 29 |
diff --git a/net-voip/murmur/murmur-1.4.274.ebuild b/net-voip/murmur/murmur-1.4.274-r1.ebuild |
| 30 |
similarity index 91% |
| 31 |
rename from net-voip/murmur/murmur-1.4.274.ebuild |
| 32 |
rename to net-voip/murmur/murmur-1.4.274-r1.ebuild |
| 33 |
index 2f572ab1a86e..6261b3912022 100644 |
| 34 |
--- a/net-voip/murmur/murmur-1.4.274.ebuild |
| 35 |
+++ b/net-voip/murmur/murmur-1.4.274-r1.ebuild |
| 36 |
@@ -15,7 +15,7 @@ else |
| 37 |
MY_PN="mumble" |
| 38 |
if [[ "${PV}" == *_pre* ]] ; then |
| 39 |
MY_P="${MY_PN}-${PV}" |
| 40 |
- SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz" |
| 41 |
+ SRC_URI="https://dev.gentoo.org/~concord/distfiles/${MY_P}.tar.xz" |
| 42 |
S="${WORKDIR}/${MY_P}" |
| 43 |
else |
| 44 |
MY_PV="${PV/_/-}" |
| 45 |
@@ -27,7 +27,9 @@ else |
| 46 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 47 |
fi |
| 48 |
|
| 49 |
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/mumble-1.4-openssl3.patch.xz" |
| 50 |
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-openssl3.patch.xz" |
| 51 |
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-crypto-threads.patch.xz" |
| 52 |
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-odr.patch.xz" |
| 53 |
|
| 54 |
LICENSE="BSD" |
| 55 |
SLOT="0" |
| 56 |
@@ -83,6 +85,8 @@ DOC_CONTENTS=" |
| 57 |
|
| 58 |
PATCHES=( |
| 59 |
"${WORKDIR}/mumble-1.4-openssl3.patch" |
| 60 |
+ "${WORKDIR}/mumble-1.4-crypto-threads.patch" |
| 61 |
+ "${WORKDIR}/mumble-1.4-odr.patch" |
| 62 |
) |
| 63 |
|
| 64 |
src_prepare() { |
Archives