cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete patches

Browse Source 
Two patches seem to have no effect: the first one fixes a C++ issue I
do not see on amd64 when building without it, the second one supposedly
fixes translation files, but without it I can switch between languages
just fine.

Both patches are there since import on 2014 and I they probably used to
be relevant for older Mumble versions, but not so much today anymore.
This commit is contained in:
kn 2020-05-21 11:28:05 +00:00
parent 84ce668593
commit b91ba4a17a
3 changed files with 2 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/mumble/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.49 2020/05/14 18:50:08 kn Exp $
# $OpenBSD: Makefile,v 1.50 2020/05/21 11:28:05 kn Exp $
COMMENT-main = low-latency voice chat client
COMMENT-server = low-latency voice chat server
@ -7,7 +7,7 @@ VERSION = 1.3.0
DISTNAME = mumble-${VERSION}
PKGNAME-main = mumble-${VERSION}
PKGNAME-server = murmur-${VERSION}
REVISION-main = 8
REVISION-main = 9
CATEGORIES = audio net

16
audio/mumble/patches/patch-src_mumble_ConnectDialog_h
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_mumble_ConnectDialog_h,v 1.2 2020/02/25 05:14:52 rsadowski Exp $
Prevent method from being hidden instead of being overridden
Index: src/mumble/ConnectDialog.h
--- src/mumble/ConnectDialog.h.orig
+++ src/mumble/ConnectDialog.h
@@ -105,7 +105,7 @@ class ServerView : public QTreeWidget {
ServerItem *getParent(const QString &continent, const QString &countrycode, const QString &countryname, const QString &usercontinentcode, const QString &usercountrycode);
protected:
- QMimeData *mimeData(const QList<QTreeWidgetItem *>) const Q_DECL_OVERRIDE;
+ virtual QMimeData *mimeData(QList<QTreeWidgetItem *>) const;
QStringList mimeTypes() const Q_DECL_OVERRIDE;
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
bool dropMimeData(QTreeWidgetItem *, int, const QMimeData *, Qt::DropAction) Q_DECL_OVERRIDE;

17
audio/mumble/patches/patch-src_mumble_main_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_mumble_main_cpp,v 1.3 2020/02/25 05:14:52 rsadowski Exp $
Fix loading of translation files
Index: src/mumble/main.cpp
--- src/mumble/main.cpp.orig
+++ src/mumble/main.cpp
@@ -386,7 +386,8 @@ int main(int argc, char **argv) {
a.installTranslator(&translator);
QTranslator loctranslator;
- if (loctranslator.load(QLatin1String("mumble_") + locale, a.applicationDirPath()))
+ QString localeDir = QLatin1String(MUMTEXT(LOCALE_PATH));
+ if (loctranslator.load(QLatin1String("mumble_") + locale, localeDir))
a.installTranslator(&loctranslator); // Can overwrite strings from bundled mumble translation
// With modularization of Qt 5 some - but not all - of the qt_<locale>.ts files have become