Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove obsolete workarounds

Browse Source 
Nvidia force close from 2011. Last driver version affected was 304.37, 304.83 is the last in the series and is from 2013.
macOS Soundcloud certificate - CA exists in the system bundle.
macOS font issue from 2013
Gnome volume control with Glib older than 2.36 - Debian Jessie, oldoldstable repo has 2.42
This commit is contained in:
MorbidMind 2020-02-21 22:40:39 +01:00 committed by John Maguire
parent bb736d1156
commit 60d3435324
1 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main.cpp
View File

@ -262,12 +262,6 @@ int main(int argc, char* argv[]) {
// Do Mac specific startup to get media keys working.
// This must go before QApplication initialisation.
mac::MacMain();
if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_8) {
// Work around 10.9 issue.
// https://bugreports.qt.io/browse/QTBUG-32789
QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");
}
#endif
QCoreApplication::setApplicationName("Clementine");
@ -396,12 +390,6 @@ int main(int argc, char* argv[]) {
Q_INIT_RESOURCE(translations);
#endif
// Add root CA cert for SoundCloud, whose certificate is missing on OS X.
QSslSocket::addDefaultCaCertificates(
QSslCertificate::fromPath(":/soundcloud-ca.pem", QSsl::Pem));
QSslSocket::addDefaultCaCertificates(QSslCertificate::fromPath(
":/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem));
// Has the user forced a different language?
QString override_language = options.language();
if (override_language.isEmpty()) {
@ -470,29 +458,5 @@ int main(int argc, char* argv[]) {
int ret = a.exec();
#ifdef Q_OS_LINUX
// The nvidia driver would cause Clementine (or any application that used
// opengl) to use 100% cpu on shutdown. See:
// http://code.google.com/p/clementine-player/issues/detail?id=2088
// https://bugs.gentoo.org/show_bug.cgi?id=375615
// Work around this problem by exiting immediately (and not running the buggy
// nvidia atexit shutdown handler) if we're using one of the affected versions
// of the nvidia driver.
QFile self_maps("/proc/self/maps");
if (self_maps.open(QIODevice::ReadOnly)) {
QByteArray data = self_maps.readAll();
if (data.contains("libnvidia-tls.so.304.37") ||
data.contains("libnvidia-tls.so.285.03") ||
data.contains("libnvidia-tls.so.280.13") ||
data.contains("libnvidia-tls.so.275.28") ||
data.contains("libnvidia-tls.so.275.19")) {
qLog(Warning) << "Exiting immediately to work around NVIDIA driver bug";
_exit(ret);
}
self_maps.close();
}
#endif
return ret;
}