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 guess they used to
be relevant for older Mumble versions;  I'm still posting it here to get
another look at it, perhaps I'm overlooking something.


Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/mumble/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile    14 May 2020 18:50:08 -0000      1.49
+++ Makefile    15 May 2020 16:28:44 -0000
@@ -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
 
Index: patches/patch-src_mumble_ConnectDialog_h
===================================================================
RCS file: patches/patch-src_mumble_ConnectDialog_h
diff -N patches/patch-src_mumble_ConnectDialog_h
--- patches/patch-src_mumble_ConnectDialog_h    25 Feb 2020 05:14:52 -0000      
1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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;
Index: patches/patch-src_mumble_main_cpp
===================================================================
RCS file: patches/patch-src_mumble_main_cpp
diff -N patches/patch-src_mumble_main_cpp
--- patches/patch-src_mumble_main_cpp   25 Feb 2020 05:14:52 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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

Reply via email to