diff options
| author |   Kenton Groombridge <concord@gentoo.org> | 2022-08-31 10:04:26 -0400 |
|---|---|---|
| committer | Kenton Groombridge <concord@gentoo.org> | 2022-08-31 10:50:18 -0400 |
| commit | ab93e23f412bc588c0ea60a06a0de67e0f405b53 (patch) | |
| tree | 4e86b4e89cb785def83747f21dbde06b87f62035 /net-voip | |
| parent | sys-libs/pam_wrapper: Stabilize 1.1.4-r1 arm, #867586 (diff) | |
| download | gentoo-ab93e23f412bc588c0ea60a06a0de67e0f405b53.tar.gz gentoo-ab93e23f412bc588c0ea60a06a0de67e0f405b53.tar.bz2 gentoo-ab93e23f412bc588c0ea60a06a0de67e0f405b53.zip | |
net-voip/mumble: fix ODR violations
Closes: https://bugs.gentoo.org/861866
Signed-off-by: Kenton Groombridge <concord@gentoo.org>
Diffstat (limited to 'net-voip')
| -rw-r--r-- | net-voip/mumble/Manifest | 1 | ||||
| -rw-r--r-- | net-voip/mumble/mumble-1.4.274-r1.ebuild (renamed from net-voip/mumble/mumble-1.4.274.ebuild) | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest index 877f4893c488..27dc4ec2cf4f 100644 --- a/net-voip/mumble/Manifest +++ b/net-voip/mumble/Manifest @@ -1,4 +1,5 @@ DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68 +DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15 DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53 DIST mumble-1.4.274.tar.gz 9446657 BLAKE2B db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660 SHA512 6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2 diff --git a/net-voip/mumble/mumble-1.4.274.ebuild b/net-voip/mumble/mumble-1.4.274-r1.ebuild index 299b9c3392f3..7780adddc12b 100644 --- a/net-voip/mumble/mumble-1.4.274.ebuild +++ b/net-voip/mumble/mumble-1.4.274-r1.ebuild @@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter ) else if [[ "${PV}" == *_pre* ]] ; then - SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" + SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz" else MY_PV="${PV/_/-}" MY_P="${PN}-${MY_PV}" @@ -24,7 +24,8 @@ else KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi -SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-1.4-openssl3.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-openssl3.patch.xz" +SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-odr.patch.xz" LICENSE="BSD MIT" SLOT="0" @@ -74,6 +75,7 @@ BDEPEND=" PATCHES=( "${WORKDIR}/${PN}-1.4-openssl3.patch" "${FILESDIR}/${PN}-1.4-crypto-threads.patch" + "${WORKDIR}/${PN}-1.4-odr.patch" ) pkg_setup() { |