File 0001-add-opensuse-customizations.patch of Package QMPlay2

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-add-opensuse-customizations.patch of Package QMPlay2 (Revision 616b42b59f210465f911e8798c4361e5)

Currently displaying revision 616b42b59f210465f911e8798c4361e5 , Show latest

From: Simon Vogl <simon.vogl@gmx.net>
Date: Mon, 14 Jun 2021 00:39:11 UTC
Subject: [PATCH] Fix broken python detection of QMPlay2 when it tries to launch youtube-dl

This patch is required to prevent QMPlay2 from always preferring python2 over python3 which can lead to crashes in certain cases.
It also adds openSUSE branding to the about screen.

--- a/src/qmplay2/YouTubeDL.cpp
+++ b/src/qmplay2/YouTubeDL.cpp
@@ -451,35 +451,9 @@
     QString program = m_ytDlPath;
 
 #ifndef Q_OS_WIN
-    QFile ytDlFile(program);
-    if (ytDlFile.open(QFile::ReadOnly))
-    {
-        const auto shebang = ytDlFile.readLine(99).trimmed();
-        const int idx = shebang.lastIndexOf("python");
-        if (shebang.startsWith("#!") && idx > -1)
-        {
-            const auto pythonCmd = shebang.mid(idx);
-            if (!QStandardPaths::findExecutable(pythonCmd).endsWith(pythonCmd))
-            {
-                QStringList pythonCmdsToCheck {
-                    "python",
-                    "python2",
-                    "python3",
-                };
-                pythonCmdsToCheck.removeOne(pythonCmd);
-                for (auto &&pythonCmd : qAsConst(pythonCmdsToCheck))
-                {
-                    if (QStandardPaths::findExecutable(pythonCmd).endsWith(pythonCmd))
-                    {
-                        args.prepend(program);
-                        program = pythonCmd;
-                        break;
-                    }
-                }
-            }
-        }
-        ytDlFile.close();
-    }
+    //Enforce execution command as "python3", disable automatic detection
+    args.prepend(program);
+    program = "python3";
 #endif
 
     m_process.start(program, args);

--- a/src/gui/AboutWidget.cpp
+++ b/src/gui/AboutWidget.cpp
@@ -43,6 +43,7 @@
 labelText += "QMPlay2: " + tr("video and audio player");
 labelText += " " + tr("Programmer") + ": <a href='mailto:spaz16@wp.pl'>Błażej Szczygieł</a>";
 labelText += " " + tr("Version") + ": " + QMPlay2Core.getSettings().getString("Version") + " (" + QSysInfo::buildCpuArchitecture() + ")";
+ labelText += " This release was supplied by SUSE/openSUSE.";
 QLabel *label = new QLabel(labelText);
 
 QLabel *iconL = new QLabel;

Places

File 0001-add-opensuse-customizations.patch of Package QMPlay2 (Revision 616b42b59f210465f911e8798c4361e5)

Places