Ticket #13546: hardcoded_call_to_python_master.patch

File hardcoded_call_to_python_master.patch, 2.5 KB (added by rcrdnalor, 7 years ago)

Patch to use configured python version

  • mythtv/configure 

    diff --git a/mythtv/configure b/mythtv/configure
index 1a27048a9f..a2737cf5d1 100755
    a b cat > $TMPH <<EOF  
    76567656#define JDK_HOME "$JDK_HOME"
    76577657#define JAVA_ARCH "$java_arch"
    76587658#define IMAGE_ALIGN $image_align
     7659#define PYTHON_EXE "${python}"
    76597660EOF
    76607661
    76617662# Code only checks whether HAVE_BDJ_J2ME is defined, not what value

  • mythtv/programs/mythbackend/mainserver.cpp 

    diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
index 411a2674fe..26cba5e1d9 100644
    a b void MainServer::HandleMusicGetLyricGrabbers(const QStringList &/*slist*/, Playb  
    69486948    for (int x = 0; x < scripts.count(); x++)
    69496949    {
    69506950        QProcess p;
    6951         p.start(QString("python %1 -v").arg(scripts.at(x)));
     6951        p.start(QString("%1 %2 -v").arg(PYTHON_EXE).arg(scripts.at(x)));
    69526952        p.waitForFinished(-1);
    69536953        QString result = p.readAllStandardOutput();
    69546954

  • mythtv/programs/mythutil/musicmetautils.cpp 

    diff --git a/mythtv/programs/mythutil/musicmetautils.cpp b/mythtv/programs/mythutil/musicmetautils.cpp
index 937fb701f4..969b3908eb 100644
    a b  
    44#include <QDomDocument>
    55
    66// libmyth* headers
     7#include "mythconfig.h"
    78#include "exitcodes.h"
    89#include "mythlogging.h"
    910#include "storagegroup.h"
    … … static int FindLyrics(const MythUtilCommandLineParser &cmdline)  
    491492    for (int x = 0; x < scripts.count(); x++)
    492493    {
    493494        QProcess p;
    494         p.start(QString("python %1 -v").arg(scripts.at(x)));
     495        p.start(QString("%1 %2 -v").arg(PYTHON_EXE).arg(scripts.at(x)));
    495496        p.waitForFinished(-1);
    496497        QString result = p.readAllStandardOutput();
    497498
    … … static int FindLyrics(const MythUtilCommandLineParser &cmdline)  
    535536        gCoreContext->SendMessage(QString("MUSIC_LYRICS_STATUS %1 %2").arg(songID).arg(statusMessage));
    536537
    537538        QProcess p;
    538         p.start(QString("python %1 --artist=\"%2\" --album=\"%3\" --title=\"%4\" --filename=\"%5\"")
    539                         .arg(grabber.m_filename).arg(artist).arg(album).arg(title).arg(filename));
     539        p.start(QString("%1 %2 --artist=\"%3\" --album=\"%4\" --title=\"%5\" --filename=\"%6\"")
     540                        .arg(PYTHON_EXE).arg(grabber.m_filename).arg(artist).arg(album).arg(title).arg(filename));
    540541        p.waitForFinished(-1);
    541542        QString result = p.readAllStandardOutput();
    542543