Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package QMPlay2 for openSUSE:Factory checked in at 2021-06-14 23:10:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QMPlay2 (Old) and /work/SRC/openSUSE:Factory/.QMPlay2.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QMPlay2" Mon Jun 14 23:10:59 2021 rev:56 rq:899841 version:21.06.07 Changes: -------- --- /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2.changes 2021-06-09 21:52:46.858525956 +0200 +++ /work/SRC/openSUSE:Factory/.QMPlay2.new.32437/QMPlay2.changes 2021-06-14 23:11:30.224795811 +0200 @@ -1,0 +2,7 @@ +Mon Jun 14 00:39:11 UTC 2021 - Simon Vogl <[email protected]> + +- Changed python dependency from "python > 3.0.0" to "python3" to avoid dependency errors +- Cleaned up obsolete python2 dependencies +- Optimized 0001-add-opensuse-customizations.patch to not throw any "/usr/bin/env" errors + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QMPlay2.spec ++++++ --- /var/tmp/diff_new_pack.jI9pcS/_old 2021-06-14 23:11:30.648796577 +0200 +++ /var/tmp/diff_new_pack.jI9pcS/_new 2021-06-14 23:11:30.652796584 +0200 @@ -67,8 +67,7 @@ Requires(postun): shared-mime-info Requires(postun): update-desktop-files Recommends: youtube-dl -Requires: python > 3.0.0 -Requires: /usr/bin/python +Requires: python3 %description QMPlay2 is a video player, it can play and stream all formats supported by ++++++ 0001-add-opensuse-customizations.patch ++++++ --- /var/tmp/diff_new_pack.jI9pcS/_old 2021-06-14 23:11:30.676796627 +0200 +++ /var/tmp/diff_new_pack.jI9pcS/_new 2021-06-14 23:11:30.676796627 +0200 @@ -1,5 +1,5 @@ From: Simon Vogl <[email protected]> -Date: Mon, 17 Jul 2020 21:15:29 UTC +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. @@ -7,10 +7,17 @@ --- 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) - { +@@ -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)) - { @@ -30,10 +37,15 @@ - } - } - } -+ const auto pythonCmd = "python3"; - } - ytDlFile.close(); - } +- } +- 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
