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 94520c92bf10f6b597e36923b9e40b33)

Currently displaying revision 94520c92bf10f6b597e36923b9e40b33 , Show latest

From: Simon Vogl <simon.vogl@gmx.net>
Date: Mon, 17 Jul 2020 21:15:29 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
@@ -458,25 +458,7 @@
         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;
-                    }
-                }
-            }
+            const auto pythonCmd = "python3";
         }
         ytDlFile.close();
     }

--- 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 94520c92bf10f6b597e36923b9e40b33)

Places