[mythtv] Fix the build without reverting b9c5f8b2ff9

commit ac5b02012d6e8f4ba4e9d5d84fbd96f50317a832 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Oct 17 16:37:14 2018 +0100 Fix the build without reverting b9c5f8b2ff9 b9c5f8b2ff983343d2545ec87022d18fcf65fe1f.patch | 144 ------------------------- mythtv.spec | 6 +- 2 files changed, 2 insertions(+), 148 deletions(-) --- diff --git a/mythtv.spec b/mythtv.spec index f131f92..3690dc9 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -81,7 +81,6 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or URL: http://www.mythtv.org/ Source0: https://github.com/MythTV/%{name}/archive/v%{version}/%{name}-%{version}.... Patch0: https://github.com/MythTV/%{name}/compare/v%{version}..%{shorthash}.patch -Patch10: b9c5f8b2ff983343d2545ec87022d18fcf65fe1f.patch ################################################################################ @@ -838,7 +837,6 @@ on demand content. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch10 -p1 -R # Remove compiled python file #find -name *.pyc -exec rm -f {} \; @@ -946,13 +944,13 @@ pushd mythplugins echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro find . -name \*.pro \ -exec sed -i -e "s,INCLUDEPATH += .\+/include/mythtv,INCLUDEPATH += $temp%{_includedir}/mythtv," {} \; \ - -exec sed -i -e "s,DEPLIBS = \$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \ + -exec sed -i -e "s,DEPLIBS = \$\${SYSROOT}\$\${LIBDIR},DEPLIBS = $temp%{_libdir}," {} \; \ -exec sed -i -e "s,\$\${PREFIX}/include/mythtv,$temp%{_includedir}/mythtv," {} \; echo "INCLUDEPATH -= \$\${PREFIX}/include" >> settings.pro echo "INCLUDEPATH -= \$\${SYSROOT}/\$\${PREFIX}/include" >> settings.pro echo "INCLUDEPATH -= %{_includedir}" >> settings.pro echo "INCLUDEPATH += $temp%{_includedir}" >> settings.pro - echo "LIBS *= -L$temp%{_libdir}" >> settings.pro +# echo "LIBS *= -L$temp%{_libdir}" >> settings.pro echo "QMAKE_LIBDIR += $temp%{_libdir}" >> targetdep.pro ./configure \