summaryrefslogtreecommitdiff
path: root/media-sound/mumble
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-06-21 17:50:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-06-21 17:50:24 +0100
commitfeb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
treeb6e5c40ce2abef3da27ed50a023153f475e0ddef /media-sound/mumble
parent9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)
gentoo resync : 21.06.2020
Diffstat (limited to 'media-sound/mumble')
-rw-r--r--media-sound/mumble/Manifest5
-rw-r--r--media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch28
-rw-r--r--media-sound/mumble/mumble-1.3.1.ebuild (renamed from media-sound/mumble/mumble-1.3.1_rc1.ebuild)4
3 files changed, 3 insertions, 34 deletions
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 7abb05debdbd..e593fde86bf2 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,7 +1,6 @@
-AUX mumble-1.3.1_rc1-qt-5.15.patch 937 BLAKE2B 1afb11851d3645a805190ab1094c054fb11e4de742f2ddf0b93e918d2cf75f192691d42b51be686714b0c5d4b61d000921ffb011f1dc58fdff8273dc427ac5a9 SHA512 e634e9736b21fcf4f652221428f8426476e229871c5da690ccac51f4b261bfad3d52ce313b96ce6bd82dc31b4d1197ec0099796bb747a8f6047c21249710fa12
DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
-DIST mumble-1.3.1-rc1.tar.gz 8796775 BLAKE2B e229734c2a23da3be7cc9ef5fe9f5c15a423c27b7dd610a5d855089167dca8739f8e32c88efa126b5f08f0391324da7b16454468c2465d2275019179b15b893e SHA512 b05533545aaecb24f403f1876b8b1eb771d39724b1a4db65776cfbc09419b81f4c1017ec99aad7f0e4b5d16e6962d72817467e7a3dec628b4a9b66ab8de555cc
+DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7
EBUILD mumble-1.3.0.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
-EBUILD mumble-1.3.1_rc1.ebuild 3861 BLAKE2B 2214f7db3b1d97a9c64dbc869c20e964db9185343b417223e287debefdacb4d130bcc73228494daf8fa5ec82e61e566430d6ce5cbc0a0e1dfdd9843ef19eda16 SHA512 9c1641d264db4eddbd48d9565f5bdf5b973f2b0db6c83f069291a7adbdcfe534eea4b8518411fbc972cc00689d3e8b775c982a89a36f1829e3da013e953d69af
+EBUILD mumble-1.3.1.ebuild 3785 BLAKE2B f513550966ec70ed598e87c34bf890e27103149b54bf40a990f0915a01cee3bb324094226b9eed3faf29a6e0ebd0593a9eff07b908eb549793a39ac574d240c6 SHA512 3a137cf5da5f699d5da56e86f0008725e3d0dfe66efd9f64259a73603ba7c5a7f66f431084ad0bf02fb6390b6cefc9a96795b3db84f663f9c06b1f49a3716577
EBUILD mumble-9999.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch b/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
deleted file mode 100644
index 4268d56e8290..000000000000
--- a/media-sound/mumble/files/mumble-1.3.1_rc1-qt-5.15.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4539fd92462b9dd1a99b4bfe307abae4e2d89045 Mon Sep 17 00:00:00 2001
-From: Marco Genasci <fedeliallalinea@gmail.com>
-Date: Mon, 1 Jun 2020 21:01:00 +0200
-Subject: [PATCH] src/mumble/OverlayText.h: add missing <QtGui/QPainterPath>
- include for Qt 5.15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-../../release/.moc/mumble/../../../src/mumble/OverlayText.h:42:16: error: field ‘qpp’ has incomplete type ‘QPainterPath’
- 42 | QPainterPath qpp;
- | ^~~
----
- src/mumble/OverlayText.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/mumble/OverlayText.h b/src/mumble/OverlayText.h
-index f06f2b63a8..c1cd9efdd7 100644
---- a/src/mumble/OverlayText.h
-+++ b/src/mumble/OverlayText.h
-@@ -6,6 +6,7 @@
- #ifndef MUMBLE_MUMBLE_OVERLAYTEXT_H_
- #define MUMBLE_MUMBLE_OVERLAYTEXT_H_
-
-+#include <QtGui/QPainterPath>
- #include <QtGui/QPixmap>
- #include <QtGui/QFont>
-
diff --git a/media-sound/mumble/mumble-1.3.1_rc1.ebuild b/media-sound/mumble/mumble-1.3.1.ebuild
index f23f44786ac9..6e81c6c62616 100644
--- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild
+++ b/media-sound/mumble/mumble-1.3.1.ebuild
@@ -21,7 +21,7 @@ else
https://dl.mumble.info/${MY_P}.tar.gz"
S="${WORKDIR}/${P/_*}"
fi
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 x86"
fi
LICENSE="BSD MIT"
@@ -64,8 +64,6 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # in git master; bug #726692
-
# NB: qmake does not support multilib but it's fine to configure
# for the native ABI here
src_configure() {