Ticket #13643: python.26.hard.code.patch

File python.26.hard.code.patch, 2.4 KB (added by John Hoyt, 6 years ago)

Modified patch for hard code

  • mythtv/programs/mythbackend/main.cpp 

    diff --git a/mythtv/programs/mythbackend/main.cpp b/mythtv/programs/mythbackend/main.cpp
index 7cf7f5b644..1a6233a7ba 100644
    a b int main(int argc, char **argv)  
    9494    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHBACKEND);
    9595
    9696#ifdef Q_OS_MAC
     97    QFileInfo fi(PYTHON_EXE);
     98    QString python_executable = fi.fileName();
    9799    QString path = QCoreApplication::applicationDirPath();
    98100    setenv("PYTHONPATH",
    99            QString("%1/../Resources/lib/python2.6/site-packages:%2")
     101           QString("%1/../Resources/lib/%2/site-packages:%3")
    100102           .arg(path)
     103           .arg(python_executable)
    101104           .arg(QProcessEnvironment::systemEnvironment().value("PYTHONPATH"))
    102105           .toUtf8().constData(), 1);
    103106#endif

  • mythtv/programs/mythfrontend/main.cpp 

    diff --git a/mythtv/programs/mythfrontend/main.cpp b/mythtv/programs/mythfrontend/main.cpp
index 16bc8819be..dac0b28161 100644
    a b int main(int argc, char **argv)  
    18661866
    18671867
    18681868#ifdef Q_OS_MAC
     1869    QFileInfo fi(PYTHON_EXE);
     1870    QString python_executable = fi.fileName();
    18691871    QString path = QCoreApplication::applicationDirPath();
    18701872    setenv("PYTHONPATH",
    1871            QString("%1/../Resources/lib/python2.6/site-packages:%2")
     1873           QString("%1/../Resources/lib/%2/site-packages:%3")
    18721874           .arg(path)
     1875           .arg(python_executable)
    18731876           .arg(QProcessEnvironment::systemEnvironment().value("PYTHONPATH"))
    18741877           .toUtf8().constData(), 1);
    18751878#endif

  • mythtv/programs/mythmetadatalookup/main.cpp 

    diff --git a/mythtv/programs/mythmetadatalookup/main.cpp b/mythtv/programs/mythmetadatalookup/main.cpp
index 423b719041..6f69799105 100644
    a b int main(int argc, char *argv[])  
    6666    QCoreApplication::setApplicationName(MYTH_APPNAME_MYTHMETADATALOOKUP);
    6767
    6868#ifdef Q_OS_MAC
     69    QFileInfo fi(PYTHON_EXE);
     70    QString python_executable = fi.fileName();
    6971    QString path = QCoreApplication::applicationDirPath();
    7072    setenv("PYTHONPATH",
    71            QString("%1/../Resources/lib/python2.6/site-packages:%2")
     73           QString("%1/../Resources/lib/%2/site-packages:%3")
    7274           .arg(path)
     75           .arg(python_executable)
    7376           .arg(QProcessEnvironment::systemEnvironment().value("PYTHONPATH"))
    7477           .toUtf8().constData(), 1);
    7578#endif