summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/mumble/Manifest2
-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)2
3 files changed, 1 insertions, 31 deletions
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 105fb3e2f1ff..c6056d2712ba 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,2 +1,2 @@
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
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..69f5d7055e0d 100644
--- a/media-sound/mumble/mumble-1.3.1_rc1.ebuild
+++ b/media-sound/mumble/mumble-1.3.1.ebuild
@@ -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() {